Updated to 7.1.4 for some files

4 files changed, 174 insertions, 84 deletions

diff --git a/messages/ZMsg_no.properties b/messages/ZMsg_no.properties
index 86d9775..53a88d2 100644
--- a/messages/ZMsg_no.properties
+++ b/messages/ZMsg_no.properties
@@ -1,7 +1,7 @@
 # 
 # ***** BEGIN LICENSE BLOCK *****
 # Zimbra Collaboration Suite Web Client
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Zimbra, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 VMware, Inc.
 # 
 # The contents of this file are subject to the Zimbra Public License
 # Version 1.3 ("License"); you may not use this file except in
diff --git a/messages/ZaMsg_no.properties b/messages/ZaMsg_no.properties
index aa9d8b8..a7fe23b 100644
--- a/messages/ZaMsg_no.properties
+++ b/messages/ZaMsg_no.properties
@@ -1,7 +1,7 @@
 # 
 # ***** BEGIN LICENSE BLOCK *****
 # Zimbra Collaboration Suite Web Client
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Zimbra, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 VMware, Inc.
 # 
 # The contents of this file are subject to the Zimbra Public License
 # Version 1.3 ("License"); you may not use this file except in
@@ -98,7 +98,7 @@ Domain_InboundSMTPNote = Hvis din MX-oppf\u00f8ring peker til et spam-relay, ell
 Domain_zimbraPublicServiceHostname = Navn p\u00e5 offentlig tjenestevert:
 Domain_zimbraBasicAuthRealm = Company identifier in public share prompts:
 Domain_Documents_Config_Complete = You have completed configuration of Documents for this domain. Please press "Finish" to save the changes.
-Domain_Auth_Config_Complete = Konfigurasjon av godkjennelsesmekanisme er fullf\u00f8rt.
+Domain_Auth_ConfigSummary = Summary of authentication settings:
 Domain_AuthProvideLoginPwd = Oppgi brukernavn og passord for \u00e5 teste godkjennelsesinnstillingene
 LBL_Domain_AuthTestUserName = User name:
 Domain_AuthTestUserName = Brukernavn
@@ -222,7 +222,7 @@ Domain_Suspended_Note = Du har ikke tilgang til Dokumenter-konfigurasjonen mens
 Domain_Maintenance_Note = Du har ikke tilgang til Dokumenter-konfigurasjonen mens domenet er under vedlikehold. Vennligst aktiver domenet for \u00e5 konfigurere Dokumenter.
 Domain_Chameleon_Note = Notis: Endringene vil ikke tr\u00e5 i kraft f\u00f8r tema-cachen er t\u00f8mt, eller mailboxd er omstartet.
 Domain_flush_cache_q = Du har endret egenskapene for et tema. For at endringen skal tr\u00e5 i kraft, m\u00e5 du t\u00f8mme tema-cachen. \
-    \u00d8nsker du \u00e5 t\u00f8mme tema-cachen n\u00e5? 
+    	\u00d8nsker du \u00e5 t\u00f8mme tema-cachen n\u00e5? 
 Domain_DefaultCOS = Standardtjenesteklasse:
 Domain_GalMode = GAL-tilstand:
 Domain_GalSyncAccount = GAL sync account name:
@@ -529,6 +529,8 @@ Alert_HSM = \
 
 Alert_InternalPassword = <b>Bemerk:</b> Disse innstillinger p\u00e5virker ikke de passord, som er angitt \
 	av brukere i domener, som er konfigurert til \u00e5 bruke ekstern godkjennelse.
+Alert_ExternalPassword = All password settings are disabled because the system is configured \
+                to use external authentication.
 Alert_MailRetention = <b>Note:</b> Disse innstillingene vil ikke ha effekt hvis zimbraMailSleepPurgeInterval \
         ikke er aktivert hverken p\u00e5 server eller i global konfigurasjon.
 Alert_EnableMailRetention = For \u00e5 aktivere Email Retention Policy p\u00e5 kontoen, skal zimbraMailSleepPurgeInterval \
@@ -686,19 +688,18 @@ MSG_zimbraPrefCalendarApptReminderWarningTime = Antall minutter f\u00f8r en avta
 LBL_zimbraPrefCalendarApptReminderWarningTime = Number of minutes before an appointment to show reminder:
 LBL_zimbraPrefShowSelectionCheckbox = Vis avkrysningsfelt til valg av objekter til e-mail, kontakter og talemeldinger i en listevisning til batchkj\u00f8ring
 NAD_Attachment_Settings = Innstillinger for vedlagte filer:
-NAD_Attach_IncomingAttachments = Attachment settings:
-LBL_zimbraPrefTimeZoneId = Time zone:
 NAD_Attach_IncomingAttachments = Innstillinger for vedlagte filer:
-NAD_zimbraPrefTimeZoneId = Tidssone
+LBL_zimbraPrefTimeZoneId = Tidssone
 MSG_zimbraPrefTimeZoneId = Time zone
 NAD_GlobalRemoveAllAttachments = Vedlagte filer kan ikke vises uansett COS
+NAD_GlobalAddBlockedExtensions = Add extensions to the list
+NAD_GlobalBlockedExtensions = Currently blocked extensions by MTA
+NAD_GlobalCommonExtensions = Common extensions
 NAD_GlobalAttachmentsViewInHtmlOnly = Vedlagte filer vises i HTML uansett COS
 NAD_GlobalAttachmentsViewCOS = Vedlagte filer vises if\u00f8lge COS
-NAD_zimbraMailSignatureMaxLength = Maksimal lengde p\u00e5 mail-signatur: 
+LBL_zimbraMailSignatureMaxLength = Maksimal lengde p\u00e5 mail-signatur:
+MSG_zimbraMailSignatureMaxLength = Maksimal lengde p\u00e5 mail-signatu
 NAD_Attach_RemoveAttachmentsByExt = Avvis meldinger med vedlagte filtyper:
-LBL_zimbraMailSignatureMaxLength = Maximum length of mail signature:
-MSG_zimbraMailSignatureMaxLength = Maximum length of mail signature 
-NAD_Attach_RemoveAttachmentsByExt = Reject messages with attachment extensions:
 NAD_Attach_NewExtension = Ny utvidelse:
 NAD_Attach_AddExtension = Legg til
 
@@ -728,7 +729,9 @@ NAD_MTA_ProtocolChecks = Protokollvedlikehold:
 NAD_MTA_reject_invalid_hostname = Tjenernavn i hilsen er i konflikt med RFC (reject_invalid_hostname)
 NAD_MTA_reject_non_fqdn_hostname = Klient skal hilse med et fullt kvalifisert tjenernavn (reject_non_fqdn_hostname)
 NAD_MTA_reject_non_fqdn_sender = Avsenderadresse skal v\u00e6re fullt kvalifisert (reject_non_fqdn_sender)
-NAD_MTA_DnsChecks = DNS-vedlikehold:
+NAD_MTA_PolicyServiceChecks = Policy Service Checks
+NAD_MTA_policy_service = Policy Service:
+NAD_MTA_DnsChecks = DNS checks
 NAD_MTA_reject_rbl_client = Liste med RBLer:
 NAD_MTA_reject_unknown_client = Klients IP-adresse (reject_unknown_client)
 NAD_MTA_reject_unknown_hostname = RTjenernavn i hilsen (reject_unknown_hostname)
@@ -823,7 +826,7 @@ NAD_MailTransport  = Mail Transport:
 NAD_MailTransportGrouper = Mail Transport
 ERROR_MAILTRANSPORT_INVALID = Invalid LMTP or SMTP transport definition.
 MSG_MailTransportMessage = It should be "protocol":"server":"port".  e.g. smtp:smtp.zimbrasmtpserver.com:25 
-
+ 
 NAD_AccountName = Kontonavn:
 NAD_Email = E-mail:
 NAD_Account = Konto
@@ -877,7 +880,7 @@ MSG_zimbraPasswordMinNumericChars = Minimum numeric characters
 LBL_zimbraPasswordMinNumericChars = Minimum numeric characters:
 LBL_zimbraMinPwdLength = Minimum password length:
 MSG_zimbraMinPwdLength = Minimum password length
-NAD_passMinLength = Minimumslengde p\u00e5 passord
+NAD_passMinLengthMsg = Minimumslengde p\u00e5 passord
 LBL_zimbraMaxPwdLength = Maximum password length:
 MSG_zimbraMaxPwdLength = Maximum password length
 NAD_passMaxLengthMsg = Maksimal lengde p\u00e5 passord er {0} tegn
@@ -890,6 +893,8 @@ LBL_zimbraEnforcePwdHistory = Minimum number of unique passwords history:
 MSG_zimbraPrefMailSignature = Mail signature (default persona):
 LBL_zimbraPrefMailSignature = Mail signature (default persona):
 LBL_zimbraPrefMailSignatureEnabled = Enable mail signature
+LBL_zimbraPrefMailToasterEnabled = Enable toaster notification for new mail
+MSG_zimbraPrefMailToasterEnabled = Enable toaster notification for new mail
 LBL_zimbraPrefSaveToSent = Save to sent
 LBL_zimbraPrefUseKeyboardShortcuts = Enable keyboard shortcuts
 LBL_zimbraPrefCalendarReminderFlashTitle = Flash browser title on appointment remimnder
@@ -911,6 +916,9 @@ NAD_homePhone = Home Phone:
 NAD_mobile = Mobile:
 NAD_pager = Pager:
 NAD_company = Firma:
+NAD_title = Job Title:
+NAD_facsimileTelephoneNumber = Fax Number:
+NAD_zimbraPhoneticCompany = Phonetic Company:
 NAD_city = By:
 NAD_zip = Postnr.:
 NAD_state = Stat:
@@ -940,6 +948,7 @@ NAD_new = ny(tt)
 LBL_zimbraGalMaxResults = H\u00f8yeste antall resultater av GAL-s\u00f8k:
 MSG_zimbraGalMaxResults = H\u00f8yeste antall resultater av GAL-s\u00f8k
 NAD_DomainAccountLimits = {0} konti kan legges til domene {1}
+MSG_AccountTypeUnavailable = <b>Warning:</b> You have reached the account limit for the following account types. Please increase the account limits. Or the default type {0} will be selected.
 NAD_zimbraScheduledTaskNumThreads = Maksimalt antall planlagte oppgaver, som kan kj\u00f8re samtidig:
 
 NAD_StatsHour = De siste 48 timer
@@ -1104,66 +1113,68 @@ NAD_DeleteAccStatus = Sletter objekt
 NAD_DeletingAccTitle = Sletter objekter
 NAD_AbortDeleting = Avbryt
 # Features
-NAD_zimbraMajorFeature = Hovedfunksjoner
-NAD_zimbraGeneralFeature = Generelle funksjoner
-NAD_zimbraMailFeature = Mail-funksjoner
-NAD_zimbraCalendarFeature = Kalenderfunksjoner
-NAD_zimbraBriefcasesFeature = Briefcase Features
-NAD_zimbraIMFeature = IM-funksjoner
-NAD_zimbraSearchFeature = S\u00f8kefunksjoner
-LBL_zimbraFeatureNotebookEnabled = Dokumenter
-LBL_zimbraFeatureBriefcasesEnabled = Dokumentmappe
-LBL_zimbraFeatureBriefcaseSpreadsheetEnabled = Spreadsheets
-LBL_zimbraFeatureBriefcaseSlidesEnabled = Presentations
-LBL_zimbraFeatureBriefcaseDocsEnabled = Documents
-LBL_zimbraFeatureHtmlComposeEnabled = HTML-skriving
+NAD_zimbraMajorFeature = Major Features
+NAD_zimbraGeneralFeature = General Features
+NAD_zimbraMailFeature = Mail Features
+NAD_zimbraCalendarFeature = Calendar Features
+NAD_zimbraIMFeature = IM Features
+NAD_zimbraSearchFeature = Search Features
+LBL_zimbraFeatureNotebookEnabled = Documents
+LBL_zimbraFeatureBriefcasesEnabled = Briefcase
+LBL_zimbraFeatureHtmlComposeEnabled = HTML compose
 LBL_zimbraFeatureIMEnabled = Instant Messenger
 LBL_zimbraFeatureInstantNotify = \u00d8yeblikkelige averteringer
 LBL_zimbraPrefIMAutoLogin = Automatisk login p\u00e5 IM-tjenester
 NAD_Feature = Feature: 
-LBL_FeatureViewInHtmlEnabled =Visning av vedlagte filer som HTML
-LBL_FeatureGalEnabled = Adgang til global adresseliste
-LBL_FeatureContactsEnabled = Adressebok
+LBL_zimbraFeatureViewInHtmlEnabled =Viewing attachments as HTML
+LBL_zimbraFeatureGalEnabled = Global Address List access
+LBL_zimbraFeatureMAPIConnectorEnabled = MAPI (Microsoft Outlook) Connector
+LBL_zimbraFeatureContactsEnabled = Address Book
 LBL_zimbraFeatureMailEnabled = Mail
-LBL_zimbraFeatureIdentitiesEnabled = Rolle
-LBL_zimbraFeatureCalendarEnabled = Kalender
-LBL_zimbraFeatureTaskEnabled = Oppgaver
-LBL_zimbraFeatureTaggingEnabled = Merking
-LBL_zimbraFeatureAdvancedSearchEnabled = Avanserte s\u00f8k
-LBL_zimbraFeatureSavedSearchesEnabled = Lagrede s\u00f8k
-LBL_zimbraFeatureConversationsEnabled = Samtaler
-LBL_zimbraFeatureChangePasswordEnabled = Skift passord
-LBL_zimbraFeatureInitialSearchPreferenceEnabled = Innledende s\u00f8kepreferanse
-LBL_zimbraFeatureFiltersEnabled = Mail-filtre
-LBL_zimbrazimbraFeatureMailForwardingEnabled = Tillat at bruker angir en videresendelsesadresse
-LBL_zimbraImapEnabled = IMAP-adgang
-LBL_zimbraPop3Enabled = POP3-adgang
-LBL_zimbraExternalPop3Enabled = Ekstern IMAP-adgang
+LBL_zimbraFeatureIdentitiesEnabled = Persona
+LBL_zimbraFeatureCalendarEnabled = Calendar
+LBL_zimbraFeatureTaskEnabled = Tasks
+LBL_zimbraFeatureTaggingEnabled = Tagging
+LBL_zimbraFeatureAdvancedSearchEnabled = Advanced search
+LBL_zimbraFeatureSavedSearchesEnabled = Saved searches
+LBL_zimbraFeatureConversationsEnabled = Conversations
+LBL_zimbraFeatureChangePasswordEnabled = Change password
+LBL_zimbraFeatureInitialSearchPreferenceEnabled = Initial search preference
+LBL_zimbraFeaturePeopleSearchEnabled = Search for people
+LBL_zimbraFeatureFiltersEnabled = Mail Filters
+LBL_zimbraFeatureMailForwardingEnabled = Allow the user to specify a forwarding address
+LBL_zimbraImapEnabled = IMAP access
+LBL_zimbraPop3Enabled = POP3 access
+LBL_zimbraExternalImapEnabled = External IMAP access
 LBL_zimbraExternalPop3Enabled = External POP access
