Commit 891469d8 authored by Christoph Goehre's avatar Christoph Goehre
Browse files

Imported Upstream version 3.0.1

parent 321cb9f6
......@@ -554,9 +554,10 @@
]]></body>
</method>
<!-- NOTE: This function may not return the true start and end time
of an occurrence if that occurrence starts or ends on a day
different than the day of this column -->
<!-- This function returns the start and end minutes of the occurrence
part in the day of this column, moreover, the real start and end
minutes of the whole occurrence (which could span multiple days)
relative to the time 0:00 of the day in this column -->
<method name="getStartEndMinutesForOccurrence">
<parameter name="aOccurrence"/>
<body><![CDATA[
......@@ -585,10 +586,22 @@
endHour = 24;
endMinute = 0;
}
let dur = aOccurrence.duration;
// For occurrences that span multiple days, we figure out the real
// occurrence start and end minutes relative to the date of this
// column and time 0:00
let durend = enddate.subtractDate(this.mDate);
let durstart = stdate.subtractDate(this.mDate);
// 'durend' is always positive, instead 'durstart' might be negative
// if the event starts one or more days before the date of this column
let realStart_ = (durstart.days * 24 + durstart.hours) * 60 + durstart.minutes;
realStart_ = durstart.isNegative ? -1 * realStart_ : realStart_;
let realEnd_ = (durend.days * 24 + durend.hours) * 60 + durend.minutes;
return { start: startHour * 60 + startMinute,
end: endHour * 60 + endMinute,
realDuration: (dur.days * 24 + dur.hours) * 60 + dur.minutes};
realStart: realStart_,
realEnd: realEnd_ };
]]></body>
</method>
......@@ -1581,26 +1594,15 @@
this.fgboxes.dragbox.setAttribute(sizeattr, (this.mDragState.origMin - mins.start) * this.mPixPerMin);
} else if (aGrabbedElement == "middle") {
this.mDragState.dragType = "move";
this.mDragState.limitDurationMin = mins.realDuration;
this.mDragState.limitDurationMin = mins.realEnd - mins.realStart;
// in a move, origMin will be the min of the start element;
// but we also use the min of start and end separately because
// we snap to one or the other according to the event start.
// we keep track of both to figure out the real shadow size.
// We snap to the start and add the real duration to find the end
this.mDragState.origMin = Math.floor(mins.start/15) * 15;
if (this.mDragState.origMin == 0) {
// event starts on 0:00 or the day before. We drag the final
// part so we snap the end and subtract duration to set
// origMinStart to the real event duration (if negative the
// event starts in the previous day)
this.mDragState.origMinEnd = Math.floor(mins.end/15) * 15;
this.mDragState.origMinStart = this.mDragState.origMinEnd - this.mDragState.limitDurationMin;
} else {
// event starts the day on which we are moving. We snap the
// start and add duration to set origMinEnd to the real end
// of the event
this.mDragState.origMinStart = Math.floor(mins.start/15) * 15;
this.mDragState.origMinEnd = this.mDragState.origMinStart + this.mDragState.limitDurationMin;
}
this.mDragState.origMinStart = Math.floor(mins.realStart/15) * 15;
this.mDragState.origMinEnd = this.mDragState.origMinStart + this.mDragState.limitDurationMin;
// Because we can pass this event to other columns, we also need
// to track the original column's date too, to get the correct offset
......
......@@ -263,7 +263,7 @@
flex="1"
disabled="true">
<xul:listcols>
<xul:listcol id="day-column" flex="1"/>
<xul:listcol anonid="day-column" flex="1"/>
</xul:listcols>
<xul:listitem anonid="item" allowevents="true">
<xul:listcell >
......@@ -1019,7 +1019,7 @@
flex="1"
style="min-width: 50em; min-height: 30em">
<xul:listcols>
<xul:listcol id="grid-column" flex="1"/>
<xul:listcol anonid="grid-column" flex="1"/>
</xul:listcols>
<xul:listitem anonid="item"
class="addressingWidgetItem"
......
......@@ -231,6 +231,10 @@ function onLoad() {
document.getElementById("item-title").focus();
document.getElementById("item-title").select();
// This causes the app to ask if the window should be closed when the
// application is closed.
window.tryToClose = onCancel;
}
/**
......
......@@ -87,14 +87,14 @@ interface calIItemBase : nsISupports
/**
* Checks whether the argument object refers the same calendar item as
* this one, by testing both the id and recurrenceId property. This
* this one, by testing both the id and recurrenceId property. This
*
* @arg aItem the item to compare against this one
*
* @return true if both ids match, false otherwise
*/
boolean hasSameIds(in calIItemBase aItem);
//
// the generation number of this item
//
......@@ -174,7 +174,7 @@ interface calIItemBase : nsISupports
attribute calIRecurrenceInfo recurrenceInfo;
readonly attribute calIDateTime recurrenceStartDate;
//
//
// All event properties are stored in a property bag;
// some number of these are "promoted" to top-level
// accessor attributes. For example, "SUMMARY" is
......@@ -182,7 +182,7 @@ interface calIItemBase : nsISupports
//
// If you use the has/get/set/deleteProperty
// methods, property names are case-insensitive.
//
//
// For purposes of ICS serialization, all property names in
// the hashbag are in uppercase.
//
......@@ -235,14 +235,44 @@ interface calIItemBase : nsISupports
boolean isPropertyPromoted(in AString name);
/**
* Returns a particular parameter value for a property, or null if the
* Returns a particular parameter value for a property, or null if the
* parameter does not exist. If the property does not exist, throws.
*
* @param aPropertyName the name of the property
* @param aParameterName the name of the parameter on the property
*/
AString getPropertyParameter(in AString aPropertyName,
in AString aParameterName);
AString getPropertyParameter(in AString aPropertyName,
in AString aParameterName);
/**
* Checks if the given property has the given parameter.
*
* @param aPropertyName The name of the property.
* @param aParameterName The name of the parameter on the property.
* @return True, if the parameter exists on the property
*/
boolean hasPropertyParameter(in AString aPropertyName,
in AString aParameterName);
/**
* Sets a particular parameter value for a property, or unsets if null is
* passed. If the property does not exist, throws.
*
* @param aPropertyName The name of the property
* @param aParameterName The name of the parameter on the property
* @param aParameterValue The value of the parameter to set
*/
void setPropertyParameter(in AString aPropertyName,
in AString aParameterName,
in AUTF8String aParameterValue);
/**
* Returns a property parameter enumerator for the given property name
*
* @param aPropertyName The name of the property.
* @return The parameter enumerator.
*/
nsISimpleEnumerator getParameterEnumerator(in AString aPropertyName);
/**
* The organizer (originator) of the item. We will likely not
......@@ -316,7 +346,7 @@ interface calIItemBase : nsISupports
* Removes the relation for this item and the referred item
*/
void removeRelation(in calIRelation relation);
/**
* Removes every relation for this item (in this items and also where it is referred
*/
......
......@@ -204,16 +204,16 @@ calCalendarManager.prototype = {
},
loginMasterPassword: function ccm_loginMasterPassword() {
// Look to see if a master password is set, if so prompt for it to try
// and avoid the multiple master password prompts on startup scenario.
// Try to avoid the multiple master password prompts on startup scenario
// by prompting for the master password upfront.
let token = Components.classes["@mozilla.org/security/pk11tokendb;1"]
.getService(Components.interfaces.nsIPK11TokenDB)
.getInternalKeyToken();
// If an empty string is valid for the internal token, then we don't
// have a master password, else, if it does, then try to login.
// Only log in to the internal token if it is already initialized,
// otherwise we get a "Change Master Password" dialog.
try {
if (!token.checkPassword("")) {
if (!token.needsUserInit) {
token.login(false);
}
} catch (ex) {
......
......@@ -438,11 +438,73 @@ calItemBase.prototype = {
} else {
this.mProperties.deleteProperty(aName);
}
delete this.mPropertyParams[aName];
},
// AString getPropertyParameter(in AString aPropertyName,
getPropertyParameter: function getPP(aPropName, aParamName) {
return this.mPropertyParams[aPropName][aParamName];
// in AString aParameterName);
getPropertyParameter: function cIB_getPropertyParameter(aPropName, aParamName) {
let propName = aPropName.toUpperCase();
let paramName = aParamName.toUpperCase();
if (propName in this.mPropertyParams) {
// If the property is not in mPropertyParams, then this just means
// there are no properties set.
return this.mPropertyParams[propName][paramName];
}
return null;
},
// boolean hasPropertyParameter(in AString aPropertyName,
// in AString aParameterName);
hasPropertyParameter: function cIB_hasPropertyParameter(aPropName, aParamName) {
let propName = aPropName.toUpperCase();
let paramName = aParamName.toUpperCase();
return ((propName in this.mPropertyParams) &&
(paramName in this.mPropertyParams[propName]));
},
//void setPropertyParameter(in AString aPropertyName,
// in AString aParameterName,
// in AUTF8String aParameterValue);
setPropertyParameter: function cIB_setPropertyParameter(aPropName, aParamName, aParamValue) {
let propName = aPropName.toUpperCase();
let paramName = aParamName.toUpperCase();
if (!(propName in this.mPropertyParams)) {
throw "Property " + aPropName + " not set";
}
this.modify();
if (aParamValue || !isNaN(parseInt(aParamValue, 10))) {
this.mPropertyParams[propName][paramName] = aParamValue;
} else {
delete this.mPropertyParams[propName][paramName];
}
return aParamValue;
},
// nsISimpleEnumerator getParameterEnumerator(in AString aPropertyName);
getParameterEnumerator: function cIB_getParameterEnumerator(aPropName) {
let propName = aPropName.toUpperCase();
if (!(propName in this.mPropertyParams)) {
throw "Property " + aPropName + " not set";
}
let parameters = this.mPropertyParams[propName];
return { // nsISimpleEnumerator
mParamNames: [ key for (key in parameters) ],
hasMoreElements: function cIB_gPE_hasMoreElements() {
return (this.mParamNames.length > 0);
},
getNext: function cIB_gPE_getNext() {
let paramName = this.mParamNames.pop()
return { // nsIProperty
QueryInterface: function cIB_gPE_gN_QueryInterface(aIID) {
return doQueryInterface(this, null, aIID, [Components.interfaces.nsIProperty]);
},
name: paramName,
value: parameters[paramName]
};
}
};
},
// void getAttendees(out PRUint32 count,
......
......@@ -101,7 +101,7 @@ calendar-alarm-widget[selected="true"] .alarm-calendar-image {
#calendar-alarm-snooze-popup-window {
background-color: menu;
color: menutext;
padding: 3px
padding: 3px;
z-index: 2147483648;
}
......
......@@ -141,8 +141,8 @@
#calendar-delete-task-button {
-moz-box-orient: vertical;
list-style-image: url(chrome://messenger/skin/icons/folder.png);
-moz-image-region: rect(0pt, 144px, 16px, 128px);
list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
#calendar-add-task-button {
......
......@@ -37,7 +37,9 @@
# ***** END LICENSE BLOCK *****
MOZ_APP_NAME=sunbird
MOZ_APP_DISPLAYNAME=Calendar
# This sets the default for nightly branding, and may get overriden by options
# in configure.in depending on the arguments passed.
MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/sunbird/branding/nightly
MOZ_UPDATER=1
MOZ_SUNBIRD=1
MOZ_CALENDAR=1
......@@ -48,7 +50,6 @@ MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
MOZ_INSTALLER=
MOZ_MATHML=
NECKO_DISK_CACHE=
# MOZ_OJI is only required to be cleared for MOZILLA_1_9_1_BRANCH.
# mozilla-central does not have this.
MOZ_OJI=
......
......@@ -93,6 +93,11 @@ MOZ_PKG_MAC_BACKGROUND=branding/background.png
MOZ_PKG_MAC_ICON=branding/disk.icns
endif
# On mozilla-central, packager.mk uses core_abspath to redefine DIST
# As the comm-central config.mk doesn't set it, do it ourselves instead
core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (WINNT,$(OS_ARCH))
......@@ -116,5 +121,4 @@ endif
make-package : removed-files-checked
removed-files-checked : removed-files stage-package
$(PERL) $(srcdir)/check-remove-files.pl removed-files $(DIST)/$(MOZ_PKG_APPNAME)
$(PERL) $(srcdir)/check-remove-files.pl removed-files $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
......@@ -148,15 +148,3 @@ $(CONFIG_DIR)/setup.exe::
include $(topsrcdir)/config/rules.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk
export::
ifndef MOZ_BRANDING_DIRECTORY
$(NSINSTALL) -D $(DIST)/branding
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
cp $(srcdir)/nsis/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
endif
......@@ -128,26 +128,36 @@ include $(topsrcdir)/config/rules.mk
# Call this target to trigger repackaging lightning for a specific language
# Usage: make AB_CD=<language> repack-l10n
repack-l10n: L10N_XPI_NAME=$(subst -en-US,,$(XPI_NAME)-$(AB_CD))
repack-l10n: repack-clobber libs-$(AB_CD) repack-process-extrafiles
@echo "Finished repackaging $(XPI_NAME) locale for Language $(AB_CD)"
# This target should not be called directly
repack-clobber:
repack-clobber-all:
@echo "Repackaging $(XPI_NAME) locale for Language $(AB_CD)"
rm -rf $(DIST)/xpi-stage/$(XPI_NAME)-$(AB_CD)
cp -R $(DIST)/xpi-stage/$(XPI_NAME) $(DIST)/xpi-stage/$(XPI_NAME)-$(AB_CD)
# This target should not be called directly
repack-clobber: repack-clobber-all
rm $(DIST)/xpi-stage/$(XPI_NAME)-$(AB_CD)/chrome/lightning-en-US.jar
rm $(DIST)/xpi-stage/$(XPI_NAME)-$(AB_CD)/chrome/calendar-en-US.jar
libs-%: L10N_XPI_NAME=$(subst -en-US,,$(XPI_NAME)-$*)
libs-%:
$(MAKE) -C locales libs AB_CD=$* XPI_NAME=$(L10N_XPI_NAME) XPI_PKGNAME=$(L10N_XPI_NAME) USE_EXTENSION_MANIFEST=1
$(MAKE) -C ../locales libs AB_CD=$* XPI_NAME=$(L10N_XPI_NAME) XPI_PKGNAME=$(L10N_XPI_NAME) USE_EXTENSION_MANIFEST=1
# Repack the existing lightning to contain all locales in lightning-all.xpi
repack-l10n-all: AB_CD=all
repack-l10n-all: L10N_XPI_NAME=lightning-all
repack-l10n-all: repack-clobber-all $(addprefix libs-,$(shell cat $(topsrcdir)/calendar/locales/shipped-locales))
# Actual locale packaging targets. If L10N_XPI_NAME is set, then use it.
# Otherwise keep the original XPI_NAME
libs-%: FINAL_XPI_NAME=$(if $(L10N_XPI_NAME),$(L10N_XPI_NAME),$(XPI_NAME))
libs-%:
$(MAKE) -C locales libs AB_CD=$* XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_NAME) USE_EXTENSION_MANIFEST=1
$(MAKE) -C ../locales libs AB_CD=$* XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_NAME) USE_EXTENSION_MANIFEST=1
repack-process-extrafiles: L10N_XPI_NAME=$(subst -en-US,,$(XPI_NAME)-$(AB_CD))
# For localized xpis, the install.rdf and lightning-l10n.js need to be
# reprocessed with some defines from the locale.
repack-process-extrafiles: LOCALE_BASEDIR=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)
repack-process-extrafiles:
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) -I $(LOCALE_BASEDIR)/defines.inc $(srcdir)/install.rdf > $(DIST)/xpi-stage/$(L10N_XPI_NAME)/install.rdf
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LOCALE_BASEDIR)/lightning-l10n.js > $(DIST)/xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js
......@@ -71,9 +71,16 @@ function ltnInitMailIdentitiesRow() {
// If there is no transport but also no organizer id, then the
// provider has not statically configured an organizer id. This is
// basically what happens when "None" is selected. Also, if there is
// a transport,
// basically what happens when "None" is selected.
var menuPopup = document.getElementById("email-identity-menupopup");
// Remove all children from the email list to avoid duplicates if the list
// has already been populated during a previous step in the calendar
// creation wizard.
while (menuPopup.lastChild) {
menuPopup.removeChild(menuPopup.lastChild);
}
addMenuItem(menuPopup, ltnGetString("lightning", "imipNoIdentity"), "none");
var identities = getAccountManager().allIdentities;
for (var i = 0; i < identities.Count(); ++i) {
......
......@@ -111,7 +111,8 @@
command="calendar_new_todo_command"
observes="calendar_new_todo_command"/>
<menuseparator id="afterltnNewTask"
insertbefore="menu_newFolder"/>
insertbefore="menu_newFolder"
observes="menu_newFolder"/>
<menuseparator id="beforenewAccountMenuItem"
insertbefore="newAccountMenuItem"/>
......
......@@ -7,7 +7,7 @@ lightning.jar:
% overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul
% overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/messenger-overlay-messageWindow.xul
% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul
% overlay chrome://communicator/content/pref/preferences.xul chrome://lightning/content/communicator-overlay-preferences.xul
% overlay chrome://communicator/content/pref/preferences.xul chrome://lightning/content/suite-overlay-preferences.xul
% overlay chrome://messenger/content/preferences/preferences.xul chrome://lightning/content/messenger-overlay-preferences.xul
% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/alarms.xul
% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/categories.xul
......@@ -23,6 +23,7 @@ lightning.jar:
% overlay chrome://calendar/content/calendarCreation.xul chrome://lightning/content/lightning-calendar-creation.xul
% overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://lightning/content/lightning-calendar-properties.xul
% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/suite-overlay-messenger.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
% override chrome://lightning/skin/accountCentral.css chrome://lightning/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
% content lightning %content/lightning/
content/lightning/imip-bar.js (content/imip-bar.js)
content/lightning/imip-bar-overlay.xul (content/imip-bar-overlay.xul)
......@@ -35,7 +36,6 @@ lightning.jar:
content/lightning/lightning-utils.js (content/lightning-utils.js)
content/lightning/lightning-widgets.css (content/lightning-widgets.css)
content/lightning/lightning-widgets.xml (content/lightning-widgets.xml)
content/lightning/communicator-overlay-preferences.xul (content/communicator-overlay-preferences.xul)
content/lightning/messenger-overlay-sidebar.css (content/messenger-overlay-sidebar.css)
content/lightning/messenger-overlay-accountCentral.xul (content/messenger-overlay-accountCentral.xul)
content/lightning/messenger-overlay-messageWindow.xul (content/messenger-overlay-messageWindow.xul)
......@@ -45,11 +45,13 @@ lightning.jar:
content/lightning/messenger-overlay-preferences.xul (content/messenger-overlay-preferences.xul)
* content/lightning/messenger-overlay-toolbar.xul (content/messenger-overlay-toolbar.xul)
content/lightning/suite-overlay-messenger.xul (content/suite-overlay-messenger.xul)
content/lightning/suite-overlay-preferences.xul (content/suite-overlay-preferences.xul)
% skin lightning classic/1.0 %skin/lightning/
skin/lightning/imip.css (themes/@THEME@/imip.css)
skin/lightning/lightning.css (themes/@THEME@/lightning.css)
skin/lightning/accountCentral.css (themes/@THEME@/accountCentral.css)
skin/lightning/lightning-widgets.css (themes/@THEME@/lightning-widgets.css)
skin/lightning/suite-accountCentral.css (themes/common/suite-accountCentral.css)
calendar.jar:
content/calendar/calendarCreation.xul (/calendar/resources/content/calendarCreation.xul)
......
/* ***** 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 Lightning code.
*
* The Initial Developer of the Original Code is
* Philip Chee <philip.chee@gmail.com>
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* 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
* 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 ***** */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
#lightning-newCalendar-row {
list-style-image: url("chrome://calendar/skin/cal-icon32.png");
}
......@@ -54,12 +54,7 @@ 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)/Makefile \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
$(NULL)
endif
SUBMAKEFILES += $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile
# This makefile uses variable overrides from the libs-% target to
# build non-default locales to non-default dist/ locations. Be aware!
......@@ -87,10 +82,6 @@ DEFINES += \
-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
$(NULL)
ifndef MOZ_BRANDING_DIRECTORY
DEFINES += -DMOZ_USE_GENERIC_BRANDING
endif
ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS)))
DEFINES += -DEXTENSION_PREF
endif
......
ar
ca
cs
da
......@@ -33,6 +34,7 @@ ru
si
sk
sl
sq
sv-SE
ta-LK
tr
......
......@@ -42,7 +42,7 @@
<!ENTITY aboutLink.label "&lt; About &brandFullName;">
<!ENTITY aboutLink.accesskey "A">
<!ENTITY aboutVersion "version">
<!ENTITY copyrightText "&#169;1998-2009 Contributors. All rights
<!ENTITY copyrightText "&#169;1998-2010 Contributors. All rights
reserved. Mozilla Sunbird, Sunbird, and the
Sunbird logos are trademarks of the Mozilla
Foundation. All rights reserved.">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment