Updated files from Zimbra 7.1.3

3 files changed, 44 insertions, 56 deletions

diff --git a/messages/AjxMsg_no.properties b/messages/AjxMsg_no.properties
index c670cbc..93495b4 100644
--- a/messages/AjxMsg_no.properties
+++ b/messages/AjxMsg_no.properties
@@ -1,7 +1,7 @@
 # 
 # ***** BEGIN LICENSE BLOCK *****
 # Zimbra Collaboration Suite Web Client
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -144,6 +144,7 @@ stringTooShort = Verdien m\u00e5 best\u00e5 av minst {0} tegn.
 stringTooLong = Verdien m\u00e5 ikke v\u00e6re lengre enn {0} tegn.
 stringMismatch = Verdien er ugyldig.
 invalidEmailAddr = Ugyldig e-postadresse.
+invalidEmailAddrValue = {0} is not a valid email address.
 
 notANumber = Verdien skal v\u00e6re et tall.
 notAnInteger = Verdien skal v\u00e6re et hel-tall.
@@ -304,51 +305,38 @@ America/Los_Angeles = GMT -08:00 US/Canada Pacific
 #       And you should always leave a "###" entry at the end to
 #       avoid accidentally include intl font families inherited
 #       from the less specific locale property file.
-fontFamilyBase1.display = Andale Mono
-fontFamilyBase2.display = Arial
-fontFamilyBase3.display = Arial Black
-fontFamilyBase4.display = Book Antiqua
-fontFamilyBase5.display = Bookman Old Style
-fontFamilyBase6.display = Comic Sans MS
-fontFamilyBase7.display = Courier New
-fontFamilyBase8.display = Garamond
-fontFamilyBase9.display = Georgia
-fontFamilyBase10.display = Helvetica
-fontFamilyBase11.display = Impact
-fontFamilyBase12.display = Lucida Console
-fontFamilyBase13.display = Symbol
-fontFamilyBase14.display = Tahoma
-fontFamilyBase15.display = Terminal
-fontFamilyBase16.display = Times New Roman
-fontFamilyBase17.display = Trebuchet MS
-fontFamilyBase18.display = Verdana
-fontFamilyBase19.display = Webdings
-fontFamilyBase20.display = Wingdings
-fontFamilyBase21.display = ###
+
+
+
+fontFamilyBase1.display = Sans Serif
+fontFamilyBase2.display = Serif
+fontFamilyBase3.display = Wide Block
+fontFamilyBase4.display = Monospaced
+fontFamilyBase5.display = Comic
+fontFamilyBase6.display = Console
+fontFamilyBase7.display = Garamond
+fontFamilyBase8.display = Elegant
+fontFamilyBase9.display = Professional
+fontFamilyBase10.display = Terminal
+fontFamilyBase11.display = Modern
+fontFamilyBase12.display = Wide
+fontFamilyBase13.display = ###
 
 # TODO: Should we expose the base font families for translation?
 #L10N_IGNORE_BLOCK_BEGIN
-fontFamilyBase1.css = andale mono,times
-fontFamilyBase2.css = arial, helvetica, sans-serif
+fontFamilyBase1.css = arial, helvetica, sans-serif
+fontFamilyBase2.css = times new roman, new york, times, serif
 fontFamilyBase3.css = arial black,avant garde
-fontFamilyBase4.css = book antiqua,palatino
-fontFamilyBase5.css = bookman old style, new york, times, serif
-fontFamilyBase6.css = comic sans ms, comic sans, sans-serif
-fontFamilyBase7.css = courier new, courier, monaco, monospace, sans-serif
-fontFamilyBase8.css = garamond, new york, times, serif
-fontFamilyBase9.css = georgia,serif
-fontFamilyBase10.css = helvetica
-fontFamilyBase11.css = impact,chicago
-fontFamilyBase12.css = lucida console, sans-serif
-fontFamilyBase13.css = symbol
-fontFamilyBase14.css = tahoma, new york, times, serif
-fontFamilyBase15.css = terminal,monaco
-fontFamilyBase16.css = times new roman, new york, times, serif
-fontFamilyBase17.css = trebuchet ms,sans-serif
-fontFamilyBase18.css = verdana, helvetica, sans-serif
-fontFamilyBase19.css = webdings
-fontFamilyBase20.css = wingdings,zapf dingbats
-fontFamilyBase21.css = ###
+fontFamilyBase4.css = courier new, courier, monaco, monospace, sans-serif
+fontFamilyBase5.css = comic sans ms, comic sans, sans-serif
+fontFamilyBase6.css = lucida console, sans-serif
+fontFamilyBase7.css = garamond, new york, times, serif
+fontFamilyBase8.css = georgia,serif
+fontFamilyBase9.css = tahoma, new york, times, serif
+fontFamilyBase10.css = terminal,monaco
+fontFamilyBase11.css = trebuchet ms,sans-serif
+fontFamilyBase12.css = verdana, helvetica, sans-serif
+fontFamilyBase13.css = ###
 #L10N_IGNORE_BLOCK_END
 
 # These will be set by the various translations
diff --git a/messages/I18nMsg_no.properties b/messages/I18nMsg_no.properties
index 7457225..bcf7a16 100644
--- a/messages/I18nMsg_no.properties
+++ b/messages/I18nMsg_no.properties
@@ -1,7 +1,7 @@
 # 
 # ***** BEGIN LICENSE BLOCK *****
 # Zimbra Collaboration Suite Web Client
-# Copyright (C) 2008, 2009, 2010 Zimbra, Inc.
+# Copyright (C) 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/ZhMsg_no.properties b/messages/ZhMsg_no.properties
index 148f11f..000ec17 100644
--- a/messages/ZhMsg_no.properties
+++ b/messages/ZhMsg_no.properties
@@ -1,7 +1,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # Zimbra Collaboration Suite Web Client
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Zimbra, Inc.
+# Copyright (C) 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
@@ -298,7 +298,8 @@ at = @
 atBottomOfMessage = Below included messages
 attachFiles = Legg ved filer
 attachments = Attachments
-attachmentCount = {0,choice,0#no attachemnts|1#{0,number,integer} attachment|1<{0,number,integer} attachements}
+attachmentCount = {0,choice,0#no attachments|1#{0,number,integer} attachment|1<{0,number,integer} attachments}
+attachmentLimitMsg = <b>Note:&nbsp;</b>Each attachment size limit is {0}
 attendee = Attendee
 attendees = Attendees
 attendeesLabel = Attendees:
@@ -650,7 +651,6 @@ labelVersion = version
 labelBy = by
 mail = E-post
 mailHeader = My Email Accounts
-mails = Mails
 mailSearch = Mail/Search
 mailDeliveryDisabled = Ikke behold en lokal kopi av meldinger
 mailFilters = Mail Filters
@@ -1215,8 +1215,8 @@ errorGoBack = Go back
 402Msg = The server has encountered an internal error or misconfiguration and was unable to complete your request.
 403Title = Forbidden
 403Msg = You don't have enough permission to access the requested resource on the server.
-404Title = Not Found
-404Msg = The requested URL was not found on this server.
+404Title = Ikke funnet
+404Msg = Den forespurte adressen finnes ikke pΠdenne serveren.
 405Title = Method Not Allowed
 405Msg = The requested method GET is not allowed for the requested URL.
 406Title = Not Acceptable
@@ -1335,18 +1335,18 @@ AB_FIELD_email2 = E-post 2
 AB_FIELD_email3 = E-post 3
 
 # work address
-AB_FIELD_workStreet = Jobb Gate
-AB_FIELD_workCity = Jobb By
+AB_FIELD_workStreet = Jobb gate
+AB_FIELD_workCity = Jobb by
 AB_FIELD_workState = Work State/Province
 AB_FIELD_workPostalCode = Work Postal Code
 AB_FIELD_workCountry = Work Country/Region
-AB_FIELD_workURL = Work Web Page
+AB_FIELD_workURL = Web Page
 
 # work phone numbers
 AB_FIELD_workPhone = Work Phone
-AB_FIELD_workPhone2 = Work Phone 2
+AB_FIELD_workPhone2 = Alternate Phone
 AB_FIELD_workFax = Work Fax
-AB_FIELD_assistantPhone = Assistant
+AB_FIELD_assistantPhone = Assistant Phone
 AB_FIELD_companyPhone = Company Phone
 AB_FIELD_callbackPhone = Callback
 AB_FIELD_workMobile = Work Mobile
@@ -1384,11 +1384,11 @@ AB_FIELD_homeCity = Home City
 AB_FIELD_homeState = Home State/Province
 AB_FIELD_homePostalCode = Home Postal Code
 AB_FIELD_homeCountry = Home Country/Region
-AB_FIELD_homeURL = Home Web Page
+AB_FIELD_homeURL = Web Page
 
 # home phone numbers
 AB_FIELD_homePhone = Home Phone
-AB_FIELD_homePhone2 = Home Phone 2
+AB_FIELD_homePhone2 = Alternate Phone
 AB_FIELD_homeFax = Home Fax
 AB_FIELD_mobilePhone = Mobile
 AB_FIELD_pager = Pager
@@ -1728,7 +1728,7 @@ ZM_formatDateMediumNoYear = MMM dd
 ZM_formatVoiceDateToday = 'Idag,' hh:mm
 ZM_formatVoiceDateYesterday = 'Ig\u00e5r,' hh:mm
 ZM_formatVoiceDate = EEE, M/d/yy, hh:mm
-
+ZM_formatDocDate = M/d/yyyy h:mm a
 # these are for quoting headers in ZMessageComposeBean
 ZM_HEADER_FROM = Fra
 ZM_HEADER_TO = Til