-LBL_zimbraFeatureSharingEnabled = Deling
-LBL_zimbraFeatureGalAutoCompleteEnabled = Autofullf\u00f8ring fra GAL
-LBL_zimbraFeatureImportExportFolderEnabled = Import/Export
-LBL_zimbraPrefShowFragments = Vis fragmenter
-LBL_zimbraFeatureOutOfOfficeReplyEnabled = Ikke p\u00e5 kontoret-svar
-LBL_zimbraFeatureNewMailNotificationEnabled = Avertering om ny mail
-LBL_zimbraFeatureMailPollingIntervalPreferenceEnabled = Tillat at bruker innstiller interval for mail-polling
-LBL_zimbraFeatureSkinChangeEnabled = Skift temaer for brukergrensesnitt
+LBL_zimbraFeatureSharingEnabled = Sharing
+LBL_zimbraFeatureGalAutoCompleteEnabled = Autocomplete from GAL
+LBL_zimbraFeatureImportFolderEnabled = Import
+LBL_zimbraFeatureExportFolderEnabled = Export
+LBL_zimbraDumpsterEnabled = Dumpster folder
+LBL_zimbraFeatureMailSendLaterEnabled = Mail send later
+LBL_zimbraFeatureFreeBusyViewEnabled = Free/Busy View
+LBL_zimbraPrefShowFragments = Show fragments
+LBL_zimbraFeatureOutOfOfficeReplyEnabled = Out of office reply
+LBL_zimbraFeatureNewMailNotificationEnabled = New mail notification
+LBL_zimbraFeatureMailPollingIntervalPreferenceEnabled = Allow the user to set mail polling interval
+LBL_zimbraFeatureSkinChangeEnabled = Change UI themes
 LBL_zimbraFeatureManageZimlets = Manage Zimlets
-LBL_zimbraFeatureOptionsEnabled = Preferanser
-LBL_zimbraFeatureShortcutAliasesEnabled = Aliaser for tastatursnarvei
-LBL_zimbraFeatureGroupCalendarEnabled = Gruppekalender
-LBL_zimbraFeatureMailPriorityEnabled = Meldingsprioritet 
-LBL_zimbraFeatureFlaggingEnabled = Merking
-NAD_LimitThemesTo = Begrens tilgjengelige temaer for denne bruker til:
-COS_DontLimitThemes = Begrens ikke tilgjengelige temaer for brukere i denne COS
-COS_LimitThemesTo = Begrens tilgjengelige temaer for brukere i denne COS til:
-NAD_zimbraAvailableSkin = Tilgjengelige temaer for brukergrensesnitt:
-NAD_zimbraInstalledSkin = Installerte temaer for brukergrensesnitt:
-NAD_zimbraSkinSettings = Innstillinger for brukergrensesnitt-tema:
-LBL_zimbraPrefSkin = Aktuelt tema for brukergrensesnitt:
-NAD_UseCosSettings = Benytt COS-innstillinger
+LBL_zimbraFeatureOptionsEnabled = Preferences
+LBL_zimbraFeatureShortcutAliasesEnabled = Keyboard shortcuts aliases
+LBL_zimbraFeatureGroupCalendarEnabled = Group calendar
+LBL_zimbraFeatureMailPriorityEnabled = Message priority 
+LBL_zimbraFeatureFlaggingEnabled = Flagging
+NAD_LimitThemesTo = Limit Themes available to this user to:
+COS_DontLimitThemes = Do not limit Themes available to users in this COS
+COS_LimitThemesTo = Limit Themes available to users in this COS to:
+NAD_zimbraAvailableSkin = Available UI themes:
+NAD_zimbraInstalledSkin = Installed UI themes:
+NAD_zimbraSkinSettings = UI theme settings:
+LBL_zimbraPrefSkin = Current UI theme:
+NAD_UseCosSettings = Use COS settings
 NAD_LimitZimletsTo = Limit Zimlets available to this user to:
