From d67bb02e35c38dcfba51349ba91592a5fa5fb488 Mon Sep 17 00:00:00 2001 From: "mattwillis%gmail.com" Date: Wed, 7 Jun 2006 20:47:11 +0000 Subject: [PATCH] bug 267981 move calendar localization to /l10n. r=wolfiR defer=dmose --- allmakefiles.sh | 1 + calendar/lightning/jar.mn | 16 +- calendar/locales/Makefile.in | 134 +++- calendar/locales/all-locales | 18 + calendar/locales/en-US/README.txt | 3 + .../en-US/chrome/calendar/calendar.dtd | 6 - .../en-US/sunbird-l10n.js} | 12 +- calendar/locales/jar.mn | 27 +- calendar/resources/Makefile.in | 3 - calendar/resources/jar.mn | 21 - .../resources/locale/en-US/aboutDialog.dtd | 76 --- calendar/resources/locale/en-US/calendar.dtd | 584 ------------------ .../locale/en-US/calendar.properties | 266 -------- .../locale/en-US/calendarCreation.dtd | 53 -- .../locale/en-US/connectionPrefs.dtd | 35 -- calendar/resources/locale/en-US/contents.rdf | 58 -- .../locale/en-US/dateFormat.properties | 146 ----- .../resources/locale/en-US/email.properties | 45 -- calendar/resources/locale/en-US/global.dtd | 111 ---- .../resources/locale/en-US/menuOverlay.dtd | 241 -------- calendar/resources/locale/en-US/overlay.dtd | 39 -- calendar/resources/locale/en-US/prefs.dtd | 527 ---------------- .../locale/en-US/prefutilities.properties | 7 - .../locale/en-US/selectAddresses.dtd | 56 -- client.mk | 1 + 25 files changed, 186 insertions(+), 2300 deletions(-) create mode 100644 calendar/locales/all-locales create mode 100644 calendar/locales/en-US/README.txt rename calendar/{resources/locale/en-US/categories.properties => locales/en-US/sunbird-l10n.js} (81%) delete mode 100644 calendar/resources/locale/en-US/aboutDialog.dtd delete mode 100644 calendar/resources/locale/en-US/calendar.dtd delete mode 100644 calendar/resources/locale/en-US/calendar.properties delete mode 100644 calendar/resources/locale/en-US/calendarCreation.dtd delete mode 100644 calendar/resources/locale/en-US/connectionPrefs.dtd delete mode 100644 calendar/resources/locale/en-US/contents.rdf delete mode 100644 calendar/resources/locale/en-US/dateFormat.properties delete mode 100644 calendar/resources/locale/en-US/email.properties delete mode 100644 calendar/resources/locale/en-US/global.dtd delete mode 100644 calendar/resources/locale/en-US/menuOverlay.dtd delete mode 100644 calendar/resources/locale/en-US/overlay.dtd delete mode 100644 calendar/resources/locale/en-US/prefs.dtd delete mode 100644 calendar/resources/locale/en-US/prefutilities.properties delete mode 100644 calendar/resources/locale/en-US/selectAddresses.dtd diff --git a/allmakefiles.sh b/allmakefiles.sh index adf8528d85ec..7abe2f247a44 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -1087,6 +1087,7 @@ calendar/xpi/Makefile " MAKEFILES_sunbird=" +calendar/locales/Makefile calendar/sunbird/Makefile calendar/sunbird/app/Makefile calendar/sunbird/base/Makefile diff --git a/calendar/lightning/jar.mn b/calendar/lightning/jar.mn index cf02ecbc35dc..d128a95e43b8 100644 --- a/calendar/lightning/jar.mn +++ b/calendar/lightning/jar.mn @@ -61,14 +61,14 @@ calendar.jar: content/calendar/calendar-recurrence-dialog.xul (/calendar/base/content/calendar-recurrence-dialog.xul) calendar-en-US.jar: - locale/en-US/calendar/global.dtd (/calendar/resources/locale/en-US/global.dtd) - locale/en-US/calendar/calendar.dtd (/calendar/resources/locale/en-US/calendar.dtd) - locale/en-US/calendar/calendarCreation.dtd (/calendar/resources/locale/en-US/calendarCreation.dtd) - locale/en-US/calendar/selectAddresses.dtd (/calendar/resources/locale/en-US/selectAddresses.dtd) - locale/en-US/calendar/calendar.properties (/calendar/resources/locale/en-US/calendar.properties) - locale/en-US/calendar/dateFormat.properties (/calendar/resources/locale/en-US/dateFormat.properties) - locale/en-US/calendar/menuOverlay.dtd (/calendar/resources/locale/en-US/menuOverlay.dtd) -* locale/en-US/calendar/prefs.dtd (/calendar/resources/locale/en-US/prefs.dtd) + locale/en-US/calendar/global.dtd (/calendar/locales/en-US/chrome/calendar/global.dtd) + locale/en-US/calendar/calendar.dtd (/calendar/locales/en-US/chrome/calendar/calendar.dtd) + locale/en-US/calendar/calendarCreation.dtd (/calendar/locales/en-US/chrome/calendar/calendarCreation.dtd) + locale/en-US/calendar/selectAddresses.dtd (/calendar/locales/en-US/chrome/calendar/selectAddresses.dtd) + locale/en-US/calendar/calendar.properties (/calendar/locales/en-US/chrome/calendar/calendar.properties) + locale/en-US/calendar/dateFormat.properties (/calendar/locales/en-US/chrome/calendar/dateFormat.properties) + locale/en-US/calendar/menuOverlay.dtd (/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd) +* locale/en-US/calendar/prefs.dtd (/calendar/locales/en-US/chrome/calendar/prefs.dtd) classic.jar: #expand skin/classic/lightning/lightning.css (themes/__THEME__/lightning.css) diff --git a/calendar/locales/Makefile.in b/calendar/locales/Makefile.in index 6ab0ac13b9ab..a603f155f53f 100644 --- a/calendar/locales/Makefile.in +++ b/calendar/locales/Makefile.in @@ -43,34 +43,148 @@ relativesrcdir = calendar/locales include $(DEPTH)/config/autoconf.mk -ifdef MOZ_XUL_APP -NO_JAR_AUTO_REG = 1 -endif - include $(topsrcdir)/config/config.mk +run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi) +_ABS_DIST := $(shell cd $(DIST) && pwd) + +ifdef MOZ_BRANDING_DIRECTORY +SUBMAKEFILES += $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile +endif + # This makefile uses variable overrides from the libs-% target to # build non-default locales to non-default dist/ locations. Be aware! AB = $(firstword $(subst -, ,$(AB_CD))) #ifdef MOZ_SUNBIRD -APP_VERSION = $(shell cat $(srcdir)/../sunbird/config/version.txt) +APP_VERSION = $(SUNBIRD_VERSION) DEFINES += -DAPP_VERSION="$(APP_VERSION)" #endif DEFINES += \ - -DAB_CD=$(AB_CD) \ - -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \ - -DPKG_BASENAME=$(PKG_BASENAME) \ - $(NULL) + -DAB_CD=$(AB_CD) \ + -DMOZ_LANGPACK_EID=langpack-$(AB_CD)@sunbird.mozilla.org \ + -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ + -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \ + -DPKG_BASENAME=$(PKG_BASENAME) \ + $(NULL) + +ifndef MOZ_BRANDING_DIRECTORY +DEFINES += -DMOZ_USE_GENERIC_BRANDING +endif ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS))) DEFINES += -DEXTENSION_PREF endif +PREF_JS_EXPORTS = $(LOCALE_SRCDIR)/sunbird-l10n.js + include $(topsrcdir)/config/rules.mk +README_FILES = \ + README.txt \ + $(NULL) + +libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES)) + $(INSTALL) $^ $(FINAL_TARGET) + libs-%: @$(MAKE) -C ../../toolkit/locales libs-$* - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* +# Renable when using reporter +# @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref +ifdef MOZ_BRANDING_DIRECTORY + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* +endif + +# Re-enable when using split branding +#ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +#MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore +#MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png +#MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns +#MOZ_PKG_MAC_RSRC=$(_ABS_DIST)/branding/license.r +#endif + +PACKAGER_NO_LIBS = 1 +include $(topsrcdir)/toolkit/mozapps/installer/packager.mk +include $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/charset.mk + +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS +else +STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME) +endif + +repackage-zip: ZIP_OUT=$(_ABS_DIST)/$(PACKAGE) +repackage-zip: UNPACKAGE=$(ZIP_IN) +repackage-zip: $(ZIP_IN) + $(RM) -r $(DIST)/l10n-stage + mkdir $(DIST)/l10n-stage + cd $(DIST)/l10n-stage && \ + $(UNMAKE_PACKAGE) + $(RM) $(STAGEDIST)/chrome/en-US.jar \ + $(STAGEDIST)/chrome/en-US.manifest \ + $(STAGEDIST)/chrome/calendar-en-US.jar \ + $(STAGEDIST)/chrome/calendar-en-US.manifest \ + $(STAGEDIST)/defaults/pref/sunbird-l10n.js + $(RM) -r $(STAGEDIST)/defaults/profile \ + $(STAGEDIST)/chrome/en-US + $(STAGEDIST)/chrome/calendar-en-US + $(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD) + $(MAKE) libs-$(AB_CD) + $(RM) -r $(DIST)/xpi-stage/locale-$(AB_CD)/chrome/$(AB_CD) + cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ + tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - ) +ifneq (en,$(AB)) +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj +endif +endif + cd $(DIST)/l10n-stage; \ + $(MAKE_PACKAGE) + mv -f $(DIST)/l10n-stage/$(PACKAGE) $(DIST) + +repackage-zip-%: ZIP_IN=$(_ABS_DIST)/$(PACKAGE) +repackage-zip-%: $(ZIP_IN) + @$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN) + +langpack-%: LANGPACK_FILE=$(_ABS_DIST)/install/sunbird-$(MOZ_APP_VERSION).$(AB_CD).langpack.xpi +langpack-%: AB_CD=$* +langpack-%: XPI_NAME=locale-$* +langpack-%: + @echo "Making langpack $(LANGPACK_FILE)" + @$(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD) + @$(MAKE) libs-$(AB_CD) USE_EXTENSION_MANIFEST=1 + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf + cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ + $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest + +# This is a generic target that will make a langpack, repack ZIP (+tarball) +# builds, and repack an installer if applicable. It is called from the +# tinderbox scripts. Alter it with caution. +# +# Note: the last target called here should be repackage-zip-$* as the l10n build +# systems rely on dist/l10n-stage/ to be in place in order to package +# the complete MAR files. + +installers-%: + $(NSINSTALL) -D $(DIST)/install + @$(MAKE) langpack-$* +#ifeq (WINNT,$(OS_ARCH)) +# @$(MAKE) repackage-win32-installer-$* +#endif + @$(MAKE) repackage-zip-$* + +#ifdef MOZ_UPDATER +#libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini) +#ifeq ($(OS_ARCH),WINNT) +# iconv -f UTF-8 -t $(WIN_INSTALLER_CHARSET) $< > $(FINAL_TARGET)/updater.ini +#else +#ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +# $(INSTALL) $^ $(FINAL_TARGET)/updater.app/Contents/MacOS +#else +# $(INSTALL) $^ $(FINAL_TARGET) +#endif +#endif +#endif diff --git a/calendar/locales/all-locales b/calendar/locales/all-locales new file mode 100644 index 000000000000..00c211e96a9e --- /dev/null +++ b/calendar/locales/all-locales @@ -0,0 +1,18 @@ +ca +cs +de +es-ES +fr +hu +it +ja +nl +pl +pt-BR +ru +sk +sl +sv-SE +tr +zh-CN + diff --git a/calendar/locales/en-US/README.txt b/calendar/locales/en-US/README.txt new file mode 100644 index 000000000000..927fc142f28c --- /dev/null +++ b/calendar/locales/en-US/README.txt @@ -0,0 +1,3 @@ +For information about installing, running and configuring Sunbird +including a list of known issues and troubleshooting information, +refer to: http://www.mozilla.org/projects/calendar/ diff --git a/calendar/locales/en-US/chrome/calendar/calendar.dtd b/calendar/locales/en-US/chrome/calendar/calendar.dtd index a680b815530b..0caef6422e18 100644 --- a/calendar/locales/en-US/chrome/calendar/calendar.dtd +++ b/calendar/locales/en-US/chrome/calendar/calendar.dtd @@ -576,9 +576,3 @@ - - - - - - diff --git a/calendar/resources/locale/en-US/categories.properties b/calendar/locales/en-US/sunbird-l10n.js similarity index 81% rename from calendar/resources/locale/en-US/categories.properties rename to calendar/locales/en-US/sunbird-l10n.js index 39c6852d0706..e9027aaeb93d 100644 --- a/calendar/resources/locale/en-US/categories.properties +++ b/calendar/locales/en-US/sunbird-l10n.js @@ -11,14 +11,14 @@ # for the specific language governing rights and limitations under the # License. # -# The Original Code is Mozilla Calendar code. +# The Original Code is the Firefox browser. # # The Initial Developer of the Original Code is -# ArentJan Banck . -# Portions created by the Initial Developer are Copyright (C) 2002 +# Benjamin Smedberg +# Portions created by the Initial Developer are Copyright (C) 2004 # the Initial Developer. All Rights Reserved. # -# Contributor(s): ArentJan Banck +# Contributor(s): # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or @@ -34,6 +34,6 @@ # # ***** END LICENSE BLOCK ***** -# default categories +#filter substitution -categories=Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation +pref("general.useragent.locale", "@AB_CD@"); diff --git a/calendar/locales/jar.mn b/calendar/locales/jar.mn index 84f350c83ccc..e26f6e0db915 100644 --- a/calendar/locales/jar.mn +++ b/calendar/locales/jar.mn @@ -1,9 +1,32 @@ #filter substitution +# NOTE: +# ab-CD.jar holds Sunbird-specific literals, such as branding information +# calendar-ab-CD.jar holds the literals for calendar.jar, which is shared by +# both Sunbird and Lightning. + #ifdef MOZ_SUNBIRD @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ -+ locale/branding/brand.dtd (%chrome/branding/brand.dtd) -+ locale/branding/brand.properties (%chrome/branding/brand.properties) ++ locale/branding/brand.dtd (%chrome/branding/brand.dtd) ++ locale/branding/brand.properties (%chrome/branding/brand.properties) +#endif + +calendar-@AB_CD@.jar: +% locale calendar @AB_CD@ %locale/@AB_CD@/calendar/ +* locale/calendar/aboutDialog.dtd (%chrome/calendar/aboutDialog.dtd) + locale/calendar/calendar.dtd (%chrome/calendar/calendar.dtd) + locale/calendar/calendarCreation.dtd (%chrome/calendar/calendarCreation.dtd) + locale/calendar/calendar.properties (%chrome/calendar/calendar.properties) + locale/calendar/categories.properties (%chrome/calendar/categories.properties) + locale/calendar/dateFormat.properties (%chrome/calendar/dateFormat.properties) + locale/calendar/email.properties (%chrome/calendar/email.properties) + locale/calendar/global.dtd (%chrome/calendar/global.dtd) + locale/calendar/menuOverlay.dtd (%chrome/calendar/menuOverlay.dtd) + locale/calendar/overlay.dtd (%chrome/calendar/overlay.dtd) +* locale/calendar/prefs.dtd (%chrome/calendar/prefs.dtd) +#ifdef MOZ_SUNBIRD + locale/calendar/connectionPrefs.dtd (%chrome/calendar/connectionPrefs.dtd) + locale/calendar/prefutilities.properties (%chrome/calendar/prefutilities.properties) #endif #includesubst @LOCALE_SRCDIR@/extra-jar.mn diff --git a/calendar/resources/Makefile.in b/calendar/resources/Makefile.in index 73fe507b7563..afcd9589c4ed 100644 --- a/calendar/resources/Makefile.in +++ b/calendar/resources/Makefile.in @@ -42,9 +42,6 @@ VPATH = @srcdir@ EXTRA_COMPONENTS = content/calendarService.js \ content/calAlarmMonitor.js -AB_CD = en-US -DEFINES += -DAB_CD=$(AB_CD) - include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn index 98d339924728..0692162eb258 100644 --- a/calendar/resources/jar.mn +++ b/calendar/resources/jar.mn @@ -159,24 +159,3 @@ calendar.jar: skin/modern/calendar/unifinder/priority_high.png (skin/modern/unifinder/priority_high.png) skin/modern/calendar/unifinder/priority_low.png (skin/modern/unifinder/priority_low.png) #endif - -calendar-@AB_CD@.jar: -#ifndef MOZ_SUNBIRD - locale/@AB_CD@/calendar/contents.rdf (locale/@AB_CD@/contents.rdf) -#endif -% locale calendar @AB_CD@ %locale/@AB_CD@/calendar/ -* locale/@AB_CD@/calendar/aboutDialog.dtd (locale/@AB_CD@/aboutDialog.dtd) - locale/@AB_CD@/calendar/calendar.dtd (locale/@AB_CD@/calendar.dtd) - locale/@AB_CD@/calendar/calendarCreation.dtd (locale/@AB_CD@/calendarCreation.dtd) - locale/@AB_CD@/calendar/calendar.properties (locale/@AB_CD@/calendar.properties) - locale/@AB_CD@/calendar/categories.properties (locale/@AB_CD@/categories.properties) - locale/@AB_CD@/calendar/dateFormat.properties (locale/@AB_CD@/dateFormat.properties) - locale/@AB_CD@/calendar/email.properties (locale/@AB_CD@/email.properties) - locale/@AB_CD@/calendar/global.dtd (locale/@AB_CD@/global.dtd) - locale/@AB_CD@/calendar/menuOverlay.dtd (locale/@AB_CD@/menuOverlay.dtd) - locale/@AB_CD@/calendar/overlay.dtd (locale/@AB_CD@/overlay.dtd) -* locale/@AB_CD@/calendar/prefs.dtd (locale/@AB_CD@/prefs.dtd) -#ifdef MOZ_SUNBIRD - locale/@AB_CD@/calendar/connectionPrefs.dtd (locale/@AB_CD@/connectionPrefs.dtd) - locale/@AB_CD@/calendar/prefutilities.properties (locale/@AB_CD@/prefutilities.properties) -#endif diff --git a/calendar/resources/locale/en-US/aboutDialog.dtd b/calendar/resources/locale/en-US/aboutDialog.dtd deleted file mode 100644 index f1741ea3a3b3..000000000000 --- a/calendar/resources/locale/en-US/aboutDialog.dtd +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/calendar.dtd b/calendar/resources/locale/en-US/calendar.dtd deleted file mode 100644 index a680b815530b..000000000000 --- a/calendar/resources/locale/en-US/calendar.dtd +++ /dev/null @@ -1,584 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/calendar.properties b/calendar/resources/locale/en-US/calendar.properties deleted file mode 100644 index 1450e5afa331..000000000000 --- a/calendar/resources/locale/en-US/calendar.properties +++ /dev/null @@ -1,266 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Calendar code. -# -# The Initial Developer of the Original Code is -# ArentJan Banck . -# Portions created by the Initial Developer are Copyright (C) 2002 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): ArentJan Banck -# Eric Belhaire -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -# Misc. strings in JS - -AllDayEvents=All Day Events -PrintPreviewWindowTitle=Print Preview of %1$S - -# Default name for new events -newEvent=New Event - -# Titles for the event/task dialog -newEventDialog=New Event -editEventDialog=Edit Event -newTaskDialog=New Task -editTaskDialog=Edit Task - -# The name of the calendar provided with the application by default -homeCalendarName=Home - -# The name given to a calendar if an opened calendar has an empty filename -untitledCalendarName=Untitled Calendar - -# Event status: Tentative, Confirmed, Cancelled -# ToDo task status: NeedsAction, InProcess, Completed, Cancelled -statusTentative =Tentative -statusConfirmed =Confirmed -statusCancelled =Cancelled -statusNeedsAction=Needs Action -statusInProcess =In Process -statusCompleted =Completed - -# Task priority, these should match the priority.level.* labels in calendar.dtd -highPriority=High -mediumPriority=Medium -lowPriority=Low - -noEventsOrTasksToImport=No events or tasks to import\nfrom file "%1$S". -noEventsToSave=No events selected to save. - -importPrompt=Which calendar do you want to import these items into? -exportPrompt=Which calendar do you want to export from? -publishPrompt=Which calendar do you want to publish? - -# about to import x: "
into calendar y
from file z" (calendar more likely to wrong, so before file). -aboutToImportNewEventsTitle=Import New Events -aboutToImportNewEvents=About to import %1$S new event(s)\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do? -aboutToImportDupEventsTitle=Import Duplicate Events -aboutToImportDupEvents=About to import %1$S event(s) that are duplicates of events in your calendar,\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do? -aboutToImportNewTasksTitle=Import New Tasks -aboutToImportNewTasks=About to import %1$S new task(s)\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do? -aboutToImportDupTasksTitle=Import Duplicate Tasks -aboutToImportDupTasks=About to import %1$S task(s) that are duplicates of tasks in your calendar,\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do? - -discardAll=Discard all -importAll=Import all -promptForEach=Prompt for each -addDuplicate=Add duplicate entry: - -#spaces needed at the end of the following lines -eventTitle=Title: -eventStartTime=Start Time: -eventEndTime=End Time: -eventSummary=Summary: -eventDescription=Description: -eventWhen=When: -eventWhere=Where: - -unableToRead=Unable to read from file: -unableToWrite=Unable to write to file: -concurrentEdit=Unable to save changes. The item has been edited externally. -defaultFileName=MozillaCalEvents -HTMLTitle=Mozilla Calendar - -deleteCalendarTitle=Delete Calendar -deleteCalendarMessage=Are you sure you want to delete this calendar? -deleteCalendarOnly=Delete Calendar -deleteCalendarAndFile=Delete Calendar And File - -unsubscribeCalendarTitle=Unsubscribe from Calendar -unsubscribeCalendarMessage=Are you sure you want to unsubscribe from calendar "%1$S"? - -weekDayMonthLabel=%1$S %2$S %3$S - -# -# P R E F S -# Default values for preferences -# - -#the default day to start the week on -#0=Sunday 1=Monday 2=Tuesday 3=Wednesday 4=Thursday 5=Friday 6=Saturday -defaultWeekStart=0 -# default days off (not in work week) -defaultWeekSundaysOff =true -defaultWeekMondaysOff =false -defaultWeekTuesdaysOff =false -defaultWeekWednesdaysOff=false -defaultWeekThursdaysOff =false -defaultWeekFridaysOff =false -defaultWeekSaturdaysOff =true -defaultWeeksInView=4 -defaultPreviousWeeksInView=0 -showAlarms=1 -showMissed=1 -playAlarmSound=0 -soundURL=chrome://calendar/content/sound.wav -reloadServersOnLaunch=false -defaultEventLength=60 -defaultSnoozeAlarmLength=60 -dateFormat=0 -storeInGmt=0 -defaultStartHour=8 -defaultEndHour=17 -defaultzone=America/New_York -defaulteventalarmunit=minutes -defaulttodoalarmunit=minutes - -Week=Week -WeekTitle=Week %1$S -# Used to format the Multiweek's labels, ie Weeks 2 - 7 -WeeksTitle=Weeks %1$S-%2$S -None=None - -# Alarm -TooManyAlarmsMessage=You have %1$S total alarms. We've shown you the last 6. Click Acknowledge All to clear them all. - -# Error strings -## @name UID_NOT_FOUND -## @loc none -1001=Warning UID not found! Assigning new one. - -# Editing repeating items strings -editRecurTitle=Editing a repeating item -editRecurMessage=The item you are editing is a repeating item. Do you want to edit all occurrences of it or only this single instance? -editRecurAll=All occurrences -editRecurSingle=This occurrence only - -# List of events or todos (unifinder) -eventUntitled=Untitled - -# Tooltips of events or todos -tooltipTitle =Title: -tooltipLocation =Location: -# event date, usually an interval, such as -# Date: 7:00--8:00 Thu 9 Oct 2011 -# Date: Thu 9 Oct 2000 -- Fri 10 Oct 2000 -tooltipDate =Date: -# event status: tentative, confirmed, cancelled -tooltipStatus =Status: -# task/todo fields -# start date time, due date time, task priority number, completed date time -tooltipStart =Start: -tooltipDue =Due: -tooltipPriority =Priority: -tooltipPercent =% Complete: -tooltipCompleted=Completed: - -#File commands and dialogs -New=New -Open=Open -Save=Save -SaveAs=Save As -filepickerDefString=MozillaCalendarFile.ics -### %1$S in the server name -filepickerDefServerString=MozillaCalendar%1$S.ics - -#filter -filterCalendar=Calendar Files -filtervCalendar=vCalendar Files -filterXcs=iCalendar XML Document -filterXml=XML Document -filterRtf=Rich Text Format (RTF) -filterHtml=HTML Files -filterCsv=Comma Separated -filterOutlookCsv=Outlook Comma Separated -filterRdf=iCalendar RDF - -# Literal Outlook CSV headers. Take from a .csv file exported by Outlook. -# For matching first line of .csv file to import Outlook Comma Separated events. -outlookCSVTitle =Subject -outlookCSVStartDate =Start Date -outlookCSVStartTime =Start Time -outlookCSVEndDate =End Date -outlookCSVEndTime =End Time -outlookCSVAllDayEvent=All day event -outlookCSVAlarm =Reminder on/off -outlookCSVAlarmDate =Reminder Date -outlookCSVAlarmTime =Reminder Time -outlookCSVCategories =Categories -outlookCSVDescription=Description -outlookCSVLocation =Location -outlookCSVPrivate =Private -# Literal values for True and False in .csv files exported by Outlook -outlookCSVValueTrue =True -outlookCSVValueFalse =False - -# Questions to user about how to parse values -outlookCSVDateParseConfirm=\ - A date in this file is formatted as "%1$S".\n\ - The operating system is set to parse this date as "%2$S".\n\ - Is this OK?\n\ - (If not, adjust settings so format matches, then restart this application.) - -# Remote calendar errors -errorTitle=Error getting calendar -httpError=Getting the calendar file failed.\nStatus code: %1$S: %2$S -otherError=Getting the calendar file failed.\nStatus code: 0x%1$S -httpPutError=Publishing the calendar file failed.\nStatus code: %1$S: %2$S -otherPutError=Publishing the calendar file failed.\nStatus code: 0x%1$S -contentError=This doesn't appear to be a valid file. Here's what I got back from\n%1$S:\nResult: %2$S -readOnlyMode=There has been an error reading data for calendar: %1$S. It has been placed in read-only mode, since changes to this calendar will likely result in data-loss. You may change this setting by choosing 'Edit Calendar'. -minorError=There has been an error reading data for calendar: %1$S. However, this error is believed to be minor, so the program will attempt to continue. -stillReadOnlyError=There has been an error reading data for calendar: %1$S. -utf8DecodeError=An error occured while decoding an iCalendar (ics) file as UTF-8. Check that the file, including symbols and accented letters, is encoded using the UTF-8 character encoding. -icsMalformedError=Parsing an iCalendar (ics) file failed. Check that the file conforms to iCalendar (ics) file syntax. - -# LOCALIZATION NOTE (likelyTimezone): -# Translators, please put the most likely timezone that the people using your -# locale will be in. Ideally, this would be a long name taken from -# mozilla/calendar/base/src/tzdata.c. If you don't understand that file or -# these instructions, simply put the Olson-timezone name in English, ie "America/New_York" -likelyTimezone=America/New_York - -# Print Layout -formatListName = List - -rotate=Rotate - -# Import/Export -htmlDesc=HTML -icsDesc=iCalendar -outlookDesc=Comma Separated Values (from Outlook) diff --git a/calendar/resources/locale/en-US/calendarCreation.dtd b/calendar/resources/locale/en-US/calendarCreation.dtd deleted file mode 100644 index 2605ec0a9551..000000000000 --- a/calendar/resources/locale/en-US/calendarCreation.dtd +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/connectionPrefs.dtd b/calendar/resources/locale/en-US/connectionPrefs.dtd deleted file mode 100644 index 720aef83f20e..000000000000 --- a/calendar/resources/locale/en-US/connectionPrefs.dtd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/contents.rdf b/calendar/resources/locale/en-US/contents.rdf deleted file mode 100644 index e597c875707c..000000000000 --- a/calendar/resources/locale/en-US/contents.rdf +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/dateFormat.properties b/calendar/resources/locale/en-US/dateFormat.properties deleted file mode 100644 index f96e936ce547..000000000000 --- a/calendar/resources/locale/en-US/dateFormat.properties +++ /dev/null @@ -1,146 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is OEone Calendar Code, released October 31st, 2001. -# -# The Initial Developer of the Original Code is -# OEone Corporation. -# Portions created by OEone Corporation are Copyright (C) 2001 -# OEone Corporation. All Rights Reserved. -# -# Contributor(s): Garth Smedley -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -# Month names - Add full names when needed - -month.1.Mmm=Jan -month.2.Mmm=Feb -month.3.Mmm=Mar -month.4.Mmm=Apr -month.5.Mmm=May -month.6.Mmm=Jun -month.7.Mmm=Jul -month.8.Mmm=Aug -month.9.Mmm=Sep -month.10.Mmm=Oct -month.11.Mmm=Nov -month.12.Mmm=Dec - -month.1.name=January -month.2.name=February -month.3.name=March -month.4.name=April -month.5.name=May -month.6.name=June -month.7.name=July -month.8.name=August -month.9.name=September -month.10.name=October -month.11.name=November -month.12.name=December - -#Don't change this without notifying people in calendar first. -day.1.name=Sunday -day.2.name=Monday -day.3.name=Tuesday -day.4.name=Wednesday -day.5.name=Thursday -day.6.name=Friday -day.7.name=Saturday - -day.1.Mmm=Sun -day.2.Mmm=Mon -day.3.Mmm=Tue -day.4.Mmm=Wed -day.5.Mmm=Thu -day.6.Mmm=Fri -day.7.Mmm=Sat - -# Can someone tell me why were not counting from zero? -day.1.short=S -day.2.short=M -day.3.short=T -day.4.short=W -day.5.short=T -day.6.short=F -day.7.short=S - -am-string=AM -pm-string=PM - -AllDay=All Day - -# Added to support localization of messages within eventDialog.js -# Day ordinals imply order within a list. -ordinal.suffix.1=st -ordinal.suffix.2=nd -ordinal.suffix.3=rd -ordinal.suffix.4=th -ordinal.suffix.5=th -ordinal.suffix.6=th -ordinal.suffix.7=th -ordinal.suffix.8=th -ordinal.suffix.9=th -ordinal.suffix.10=th -ordinal.suffix.11=th -ordinal.suffix.12=th -ordinal.suffix.13=th -ordinal.suffix.14=th -ordinal.suffix.15=th -ordinal.suffix.16=th -ordinal.suffix.17=th -ordinal.suffix.18=th -ordinal.suffix.19=th -ordinal.suffix.20=th -ordinal.suffix.21=st -ordinal.suffix.22=nd -ordinal.suffix.23=rd -ordinal.suffix.24=th -ordinal.suffix.25=th -ordinal.suffix.26=th -ordinal.suffix.27=th -ordinal.suffix.28=th -ordinal.suffix.29=th -ordinal.suffix.30=th -ordinal.suffix.31=st - -ordinal.name.last=Last -ordinal.name.1=First -ordinal.name.2=Second -ordinal.name.3=Third -ordinal.name.4=Fourth -ordinal.name.5=Fifth - -# For the recurrence dialog -# Will be subsituted with one of ordinal.name.N and one of day.N.name -# Second Tuesday of the month -recurNthWeek=%1$S %2$S of the month -# Will be subsituted with one of day.N.name -# Last Tuesday of the month -recurLast=Last %1$S of the month -# Will be subsituted with day and one of ordinal.suffix.N -# 15th day of the month -recurNthDay=%1$S%2$S day of the month diff --git a/calendar/resources/locale/en-US/email.properties b/calendar/resources/locale/en-US/email.properties deleted file mode 100644 index 29320bdf88e6..000000000000 --- a/calendar/resources/locale/en-US/email.properties +++ /dev/null @@ -1,45 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Calendar code. -# -# The Initial Developer of the Original Code is -# ArentJan Banck . -# Portions created by the Initial Developer are Copyright (C) 2002 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): Mike Potter -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -# Email items. -AttachmentName=CalendarEvent.ics -When=When: -Where=Where: -Organizer=Organizer: -Summary=Summary: -EmailSubject=Calendar Events -AlarmEmailBody=Calendar Event Alarm Went Off!\n----------------------------\nTitle: %1$S at %2$S\nThis message sent to you from the Mozilla Calendar.\nhttp://www.mozilla.org/projects/calendar/ -AlarmEmailSubject=Mozilla Calendar Alarm: %1$S diff --git a/calendar/resources/locale/en-US/global.dtd b/calendar/resources/locale/en-US/global.dtd deleted file mode 100644 index 7be7a8b9503c..000000000000 --- a/calendar/resources/locale/en-US/global.dtd +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/menuOverlay.dtd b/calendar/resources/locale/en-US/menuOverlay.dtd deleted file mode 100644 index dc5543924349..000000000000 --- a/calendar/resources/locale/en-US/menuOverlay.dtd +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/overlay.dtd b/calendar/resources/locale/en-US/overlay.dtd deleted file mode 100644 index b39360204061..000000000000 --- a/calendar/resources/locale/en-US/overlay.dtd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - diff --git a/calendar/resources/locale/en-US/prefs.dtd b/calendar/resources/locale/en-US/prefs.dtd deleted file mode 100644 index 072c2480664d..000000000000 --- a/calendar/resources/locale/en-US/prefs.dtd +++ /dev/null @@ -1,527 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -#ifdef MOZ_SUNBIRD - - - - -#endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/resources/locale/en-US/prefutilities.properties b/calendar/resources/locale/en-US/prefutilities.properties deleted file mode 100644 index a68be0d7ea77..000000000000 --- a/calendar/resources/locale/en-US/prefutilities.properties +++ /dev/null @@ -1,7 +0,0 @@ -can=Allow -cannot=Block -viewrow=View... -hiderow=Hide - -prefSaveFailedAlert=Failed to save the preferences file. Any preference changes will be lost at the end of this session. -prefSaveFailedTitle=Save Error diff --git a/calendar/resources/locale/en-US/selectAddresses.dtd b/calendar/resources/locale/en-US/selectAddresses.dtd deleted file mode 100644 index c6b3c334fcde..000000000000 --- a/calendar/resources/locale/en-US/selectAddresses.dtd +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/client.mk b/client.mk index f508988dea45..9d497832d6bd 100644 --- a/client.mk +++ b/client.mk @@ -319,6 +319,7 @@ MODULES_calendar := \ LOCALES_calendar := \ $(LOCALES_toolkit) \ + calendar \ other-licenses/branding/sunbird \ $(NULL)