-NAD_LimitZimletsTo = Begrens tilgjengelige zimlets for denne bruker til:
+NAD_LimitZimletsToDomain = Limit Zimlets available to this domain to:
 COS_LimitZimletsTo = Begrens tilgjengelige zimlets for brukere i denne COS til:
 NAD_zimbraAvailableZimlets = Tilgjengelige zimlets
 NAD_zimbraInstalledZimlets = Installerte zimlets
@@ -1174,7 +1185,7 @@ LBL_zimbraPrefForwardReplyInOriginalFormat = Svar/Videresend med samme format so
 LBL_zimbraPrefAutoAddAddressEnabled = Aktiver automatisk tilf\u00f8yelse av kontakter
 LBL_zimbraPrefMailItemsPerPage = Antall objekter du vil ha vist pr. side:
 MSG_zimbraPrefMailItemsPerPage = Number of items to display per page
-LBL_zimbraPrefComposeFormat = Skriv alltid mail ved bruk av:
+LBL_zimbraMaxMailItemsPerPage = Maximum number of items to display per page:
 MSG_zimbraMaxMailItemsPerPage = Maximum number of items to display per page
 LBL_zimbraPrefComposeFormat = Always compose mail using:
 LBL_zimbraPrefGroupMailBy = Grupper mail etter:
@@ -1317,6 +1328,12 @@ Stats_MC_Header = Anntall mottakere av meldinger via enten SMTP eller LMTP.
 Stats_MV_Header = Anntall mottakere av meldinger via enten SMTP eller LMTP ganger st\u00f8rrelsen p\u00e5 enhver slik melding.
 Stats_AV_Header = Antall unike meldinger, som er behandlet av AS/AV-systemet.
 
+# MobileSync
+TABT_MobileSync_Stats = MobileSync statistics
+Stats_MobileSync_Header = MobileSync Sessions
+Stats_MobileSync_LOADING = data is loading ...
+Stats_MobileSync_Count = The total number of ActiveSync devices across servers:
+
 #Resources Message
 RESTBB_New_menuItem = Ressurs 
 RESTBB_New_tt = \u00c5pne den rettledning, som vil lede deg gjennom opprettelsen av en ny ressurs 
@@ -1356,7 +1373,8 @@ NAD_ContactPhone = Kontakttelefon:
 NAD_DeclineRecurring = Avsl\u00e5 automatisk tilbakevendende:
 Q_DELETE_RES = Er du sikker p\u00e5, at du vil slette denne ressurs?
 resourceStatus_closed = Utilgjengelig
-ErrorInvalidContactEmail = Ugyldig e-mail-adresse
+ErrorInvalidEmailAddress = Invalid email address
+ErrorInvalidEmailAddressList = Invalid email address list
 ErrorEmptyEmailAddress = Empty email address
  
 NCD_NewAccTitle = Ny konto
@@ -1381,6 +1399,7 @@ Reindex_Mbx_tt = \
 	Lukking av denne dialog vil ikke avbryte reindekseringsprosessen. \
 	Hvis du vil kontrollere statusen p\u00e5 reindekseringsprosessen, \u00e5pner du denne dialog igjen ved \u00e5 klikke p\u00e5 knappen Indekser mailboks igjen p\u00e5 verkt\u00f8ylinjen.
 
+ERROR_CANNOT_CHANGE_VOLUME = Cannot change the type of current volume.
 ERROR_NO_PERMISSION_FOR_OPERATION_ON = Error! You do not have permission to perform this operation on {0}.
 ERROR_NO_PERMISSION_CREATE_ALIAS = Error! You do not have permission to create an alias in domain {0}.
 ERROR_SESSION_EXPIRED = Din sesjon har opph\u00f8rt
@@ -1431,10 +1450,14 @@ ERROR_ACCOUNT_LAST_NAME_REQUIRED = Det m\u00e5 gis et etternavn!
 ERROR_ACCOUNT_NAME_INVALID = Det angitte kontonavn er ugyldig.
 ERROR_RESOURCE_EMAIL_INVALID = The specified resource email is invalid.
 ERROR_ALIAS_INVALID = Det angitte alias {0} er ugyldig.
+ERROR_SAVENAME_EMPTY = Please specify search name.
 FAILED_ADD_ALIASES = Kunne ikke legge til aliaser.
 ERROR_DL_NAME_REQUIRED = Det m\u00e5 gis et navn til distribusjonslisten!
 ERROR_DL_NAME_INVALID = Det angitte navn p\u00e5 distribusjonslisten er ugyldig.
 ERROR_INVALID_VOLUME_PATH = Den angitte enhetssti er ugyldig
+ERROR_NO_SUCH_VOLUME = The specified volume does not exist!
+ERROR_VOLUME_ALREADY_EXISTS = The specified volume already exists!
+
 ERROR_LICENSE = Det oppstod en lisensfeil 
 ERROR_NO_VALID_SUBNETS = Feil! Verdien {0} er ikke en gyldig liste over subnet. Se dokumentasjonen for \u00e5 f\u00e5 hj\u00e6lp til \u00e5 konfigurere MTA-betrodde nettverk. <br/>Ytterligere opplysninger om konfigurasjon av MTA-betrodde nettverk finnes p\u00e5 <a target="new" href="http://wiki.zimbra.com/index.php?title=ZimbraMtaMyNetworks">http://wiki.zimbra.com/index.php?title=ZimbraMtaMyNetworks</a>.
 ERROR_MISSING_LOCAL = Feil! Verdi for MTA-betrodde nettverk skal inneholde lokale nettverksinterfacer: {0}. <br/>Ytterligere opplysninger om konfigurasjon av MTA-betrodde nettverk finnes p\u00e5 <a target="new" href="http://wiki.zimbra.com/index.php?title=ZimbraMtaMyNetworks">http://wiki.zimbra.com/index.php?title=ZimbraMtaMyNetworks</a>.
@@ -1459,6 +1482,11 @@ WARNING_EACH_ALIAS6 = Ressursen {0} har allerede aliaset {1}
 WARNING_ALIAS_EXISTS = Kan ikke legge til alias:
 WARNING_ALIASES_EXIST = Kan ikke legge til aliaser:
 WARNING_ALIASES_TARGET_NON_EXIST = M\u00e5lkonto/dl {0} finnes ikke 
+ERROR_TARGET_DOMAIN_NOT_EXIST = Target domain {0} doesn''t exist
+ERROR_DOMAIN_ALIAS_EXIST = Can''t create domain alias {0}. It already exists.
+ERROR_TARGET_DOMAIN_IS_ALIAS = Target domain must be a local domain. {0} is a domain alias.
+ERROR_DOMAIN_ALIAS_NOT_EXIST = You must specify the domain alias.
+
 
 WARNING_REINDEX = \
 	Reindeksering av en brukers mailboks kan ta lang tid og KAN IKKE angres.<br> \
@@ -1558,12 +1586,16 @@ Q_DELETE_VOLUMES = \
 Q_FLUSH_QUEUES = \
 	En t\u00f8mming vil fors\u00f8ke \u00e5 levere all mail i k\u00f8 p\u00e5 denne server.<br> \
 	Denne funksjon vil ugyldiggj\u00f8re det meldingstantall, som vises i \u00f8jeblikket for k\u00f8ene p\u00e5 denne server.<br> \
-	Vil du utf\u00f8re en t\u00f8mming av k\u00f8en? 
-    
+	Vil du utf\u00f8re en t\u00f8mming av k\u00f8en
+Q_CREATE_VOLUME = Are you sure you want to create a volume at {0}? 
+DELETED_VOLUMES_CONFIRMATION = Succesfully deleted selected volumes.
+UPDATE_VOLUME_CONFIRMATION = Successfully updated the volume.
+VolumeCreated = Created volume at {0}.
 CORRECT_ERRORS = Korriger verdierne i disse felter:
 WARN_DELETING_SYSTEM_RESOURCES = Warning! One or more of the selected accounts are special system resources. Deleting these accounts may cause unexpected errors.
 WARN_DELETING_SYSTEM_RESOURCE = Warning! {0} is a special system resource account. Deleting this account may cause unexpected errors. Are you sure you want to delete this account?
 WARN_DELETING_GAL_SYNC = Warning! {0} is a GAL Sync account. Deleting this account may cause unexpected errors. Are you sure you want to delete this account?
+WARN_CHANGE_AUTH_METH = Warning! You need to reload the tab(s) for
 
 attrDesc_zimbraId = Id
 attrDesc_accountName = Fult navn
@@ -1592,6 +1624,7 @@ domainStatus_shutdown = Lukning
 
 aliasTargetTypeAccount = Konto
 aliasTargetTypeDL = Distribusjonsliste
+aliasTargetTypeResource = Resource
 
 STANDALONE = Selvstendig
 MASTER = Master
@@ -1644,13 +1677,18 @@ searchByServer = Server
 tt_searchByServer = Filtrer s\u00f8ket etter server
 searchByBasic = Basisegenskaper
 tt_searchByBasic = Filtrer s\u00f8ket etter LDAP-basisegenskaper
+searchByCOS = Class of Service
+tt_searchByCOS = Filter the search by COS
 searchByRemoveAll = Fjern alle
 tt_searchByRemoveAll = Fjern alle de aktuelle s\u00f8keinnstillinger
 search_option_all_domain = Alle domener
 search_option_filter = Filter: 
 search_option_filter_input_help = <Tast inn domenenavnet ...>
+search_option_filter_input_help_cos = <Type the COS name ...>
 tt_domain_search_option_filter = Tast inn domenenavnet og alle matchende domener vil vises.
+tt_cos_search_option_filter = Type the COS name and all the matching domains will be returned.
 no_domain_found_msg = Ingen matchende domener ble funnet. Finjuster filteret.
+no_cos_found_msg = No matching Class of Service is found. Please refine your filter.
 search_option_all_server = Alle servere
 search_option_query = foresp\u00f8rsel: 
 search_option_uid = Navn: 
@@ -1683,6 +1721,7 @@ zimbraAdminTitle = Zimbra administrasjon
 login = Lotg inn
 loginHeader = Zimbra(TM) Collaboration Suite \u2013 Administrasjonskonsoll
 username = Brukernavn
+more = Use local Appliance login
 password = Passord
 newPassword = Nytt passord
 confirmPassword = Bekreft
@@ -1803,8 +1842,9 @@ Shares_PublishAll = Publish All Shares
 splashScreenLoading = Leser inn ...
 splashScreenAppName = Administrasjonskonsoll
 splashScreenZimbraUrl = <a href='http://www.zimbra.com' target=_blank>http://www.zimbra.com</a>
-splashScreenCopyright = Copyright \u00a9 2005-2008 Zimbra, Inc.     'Zimbra' og Zimbra-logoene er varemerker tilh\u00f8rende Zimbra, Inc.
-splashScreenVersion = Versjon
+splashScreenCopyright = Copyright \u00a9 2005-2011 VMware, Inc. VMware and Zimbra are registered trademarks or trademarks of VMware, Inc.
+splashScreenVersion = Version
+rememberMe = Remember me
 
 IMPORT_WIZ_DOWNLOAD_HELP = Brukerinstruksjoner
 CONNECTOR_DOWNLOAD_HELP = Brukerinstruksjoner 
@@ -1856,7 +1896,7 @@ Alias_Dlg_label_target_acct = M\u00e5lkonto:
 #License 
 TBB_UpdateLicense = Oppdater lisens
 ALTBB_UpdateLicense_tt = Oppdater lisensen ved bruk av guiden til lisensn\u00f8kkelinstallasjon
-
+ 
 
 #TABS
 tt_tab_View = Vis 
@@ -2006,6 +2046,7 @@ UI_Comp_mailQueueView = Mail Queue View
 UI_Comp_ZimletListView = Zimlet List View
 UI_Comp_AdminZimletListView = Admin Zimlet List View
 UI_Comp_SaveSearch = Saved Searches View
+UI_Comp_HelpSearch = Help Search View
 UI_Comp_AccountsContactTab = Account View, Contact Information Page 
 UI_Comp_AccountsMemberofTab = Account View, Member Of Page
 UI_Comp_AccountsPrefsTab = Account View, Preferences Page
@@ -2074,7 +2115,10 @@ UI_Comp_serverStatsQuotaTab = Per Server Statistics View,  Mailbox Quota Page
 choice_form = Form
 choice_basic = Basic
 
-LB_External_mail = External Email Address:
+choice_webdav = WebDAV
+choice_ews = EWS
+
+LB_External_mail = List Member:
 TBB_MoreActions = More Actions
 TBB_MoreActions_tt = Click to view more actions
 
@@ -2084,14 +2128,60 @@ DOMINO_MIG_WIZ_DOWNLOAD_LINK_MSG = ZCS Migration Wizard for Domino
 IMPORT_WIZ_DOWNLOAD_LINK_MSG = PST Import Wizard
 ZIMBRA_TOASTER_DOWNLOAD_LINK_MSG = Zimbra Toaster
 CONNECTOR_MSI_DOWNLOAD_LINK_MSG = Zimbra Connector for Outlook MSI Customizer
-CONNECTOR_DOWNLOAD_LINK_MSG = Zimbra Connector for Outlook
+ZCO_BRANDING_DOWNLOAD_LINK_MSG = Zimbra Connector for Outlook Branding MSI
+CONNECTOR_32_DOWNLOAD_LINK_MSG = Zimbra Connector(32bits) for Outlook
+CONNECTOR_64_DOWNLOAD_LINK_MSG = Zimbra Connector(64bits) for Outlook
 CONNECTOR_ISYNC_DOWNLOAD_LINK_MSG = Zimbra Connector for Apple iSync
 ICAL_MIG_GUIDE = Zimbra iCalendar Migration Guide
 ICAL_MIG_GUIDE_INFO =  Zimbra iCalendar Migration Guide includes information about the \
         iCalendar Migration Tool, migration planning, steps to migrate, and \
         information about log files and contacting Zimbra Support.
-ZWC_END_USER_GUIDE = ZWC End User Guide for 6.0
+ZWC_END_USER_GUIDE = ZWC End User Guide for 7.0
 ZWC_END_USER_GUIDE_INFO = The end user guide describes the features and applications used in the Zimbra Web Client.
 
-
-
+NAD_DataSourcePolling = Data Source
+MSG_zimbraDataSourceMinPollingInterval = Shortest allowed duration for any polling interval
+LBL_zimbraDataSourceMinPollingInterval = Shortest allowed duration for any polling interval:
+MSG_zimbraDataSourcePop3PollingInterval = POP3 polling interval
+LBL_zimbraDataSourcePop3PollingInterval = POP3 polling interval:
+MSG_zimbraDataSourceImapPollingInterval = IMAP polling interval
+LBL_zimbraDataSourceImapPollingInterval = IMAP polling interval:
+MSG_zimbraDataSourceCalendarPollingInterval = Calendar polling interval
+LBL_zimbraDataSourceCalendarPollingInterval = Calendar polling interval:
+MSG_zimbraDataSourceRssPollingInterval = RSS polling interval
+LBL_zimbraDataSourceRssPollingInterval = RSS polling interval:
+MSG_zimbraDataSourceCaldavPollingInterval = CalDAV polling interval
+LBL_zimbraDataSourceCaldavPollingInterval = CalDAV polling interval:
+
+NAD_AutoSaveDraft = Auto Save Draft
+MSG_zimbraPrefAutoSaveDraftInterval = Draft auto save interval
+LBL_zimbraPrefAutoSaveDraftInterval = Draft auto save interval:
+
+NAD_zimbraSMIMEFeature  = S/MIME Features
+LBL_zimbraFeatureManageSMIMECertificateEnabled = Allow end user to publish and remove S/MIME certificates
+LBL_zimbraFeatureSMIMEEnabled = Enable S/MIME
+
+externalAccountNote = This account uses external mail transport
+
+NAD_ProxyAllowedDomains = Proxy Allowed Domains
+MSG_zimbraProxyAllowedDomains = Proxy Allowed Domain Name
+LBL_zimbraProxyAllowedDomains = Proxy Allowed Domain Name:
+NAD_ProxyAddAllowedDomain = Add Domain
+NAD_ProxyRemoveAllowedDomain = Remove
+
+TABT_Certificate = Certificate
+NAD_DomainSSLCertificate = Domain Certificate
+NAD_DomainSSLPrivateKey = Domain Private Key
+ERROR_DOMAIN_CERT_KEY_VERIFY = Verify Domain Certificate and Private Key Error
+ERROR_DOMAIN_CERT_KEY_INVALID = Invalid certificate or private key
+MSG_DOMAIN_CERT_KEY = Domain certificate should be appended with CA certificate, and \
+		Domain private key should be password-less.
+MSG_DOMAIN_CERT_UPLOADED = Your domain certificates and keys are successfully saved. \
+To complete the deployment of certificates and keys, as zimbra, run \
+"/opt/zimbra/libexec/zmdomaincertmgr deploycrts"
+
+ALERT_DOMAIN_CERT_KEY = (1) make sure CA certificate is appended to the bottom of certificates. <br/> \
+		(2) make sure private key is password-less.
+ERROR_DOMAIN_CERT_MISSING = Certificate is necessary
+ERROR_DOMAIN_KEY_MISSING = Private Key is necessary
+ERROR_DOMAIN_CERT_VERIFY = Can not verify certificate and key
diff --git a/messages/ZhMsg_no.properties b/messages/ZhMsg_no.properties
index 9dd846b..cbbb78f 100644
--- a/messages/ZhMsg_no.properties
+++ b/messages/ZhMsg_no.properties
@@ -1518,12 +1518,12 @@ ALT_LOW_PRIORITY = Low Priority
 ALT_MSG_NEXT_MESSAGE = go to next message
 ALT_MSG_PREVIOUS_MESSAGE = go to previous message
 ALT_MSG_STATUS_APPT = Appointment
-ALT_MSG_STATUS_UNREAD Unread Message
-ALT_MSG_STATUS_DRAFT Draft Message
-ALT_MSG_STATUS_REPLIEDTO Replied To Message
-ALT_MSG_STATUS_FORWARDED Forwarded Message
-ALT_MSG_STATUS_SENTBYME Sent Message
-ALT_MSG_STATUS_READ Read Message
+ALT_MSG_STATUS_UNREAD = Unread Message
+ALT_MSG_STATUS_DRAFT = Draft Message
+ALT_MSG_STATUS_REPLIEDTO = Replied To Message
+ALT_MSG_STATUS_FORWARDED = Forwarded Message
+ALT_MSG_STATUS_SENTBYME = Sent Message
+ALT_MSG_STATUS_READ = Read Message
 ALT_NEW_APPOINTMENT = New Appointment
 ALT_NEW_TASK = New Task
 ALT_NORMAL_PRIORITY = Normal Priority
diff --git a/messages/___ZmMsg_no___properties___od7UP0 b/messages/___ZmMsg_no___properties___od7UP0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/messages/___ZmMsg_no___properties___od7UP0