Update fengoffice package to 1.7.

pkgsrc change: added some patches to fix known problems on 1.7.

Changes:

o E-mail module improvements
o Export reports as CSV
o Latest activity
o And more:
	- LDAP support
	- guest users
	- a new five day view for the calendar
	- prettier email notifications
	- ...

6 files changed, 247 insertions, 22 deletions

diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile
index 69c0cf3663f..7c358f5d821 100644
--- a/www/fengoffice/Makefile
+++ b/www/fengoffice/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/03/16 16:02:21 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/05 03:26:46 taca Exp $
 #
 
-DISTNAME=	fengoffice_1.6.2
-PKGNAME=	${DISTNAME:S/_/-/:S/.rc/rc1/}
-PKGREVISION=	1
+DISTNAME=	fengoffice_1.7
+PKGNAME=	${DISTNAME:S/_/-/:C/.rc$/rc1/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opengoo/}
 EXTRACT_SUFX=	.zip
@@ -58,7 +57,7 @@ pre-install:
 		config/empty.config.php
 
 do-install:
-	cd ${WRKSRC}; ${FIND} . -type f -print | \
+	cd ${WRKSRC}; ${FIND} . -type f \! -name '*.orig' -print | \
 		pax -rw ${DESTDIR}${PREFIX}/${FO_DIR}
 
 .include "../../lang/php/phpversion.mk"
diff --git a/www/fengoffice/PLIST b/www/fengoffice/PLIST
index 91a87961071..646ab216927 100644
--- a/www/fengoffice/PLIST
+++ b/www/fengoffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/01/26 15:36:24 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/07/05 03:26:46 taca Exp $
 ${FO_DIR}/application/application.php
 ${FO_DIR}/application/controllers/AccessController.class.php
 ${FO_DIR}/application/controllers/AccountController.class.php
@@ -50,6 +50,7 @@ ${FO_DIR}/application/helpers/permissions.php
 ${FO_DIR}/application/helpers/project_website.php
 ${FO_DIR}/application/helpers/tabbednavigation.php
 ${FO_DIR}/application/helpers/textile.php
+${FO_DIR}/application/hooks/fengoffice_hooks.php
 ${FO_DIR}/application/hooks/opengoo_hooks.php
 ${FO_DIR}/application/layouts/dialog.php
 ${FO_DIR}/application/layouts/error.php
@@ -68,6 +69,10 @@ ${FO_DIR}/application/models/ProjectDataObject.class.php
 ${FO_DIR}/application/models/ProjectDataObjects.class.php
 ${FO_DIR}/application/models/PublicFiles.class.php
 ${FO_DIR}/application/models/VersionChecker.class.php
+${FO_DIR}/application/models/administration_logs/AdministrationLog.class.php
+${FO_DIR}/application/models/administration_logs/AdministrationLogs.class.php
+${FO_DIR}/application/models/administration_logs/base/BaseAdministrationLog.class.php
+${FO_DIR}/application/models/administration_logs/base/BaseAdministrationLogs.class.php
 ${FO_DIR}/application/models/administration_tools/AdministrationTool.class.php
 ${FO_DIR}/application/models/administration_tools/AdministrationTools.class.php
 ${FO_DIR}/application/models/administration_tools/base/BaseAdministrationTool.class.php
@@ -77,6 +82,10 @@ ${FO_DIR}/application/models/application_logs/ApplicationLog.class.php
 ${FO_DIR}/application/models/application_logs/ApplicationLogs.class.php
 ${FO_DIR}/application/models/application_logs/base/BaseApplicationLog.class.php
 ${FO_DIR}/application/models/application_logs/base/BaseApplicationLogs.class.php
+${FO_DIR}/application/models/application_read_logs/ApplicationReadLog.class.php
+${FO_DIR}/application/models/application_read_logs/ApplicationReadLogs.class.php
+${FO_DIR}/application/models/application_read_logs/base/BaseApplicationReadLog.class.php
+${FO_DIR}/application/models/application_read_logs/base/BaseApplicationReadLogs.class.php
 ${FO_DIR}/application/models/billing_categories/BillingCategories.class.php
 ${FO_DIR}/application/models/billing_categories/BillingCategory.class.php
 ${FO_DIR}/application/models/billing_categories/base/BaseBillingCategories.class.php
@@ -93,6 +102,7 @@ ${FO_DIR}/application/models/config_categories/ConfigCategories.class.php
 ${FO_DIR}/application/models/config_categories/ConfigCategory.class.php
 ${FO_DIR}/application/models/config_categories/base/BaseConfigCategories.class.php
 ${FO_DIR}/application/models/config_categories/base/BaseConfigCategory.class.php
+${FO_DIR}/application/models/config_handlers/complex/DateFormatConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/DragDropPromptConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/FileStorageConfigHandler.class.php
 ${FO_DIR}/application/models/config_handlers/complex/InitialWorkspaceConfigHandler.class.php
@@ -188,6 +198,10 @@ ${FO_DIR}/application/models/mail_contents/MailContent.class.php
 ${FO_DIR}/application/models/mail_contents/MailContents.class.php
 ${FO_DIR}/application/models/mail_contents/base/BaseMailContent.class.php
 ${FO_DIR}/application/models/mail_contents/base/BaseMailContents.class.php
+${FO_DIR}/application/models/mail_datas/MailData.class.php
+${FO_DIR}/application/models/mail_datas/MailDatas.class.php
+${FO_DIR}/application/models/mail_datas/base/BaseMailData.class.php
+${FO_DIR}/application/models/mail_datas/base/BaseMailDatas.class.php
 ${FO_DIR}/application/models/notifier/Notifier.class.php
 ${FO_DIR}/application/models/notifier/NotifierConnectionError.class.php
 ${FO_DIR}/application/models/object_handins/ObjectHandin.class.php
@@ -436,6 +450,7 @@ ${FO_DIR}/application/views/dashboard/my_projects.php
 ${FO_DIR}/application/views/dashboard/my_tasks.php
 ${FO_DIR}/application/views/dashboard/widget.php
 ${FO_DIR}/application/views/dashboard/widget_active_tasks.php
+${FO_DIR}/application/views/dashboard/widget_activity.php
 ${FO_DIR}/application/views/dashboard/widget_calendar.php
 ${FO_DIR}/application/views/dashboard/widget_charts.php
 ${FO_DIR}/application/views/dashboard/widget_comments.php
@@ -458,6 +473,7 @@ ${FO_DIR}/application/views/event/view_event.php
 ${FO_DIR}/application/views/event/viewdate.php
 ${FO_DIR}/application/views/event/viewevent.php
 ${FO_DIR}/application/views/event/viewweek.php
+${FO_DIR}/application/views/event/viewweek5days.php
 ${FO_DIR}/application/views/feed/ical_export.php
 ${FO_DIR}/application/views/feed/recent_activities.php
 ${FO_DIR}/application/views/files/add_document.php
@@ -486,8 +502,10 @@ ${FO_DIR}/application/views/group/group_users_control.php
 ${FO_DIR}/application/views/group/view_group.php
 ${FO_DIR}/application/views/help/context_help.php
 ${FO_DIR}/application/views/help/context_help_tasks.php
+${FO_DIR}/application/views/help/help_options.php
 ${FO_DIR}/application/views/help/view_message.php
 ${FO_DIR}/application/views/json.php
+${FO_DIR}/application/views/latest_activity/activity_log.php
 ${FO_DIR}/application/views/mail/add_account.php
 ${FO_DIR}/application/views/mail/add_mail.php
 ${FO_DIR}/application/views/mail/classify.php
@@ -580,6 +598,10 @@ ${FO_DIR}/application/views/user/user_card.php
 ${FO_DIR}/application/views/webpage/add.php
 ${FO_DIR}/application/views/webpage/view.php
 ${FO_DIR}/application/views/webpage/view_content.php
+${FO_DIR}/cache/.cvsignore
+${FO_DIR}/cache/dummy.txt
+${FO_DIR}/config/.cvsignore
+${FO_DIR}/config/ldap.config.example.php
 ${FO_DIR}/console.php
 ${FO_DIR}/cron.php
 ${FO_DIR}/crossdomain.xml
@@ -604,17 +626,6 @@ ${FO_DIR}/environment/classes/controller/PageController.class.php
 ${FO_DIR}/environment/classes/dataaccess/DataManager.class.php
 ${FO_DIR}/environment/classes/dataaccess/DataObject.class.php
 ${FO_DIR}/environment/classes/dataaccess/DataPagination.class.php
-${FO_DIR}/environment/classes/dataloader/DataLoaderParams.class.php
-${FO_DIR}/environment/classes/dataloader/InitialDataLoader.class.php
-${FO_DIR}/environment/classes/dataloader/files/adjectives.txt
-${FO_DIR}/environment/classes/dataloader/files/adverbs.txt
-${FO_DIR}/environment/classes/dataloader/files/companies.txt
-${FO_DIR}/environment/classes/dataloader/files/first.txt
-${FO_DIR}/environment/classes/dataloader/files/last.txt
-${FO_DIR}/environment/classes/dataloader/files/nouns.txt
-${FO_DIR}/environment/classes/dataloader/files/verbs.txt
-${FO_DIR}/environment/classes/dataloader/files/words.txt
-${FO_DIR}/environment/classes/dataloader/resultDisplay.php
 ${FO_DIR}/environment/classes/datetimevalue/DateTimeValue.class.php
 ${FO_DIR}/environment/classes/datetimevalue/DateTimeValueLib.class.php
 ${FO_DIR}/environment/classes/debug/BenchmarkTimer.class.php
@@ -683,6 +694,8 @@ ${FO_DIR}/environment/templates/dump_error.php
 ${FO_DIR}/favicon.ico
 ${FO_DIR}/index.php
 ${FO_DIR}/init.php
+${FO_DIR}/language/.cvsignore
+${FO_DIR}/language/ca_es/_config.php
 ${FO_DIR}/language/ca_es/actions.php
 ${FO_DIR}/language/ca_es/administration.php
 ${FO_DIR}/language/ca_es/calendar.php
@@ -702,6 +715,7 @@ ${FO_DIR}/language/ca_es/slimey.js
 ${FO_DIR}/language/ca_es/timezones.php
 ${FO_DIR}/language/ca_es/upgrade.php
 ${FO_DIR}/language/cs_cz.php
+${FO_DIR}/language/cs_cz/_config.php
 ${FO_DIR}/language/cs_cz/actions.php
 ${FO_DIR}/language/cs_cz/administration.php
 ${FO_DIR}/language/cs_cz/calendar.php
@@ -726,6 +740,7 @@ ${FO_DIR}/language/cs_cz/slimey.js
 ${FO_DIR}/language/cs_cz/timezones.php
 ${FO_DIR}/language/cs_cz/upgrade.php
 ${FO_DIR}/language/de_de.php
+${FO_DIR}/language/de_de/_config.php
 ${FO_DIR}/language/de_de/actions.php
 ${FO_DIR}/language/de_de/administration.php
 ${FO_DIR}/language/de_de/calendar.php
@@ -745,6 +760,8 @@ ${FO_DIR}/language/de_de/messages.php
 ${FO_DIR}/language/de_de/objects.php
 ${FO_DIR}/language/de_de/plugins/backup.php
 ${FO_DIR}/language/de_de/plugins/dummy.txt
+${FO_DIR}/language/de_de/plugins/html_to_pdf.php
+${FO_DIR}/language/de_de/plugins/new_window.php
 ${FO_DIR}/language/de_de/project_interface.php
 ${FO_DIR}/language/de_de/reporting.php
 ${FO_DIR}/language/de_de/site_interface.php
@@ -752,7 +769,28 @@ ${FO_DIR}/language/de_de/slimey.js
 ${FO_DIR}/language/de_de/timezones.php
 ${FO_DIR}/language/de_de/upgrade.php
 ${FO_DIR}/language/default.php
+${FO_DIR}/language/el_gr.php
+${FO_DIR}/language/el_gr/_config.php
+${FO_DIR}/language/el_gr/actions.php
+${FO_DIR}/language/el_gr/administration.php
+${FO_DIR}/language/el_gr/calendar.php
+${FO_DIR}/language/el_gr/countries.php
+${FO_DIR}/language/el_gr/emails.php
+${FO_DIR}/language/el_gr/errors.php
+${FO_DIR}/language/el_gr/fields.php
+${FO_DIR}/language/el_gr/general.php
+${FO_DIR}/language/el_gr/help.php
+${FO_DIR}/language/el_gr/lang.js
+${FO_DIR}/language/el_gr/messages.php
+${FO_DIR}/language/el_gr/objects.php
+${FO_DIR}/language/el_gr/project_interface.php
+${FO_DIR}/language/el_gr/reporting.php
+${FO_DIR}/language/el_gr/site_interface.php
+${FO_DIR}/language/el_gr/slimey.js
+${FO_DIR}/language/el_gr/timezones.php
+${FO_DIR}/language/el_gr/upgrade.php
 ${FO_DIR}/language/en_us.php
+${FO_DIR}/language/en_us/_config.php
 ${FO_DIR}/language/en_us/actions.php
 ${FO_DIR}/language/en_us/administration.php
 ${FO_DIR}/language/en_us/calendar.php
@@ -776,6 +814,7 @@ ${FO_DIR}/language/en_us/slimey.js
 ${FO_DIR}/language/en_us/timezones.php
 ${FO_DIR}/language/en_us/upgrade.php
 ${FO_DIR}/language/es_es.php
+${FO_DIR}/language/es_es/_config.php
 ${FO_DIR}/language/es_es/actions.php
 ${FO_DIR}/language/es_es/administration.php
 ${FO_DIR}/language/es_es/calendar.php
@@ -797,6 +836,7 @@ ${FO_DIR}/language/es_es/slimey.js
 ${FO_DIR}/language/es_es/timezones.php
 ${FO_DIR}/language/es_es/upgrade.php
 ${FO_DIR}/language/es_la.php
+${FO_DIR}/language/es_la/_config.php
 ${FO_DIR}/language/es_la/actions.php
 ${FO_DIR}/language/es_la/administration.php
 ${FO_DIR}/language/es_la/calendar.php
@@ -818,6 +858,7 @@ ${FO_DIR}/language/es_la/slimey.js
 ${FO_DIR}/language/es_la/timezones.php
 ${FO_DIR}/language/es_la/upgrade.php
 ${FO_DIR}/language/fr_fr.php
+${FO_DIR}/language/fr_fr/_config.php
 ${FO_DIR}/language/fr_fr/actions.php
 ${FO_DIR}/language/fr_fr/administration.php
 ${FO_DIR}/language/fr_fr/calendar.php
@@ -842,6 +883,7 @@ ${FO_DIR}/language/fr_fr/slimey.js
 ${FO_DIR}/language/fr_fr/timezones.php
 ${FO_DIR}/language/fr_fr/upgrade.php
 ${FO_DIR}/language/hu_hu.php
+${FO_DIR}/language/hu_hu/_config.php
 ${FO_DIR}/language/hu_hu/actions.php
 ${FO_DIR}/language/hu_hu/administration.php
 ${FO_DIR}/language/hu_hu/calendar.php
@@ -863,6 +905,7 @@ ${FO_DIR}/language/hu_hu/site_interface.php
 ${FO_DIR}/language/hu_hu/timezones.php
 ${FO_DIR}/language/hu_hu/upgrade.php
 ${FO_DIR}/language/it_it.php
+${FO_DIR}/language/it_it/_config.php
 ${FO_DIR}/language/it_it/actions.php
 ${FO_DIR}/language/it_it/administration.php
 ${FO_DIR}/language/it_it/calendar.php
@@ -902,6 +945,7 @@ ${FO_DIR}/language/it_it/slimey.js
 ${FO_DIR}/language/it_it/timezones.php
 ${FO_DIR}/language/it_it/upgrade.php
 ${FO_DIR}/language/ja_jp.php
+${FO_DIR}/language/ja_jp/_config.php
 ${FO_DIR}/language/ja_jp/actions.php
 ${FO_DIR}/language/ja_jp/administration.php
 ${FO_DIR}/language/ja_jp/calendar.php
@@ -911,7 +955,10 @@ ${FO_DIR}/language/ja_jp/errors.php
 ${FO_DIR}/language/ja_jp/fields.php
 ${FO_DIR}/language/ja_jp/general.php
 ${FO_DIR}/language/ja_jp/help.php
+${FO_DIR}/language/ja_jp/help/account.html
+${FO_DIR}/language/ja_jp/help/dashboard.html
 ${FO_DIR}/language/ja_jp/help/dummy.txt
+${FO_DIR}/language/ja_jp/help/no_help.html
 ${FO_DIR}/language/ja_jp/lang.js
 ${FO_DIR}/language/ja_jp/messages.php
 ${FO_DIR}/language/ja_jp/objects.php
@@ -922,6 +969,7 @@ ${FO_DIR}/language/ja_jp/site_interface.php
 ${FO_DIR}/language/ja_jp/slimey.js
 ${FO_DIR}/language/ja_jp/timezones.php
 ${FO_DIR}/language/ja_jp/upgrade.php
+${FO_DIR}/language/ko_kr/_config.php
 ${FO_DIR}/language/ko_kr/actions.php
 ${FO_DIR}/language/ko_kr/administration.php
 ${FO_DIR}/language/ko_kr/calendar.php
@@ -940,6 +988,7 @@ ${FO_DIR}/language/ko_kr/site_interface.php
 ${FO_DIR}/language/ko_kr/timezones.php
 ${FO_DIR}/language/ko_kr/upgrade.php
 ${FO_DIR}/language/nl_nl.php
+${FO_DIR}/language/nl_nl/_config.php
 ${FO_DIR}/language/nl_nl/actions.php
 ${FO_DIR}/language/nl_nl/administration.php
 ${FO_DIR}/language/nl_nl/calendar.php
@@ -961,6 +1010,7 @@ ${FO_DIR}/language/nl_nl/slimey.js
 ${FO_DIR}/language/nl_nl/timezones.php
 ${FO_DIR}/language/nl_nl/upgrade.php
 ${FO_DIR}/language/pl_pl.php
+${FO_DIR}/language/pl_pl/_config.php
 ${FO_DIR}/language/pl_pl/actions.php
 ${FO_DIR}/language/pl_pl/administration.php
 ${FO_DIR}/language/pl_pl/calendar.php
@@ -983,6 +1033,7 @@ ${FO_DIR}/language/pl_pl/slimey.js
 ${FO_DIR}/language/pl_pl/timezones.php
 ${FO_DIR}/language/pl_pl/upgrade.php
 ${FO_DIR}/language/pt_br.php
+${FO_DIR}/language/pt_br/_config.php
 ${FO_DIR}/language/pt_br/actions.php
 ${FO_DIR}/language/pt_br/administration.php
 ${FO_DIR}/language/pt_br/calendar.php
@@ -1010,6 +1061,7 @@ ${FO_DIR}/language/pt_br/slimey.js
 ${FO_DIR}/language/pt_br/timezones.php
 ${FO_DIR}/language/pt_br/upgrade.php
 ${FO_DIR}/language/ru_ru.php
+${FO_DIR}/language/ru_ru/_config.php
 ${FO_DIR}/language/ru_ru/actions.php
 ${FO_DIR}/language/ru_ru/administration.php
 ${FO_DIR}/language/ru_ru/calendar.php
@@ -1035,24 +1087,59 @@ ${FO_DIR}/language/ru_ru/slimey.js
 ${FO_DIR}/language/ru_ru/timezones.php
 ${FO_DIR}/language/ru_ru/unknown-words.txt
 ${FO_DIR}/language/ru_ru/upgrade.php
+${FO_DIR}/language/uk_ua.php
+${FO_DIR}/language/uk_ua/_config.php
+${FO_DIR}/language/uk_ua/actions.php
+${FO_DIR}/language/uk_ua/administration.php
+${FO_DIR}/language/uk_ua/calendar.php
+${FO_DIR}/language/uk_ua/countries.php
+${FO_DIR}/language/uk_ua/emails.php
+${FO_DIR}/language/uk_ua/errors.php
+${FO_DIR}/language/uk_ua/fields.php
+${FO_DIR}/language/uk_ua/general.php
+${FO_DIR}/language/uk_ua/help.php
+${FO_DIR}/language/uk_ua/help/account.html
+${FO_DIR}/language/uk_ua/help/dashboard.html
+${FO_DIR}/language/uk_ua/help/dummy.txt
+${FO_DIR}/language/uk_ua/help/no_help.html
+${FO_DIR}/language/uk_ua/html_to_pdf.php
+${FO_DIR}/language/uk_ua/lang.js
+${FO_DIR}/language/uk_ua/messages.php
+${FO_DIR}/language/uk_ua/new_window.php
+${FO_DIR}/language/uk_ua/objects.php
+${FO_DIR}/language/uk_ua/plugins/dummy.txt
+${FO_DIR}/language/uk_ua/project_interface.php
+${FO_DIR}/language/uk_ua/reporting.php
+${FO_DIR}/language/uk_ua/site_interface.php
+${FO_DIR}/language/uk_ua/slimey.js
+${FO_DIR}/language/uk_ua/timezones.php
+${FO_DIR}/language/uk_ua/upgrade.php
 ${FO_DIR}/language/zh_cn.php
 ${FO_DIR}/language/zh_cn/README
+${FO_DIR}/language/zh_cn/_config.php
 ${FO_DIR}/language/zh_cn/actions.php
 ${FO_DIR}/language/zh_cn/administration.php
 ${FO_DIR}/language/zh_cn/calendar.php
 ${FO_DIR}/language/zh_cn/countries.php
 ${FO_DIR}/language/zh_cn/emails.php
 ${FO_DIR}/language/zh_cn/errors.php
+${FO_DIR}/language/zh_cn/fields.php
 ${FO_DIR}/language/zh_cn/general.php
+${FO_DIR}/language/zh_cn/help.php
 ${FO_DIR}/language/zh_cn/help/dummy.txt
 ${FO_DIR}/language/zh_cn/lang.js
 ${FO_DIR}/language/zh_cn/messages.php
+${FO_DIR}/language/zh_cn/new_window.php
 ${FO_DIR}/language/zh_cn/objects.php
 ${FO_DIR}/language/zh_cn/plugins/dummy.txt
 ${FO_DIR}/language/zh_cn/project_interface.php
+${FO_DIR}/language/zh_cn/reporting.php
 ${FO_DIR}/language/zh_cn/site_interface.php
+${FO_DIR}/language/zh_cn/slimey.js
 ${FO_DIR}/language/zh_cn/timezones.php
+${FO_DIR}/language/zh_cn/upgrade.php
 ${FO_DIR}/language/zh_tw.php
+${FO_DIR}/language/zh_tw/_config.php
 ${FO_DIR}/language/zh_tw/actions.php
 ${FO_DIR}/language/zh_tw/administration.php
 ${FO_DIR}/language/zh_tw/calendar.php
@@ -1102,6 +1189,16 @@ ${FO_DIR}/library/PEAR/Net/IMAP.php
 ${FO_DIR}/library/PEAR/Net/IMAPProtocol.php
 ${FO_DIR}/library/PEAR/Net/IPv4.php
 ${FO_DIR}/library/PEAR/Net/IPv6.php
+${FO_DIR}/library/PEAR/Net/LDAP2.php
+${FO_DIR}/library/PEAR/Net/LDAP2/Entry.php
+${FO_DIR}/library/PEAR/Net/LDAP2/Filter.php
+${FO_DIR}/library/PEAR/Net/LDAP2/LDIF.php
+${FO_DIR}/library/PEAR/Net/LDAP2/RootDSE.php
+${FO_DIR}/library/PEAR/Net/LDAP2/Schema.php
+${FO_DIR}/library/PEAR/Net/LDAP2/SchemaCache.interface.php
+${FO_DIR}/library/PEAR/Net/LDAP2/Search.php
+${FO_DIR}/library/PEAR/Net/LDAP2/SimpleFileSchemaCache.php
+${FO_DIR}/library/PEAR/Net/LDAP2/Util.php
 ${FO_DIR}/library/PEAR/Net/POP3.php
 ${FO_DIR}/library/PEAR/Net/SMTP.php
 ${FO_DIR}/library/PEAR/Net/Socket.php
@@ -1315,6 +1412,7 @@ ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.M
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.txt
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/info.ini
+${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/CSS/3.3.0,801ad73acbcf9d3127e1d01768d26453,1.ser
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/3.3.0,aacfe2e21b552364077576cd0a636b92,1.ser
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/EntityLookup/entities.ser
 ${FO_DIR}/library/htmlpurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php
@@ -1342,6 +1440,39 @@ ${FO_DIR}/library/icalendar/iCalendar_PropertyValue.class.php
 ${FO_DIR}/library/jsmin/JSMin.class.php
 ${FO_DIR}/library/json/JSON.class.php
 ${FO_DIR}/library/json/json.php
+${FO_DIR}/library/pdf/font/courier.php
+${FO_DIR}/library/pdf/font/helvetica.php
+${FO_DIR}/library/pdf/font/helveticab.php
+${FO_DIR}/library/pdf/font/helveticabi.php
+${FO_DIR}/library/pdf/font/helveticai.php
+${FO_DIR}/library/pdf/font/makefont/cp1250.map
+${FO_DIR}/library/pdf/font/makefont/cp1251.map
+${FO_DIR}/library/pdf/font/makefont/cp1252.map
+${FO_DIR}/library/pdf/font/makefont/cp1253.map
+${FO_DIR}/library/pdf/font/makefont/cp1254.map
+${FO_DIR}/library/pdf/font/makefont/cp1255.map
+${FO_DIR}/library/pdf/font/makefont/cp1257.map
+${FO_DIR}/library/pdf/font/makefont/cp1258.map
+${FO_DIR}/library/pdf/font/makefont/cp874.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-1.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-11.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-15.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-16.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-2.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-4.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-5.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-7.map
+${FO_DIR}/library/pdf/font/makefont/iso-8859-9.map
+${FO_DIR}/library/pdf/font/makefont/koi8-r.map
+${FO_DIR}/library/pdf/font/makefont/koi8-u.map
+${FO_DIR}/library/pdf/font/makefont/makefont.php
+${FO_DIR}/library/pdf/font/symbol.php
+${FO_DIR}/library/pdf/font/times.php
+${FO_DIR}/library/pdf/font/timesb.php
+${FO_DIR}/library/pdf/font/timesbi.php
+${FO_DIR}/library/pdf/font/timesi.php
+${FO_DIR}/library/pdf/font/zapfdingbats.php
+${FO_DIR}/library/pdf/fpdf.php
 ${FO_DIR}/library/simplegd/classes/SimpleGdImage.class.php
 ${FO_DIR}/library/simplegd/errors/FailedToLoadImageError.class.php
 ${FO_DIR}/library/simplegd/errors/FileNotImageError.class.php
@@ -1770,6 +1901,7 @@ ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-sr-min.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-sv_SE-min.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-th-min.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-tr-min.js
+${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-ua.js
 ${FO_DIR}/public/assets/javascript/extjs/locale/ext-lang-zh_CN-min.js
 ${FO_DIR}/public/assets/javascript/flashobject.js
 ${FO_DIR}/public/assets/javascript/gelSheet/client/dev/application/application.js
@@ -2130,6 +2262,7 @@ ${FO_DIR}/public/assets/javascript/og/modules/linkToObjectForm.js
 ${FO_DIR}/public/assets/javascript/og/modules/massmailerForm.js
 ${FO_DIR}/public/assets/javascript/og/modules/updatePermissionsForm.js
 ${FO_DIR}/public/assets/javascript/og/og.js
+${FO_DIR}/public/assets/javascript/og/plugin/dummy.php
 ${FO_DIR}/public/assets/javascript/og/swfobject.js
 ${FO_DIR}/public/assets/javascript/og/tasks/TasksBottomToolbar.js
 ${FO_DIR}/public/assets/javascript/og/tasks/TasksTopToolbar.js
@@ -2509,6 +2642,7 @@ ${FO_DIR}/public/assets/themes/default/images/16x16/documents.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/down.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/download.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/email.png
+${FO_DIR}/public/assets/themes/default/images/16x16/exclamation.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/expand.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/fax.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/folder.png
@@ -2523,7 +2657,9 @@ ${FO_DIR}/public/assets/themes/default/images/16x16/locked.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/logout.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/lower_task.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/mail_forward.png
+${FO_DIR}/public/assets/themes/default/images/16x16/mail_mark_ham.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/mail_mark_read.png
+${FO_DIR}/public/assets/themes/default/images/16x16/mail_mark_spam.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/mail_mark_unread.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/mail_receive.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/mail_reply.png
@@ -2648,6 +2784,7 @@ ${FO_DIR}/public/assets/themes/default/images/16x16/view_as_db.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/view_as_list.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/view_calendar_month.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/view_calendar_week.png
+${FO_DIR}/public/assets/themes/default/images/16x16/view_calendar_week5.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/webpages.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/workspace.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/wscolors/Imagen1.xcf
@@ -2683,7 +2820,9 @@ ${FO_DIR}/public/assets/themes/default/images/16x16/zip-add.png
 ${FO_DIR}/public/assets/themes/default/images/16x16/zip-extract.png
 ${FO_DIR}/public/assets/themes/default/images/22x22/chronometer.png
 ${FO_DIR}/public/assets/themes/default/images/22x22/chronometer_pause.png
+${FO_DIR}/public/assets/themes/default/images/32x32/archive.png
 ${FO_DIR}/public/assets/themes/default/images/32x32/tasks.png
+${FO_DIR}/public/assets/themes/default/images/32x32/trash.png
 ${FO_DIR}/public/assets/themes/default/images/32x32/view_calendar_month.png
 ${FO_DIR}/public/assets/themes/default/images/32x32/view_calendar_week.png
 ${FO_DIR}/public/assets/themes/default/images/32x32/warning.png
@@ -2804,12 +2943,15 @@ ${FO_DIR}/public/assets/themes/default/images/filetypes/svg.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/swf.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/unknown.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/video.png
+${FO_DIR}/public/assets/themes/default/images/filetypes/webfile.png
 ${FO_DIR}/public/assets/themes/default/images/filetypes/xls.png
+${FO_DIR}/public/assets/themes/default/images/icons/asc.png
 ${FO_DIR}/public/assets/themes/default/images/icons/attach.png
 ${FO_DIR}/public/assets/themes/default/images/icons/bullet_drop_down.gif
 ${FO_DIR}/public/assets/themes/default/images/icons/cancel_gray.gif
 ${FO_DIR}/public/assets/themes/default/images/icons/checked.jpg
 ${FO_DIR}/public/assets/themes/default/images/icons/classify.png
+${FO_DIR}/public/assets/themes/default/images/icons/desc.png
 ${FO_DIR}/public/assets/themes/default/images/icons/edit.gif
 ${FO_DIR}/public/assets/themes/default/images/icons/feed.gif
 ${FO_DIR}/public/assets/themes/default/images/icons/go_gray.gif
@@ -2818,6 +2960,8 @@ ${FO_DIR}/public/assets/themes/default/images/icons/more_down.gif
 ${FO_DIR}/public/assets/themes/default/images/icons/not-checked.jpg
 ${FO_DIR}/public/assets/themes/default/images/icons/ok.gif
 ${FO_DIR}/public/assets/themes/default/images/icons/private.gif
+${FO_DIR}/public/assets/themes/default/images/icons/sorted_asc.gif
+${FO_DIR}/public/assets/themes/default/images/icons/sorted_desc.gif
 ${FO_DIR}/public/assets/themes/default/images/im/aim.gif
 ${FO_DIR}/public/assets/themes/default/images/im/icq.gif
 ${FO_DIR}/public/assets/themes/default/images/im/jabber.gif
@@ -2998,8 +3142,10 @@ ${FO_DIR}/public/assets/themes/default/stylesheets/og/time.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/og/workspace_panel.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/ogmin.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/ogmin1.5-beta.css
+${FO_DIR}/public/assets/themes/default/stylesheets/plugin/dummy.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/project/project.css
 ${FO_DIR}/public/assets/themes/default/stylesheets/website.css
+${FO_DIR}/public/files/dummy.txt
 ${FO_DIR}/public/help/help.html
 ${FO_DIR}/public/help/index.html
 ${FO_DIR}/public/index.php
@@ -3066,6 +3212,7 @@ ${FO_DIR}/public/upgrade/scripts/FigazzaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/MatambritoUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/MilangaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/NutriaUpgradeScript.class.php
+${FO_DIR}/public/upgrade/scripts/PastafrolaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/scripts/TortaFritaUpgradeScript.class.php
 ${FO_DIR}/public/upgrade/templates/checklist.php
 ${FO_DIR}/public/upgrade/templates/config_file.php
@@ -3080,6 +3227,7 @@ ${FO_DIR}/public/upgrade/templates/db_migration/1_3_matambrito.php
 ${FO_DIR}/public/upgrade/templates/db_migration/1_4_nutria.php
 ${FO_DIR}/public/upgrade/templates/db_migration/1_5_figazza.php
 ${FO_DIR}/public/upgrade/templates/db_migration/1_6_chivito.php
+${FO_DIR}/public/upgrade/templates/db_migration/1_7_pastafrola.php
 ${FO_DIR}/public/upgrade/templates/installed_version.php
 ${FO_DIR}/public/upgrade/templates/layout.php
 ${FO_DIR}/public/webservices/FilesServices.php
@@ -3089,6 +3237,6 @@ ${FO_DIR}/public/webservices/WorkspaceServices.php
 ${FO_DIR}/readme.txt
 ${FO_DIR}/robots.txt
 ${FO_DIR}/s.gif
-${FO_DIR}/test.php
 ${FO_DIR}/tmp/dummy.php
+${FO_DIR}/upload/dummy.php
 ${FO_DIR}/version.php
diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo
index 5cbc1758773..df68a9134a4 100644
--- a/www/fengoffice/distinfo
+++ b/www/fengoffice/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/01/26 15:36:24 taca Exp $
+$NetBSD: distinfo,v 1.3 2010/07/05 03:26:46 taca Exp $
 
-SHA1 (fengoffice-20100126/fengoffice_1.6.2.zip) = 152496806db90b40315e74bf55b29f92db5ad7cd
-RMD160 (fengoffice-20100126/fengoffice_1.6.2.zip) = 5e68da7d830c035849b628030247ebc336bfe4ec
-Size (fengoffice-20100126/fengoffice_1.6.2.zip) = 7317725 bytes
+SHA1 (fengoffice-20100126/fengoffice_1.7.zip) = 5c404ee71cf1c3e866f5a8ddc565158804a6709a
+RMD160 (fengoffice-20100126/fengoffice_1.7.zip) = b8f035be080611f926bc3eaef34584668f78782c
+Size (fengoffice-20100126/fengoffice_1.7.zip) = 7530323 bytes
+SHA1 (patch-aa) = 86232f5272dd900fee0218ec9c0da7fd1c76b160
+SHA1 (patch-ab) = cbacc2c6413a605c4f0594a12efee22e372459f6
+SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5
diff --git a/www/fengoffice/patches/patch-aa b/www/fengoffice/patches/patch-aa
new file mode 100644
index 00000000000..de638380a12
--- /dev/null
+++ b/www/fengoffice/patches/patch-aa
@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.1 2010/07/05 03:26:46 taca Exp $
+
+Unofficial patch to avoid iconv(GNU or gnu libc) portability problem.
+http://www.fengoffice.com/web/bugs/view.php?id=6
+
+--- environment/classes/encoding/EncodingConverter.class.php.orig	2010-06-28 21:05:03.000000000 +0000
++++ environment/classes/encoding/EncodingConverter.class.php
+@@ -6,6 +6,16 @@ class EncodingConverter
+ 	var $_last_err_filename;
+ 	var $_last_err_line;
+ 	var $_last_err_func;
++	private static $gnu_iconv = NULL;
++
++	static function iconv_error($errno, $errstr) {
++		if (preg_match("/Wrong charset/", $errstr) > 0) {
++			self::$gnu_iconv = false;
++			return true;
++		} else {
++			return false;
++		}
++	}
+ 
+ 	function _handleError($err, $msg, $errfile, $errline, $errcontext) {
+ 		$trace = debug_backtrace();
+@@ -25,10 +35,22 @@ class EncodingConverter
+ 	}
+ 
+ 	function convert($in_enc, $out_enc, $str, $return_original_on_error = true, $ignore_non_compatible = true) {
++		if (is_null(self::$gnu_iconv)) {
++			$dummy = "a";
++			$ascii = 'us-ascii';
++			$func = set_error_handler("self::iconv_error");
++			$r = iconv($ascii, $ascii . "//ignore", $dummy);
++			restore_error_handler();
++			if ($r == $dummy) {
++				self::$gnu_iconv = true;
++			}
++		}
++
+ 		$this->_last_err = null;
+ 		set_error_handler(array(&$this, '_handleError'));
+ 		
+-		if ($ignore_non_compatible) $out_enc .= "//IGNORE";
++		if (self::$gnu_iconv)
++			if ($ignore_non_compatible) $out_enc .= "//IGNORE";
+ 		
+ 		$retval = iconv($in_enc, $out_enc, $str);
+ 		
diff --git a/www/fengoffice/patches/patch-ab b/www/fengoffice/patches/patch-ab
new file mode 100644
index 00000000000..ad3342f640f
--- /dev/null
+++ b/www/fengoffice/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/07/05 03:26:46 taca Exp $
+
+Stop PHP Deprecated message: http://www.fengoffice.com/web/bugs/view.php?id=7
+
+--- environment/functions/general.php.orig	2010-06-28 21:05:03.000000000 +0000
++++ environment/functions/general.php
+@@ -576,7 +576,7 @@ function convert_to_links($text){
+ 		
+ 	//Convert every email address into an <a href="mailto:... hyperlink
+ 	$text = preg_replace('/([^\:a-zA-Z0-9>"\._\-\+=])([a-zA-Z0-9]+[a-zA-Z0-9\._\-\+]*@[a-zA-Z0-9_\-]+([a-zA-Z0-9\._\-]+)+)/', '$1<a href="mailto:$2" target="_blank">$2</a>', $text);
+-	Hook::fire('convert_to_links', array('original' => $orig, 'text' => $text), &$text);
++	Hook::fire('convert_to_links', array('original' => $orig, 'text' => $text), $text);
+ 	return $text;
+ }
+ 
diff --git a/www/fengoffice/patches/patch-ac b/www/fengoffice/patches/patch-ac
new file mode 100644
index 00000000000..0c8579f2208
--- /dev/null
+++ b/www/fengoffice/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2010/07/05 03:26:46 taca Exp $
+
+Unofficial patch to fix broken Japanese language file of extJS.
+http://www.fengoffice.com/web/bugs/view.php?id=5
+
+--- public/assets/javascript/extjs/locale/ext-lang-ja-min.js.orig	2010-06-28 21:05:03.000000000 +0000
++++ public/assets/javascript/extjs/locale/ext-lang-ja-min.js
+@@ -1 +1 @@
+-Ext.UpdateManager.defaults.indicatorText='<div class="loading-indicator">èªã?¿è¾¼ã?¿ä¸...</div>';if(Ext.DataView){Ext.DataView.prototype.emptyText=""}if(Ext.grid.GridPanel){Ext.grid.GridPanel.prototype.ddText="{0} è¡Œé?¸æŠž"}if(Ext.LoadMask){Ext.LoadMask.prototype.msg="èªã?¿è¾¼ã?¿ä¸..."}Date.monthNames=["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];Date.getShortMonthName=function(a){return""+(a+1)};Date.monthNumbers={"1":0,"2":1,"3":2,"4":3,"5":4,"6":5,"7":6,"8":7,"9":8,"10":9,"11":10,"12":11};Date.getMonthNumber=function(a){return Date.monthNumbers[a.substring(0,a.length-1)]};Date.dayNames=["日曜日","月曜日","ç?«æ›œæ—¥","水曜日","木曜日","金曜日","土曜日"];Date.getShortDayName=function(a){return Date.dayNames[a].substring(0,1)};Date.formatCodes.a="(this.getHours() < 12 ? 'å?ˆå‰?' : 'å?ˆå¾Œ')";Date.formatCodes.A="(this.getHours() < 12 ? 'å?ˆå‰?' : 'å?ˆå¾Œ')";if(Ext.MessageBox){Ext.MessageBox.buttonText={ok:"OK",cancel:"ã‚ャンセル",yes:"ã?¯ã?„",no:"ã?„ã?„ã?ˆ"}}if(Ext.util.Format){Ext.util.Format.date=function(a,b){if(!a){return""}if(!(a instanceof Date)){a=new Date(Date.parse(a))}return a.dateFormat(b||"Y/m/d")}}if(Ext.DatePicker){Ext.apply(Ext.DatePicker.prototype,{todayText:"今日",minText:"é?¸æŠžã?—ã?Ÿæ—¥ä»˜ã?¯æœ€å°?値以下ã?§ã?™ã€‚",maxText:"é?¸æŠžã?—ã?Ÿæ—¥ä»˜ã?¯æœ€å¤§å€¤ä»¥ä¸Šã?§ã?™ã€‚",disabledDaysText:"",disabledDatesText:"",monthNames:Date.monthNames,dayNames:Date.dayNames,nextText:"次月ã?¸ (コントãƒãƒ¼ãƒ«+å?³)",prevText:"å‰?月ã?¸ (コントãƒãƒ¼ãƒ«+å·¦)",monthYearText:"月é?¸æŠž (コントãƒãƒ¼ãƒ«+上/下ã?§å¹´ç§»å‹•)",todayTip:"{0} (スペースã‚ー)",format:"Y/m/d",okText:"OK",cancelText:"ã‚ャンセル",startDay:0})}if(Ext.PagingToolbar){Ext.apply(Ext.PagingToolbar.prototype,{beforePageText:"ページ",afterPageText:"/ {0}",firstText:"最åˆ?ã?®ãƒšãƒ¼ã‚¸",prevText:"å‰?ã?®ãƒšãƒ¼ã‚¸",nextText:"次ã?®ãƒšãƒ¼ã‚¸",lastText:"最後ã?®ãƒšãƒ¼ã‚¸",refreshText:"æ›´æ–°",displayMsg:"{2} ä»¶ä¸ {0} - {1} を表示",emptyMsg:"表示ã?™ã‚‹ãƒ‡ãƒ¼ã‚¿ã?Œã?‚ã‚Šã?¾ã?›ã‚“。"})}if(Ext.form.Field){Ext.form.Field.prototype.invalidText="フィールドã?®å€¤ã?Œä¸?æ£ã?§ã?™ã€‚"}if(Ext.form.TextField){Ext.apply(Ext.form.TextField.prototype,{minLengthText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æœ€å°?値ã?¯ {0} ã?§ã?™ã€‚",maxLengthText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æœ€å¤§å€¤ã?¯ {0} ã?§ã?™ã€‚",blankText:"必須項目ã?§ã?™ã€‚",regexText:"",emptyText:null})}if(Ext.form.NumberField){Ext.apply(Ext.form.NumberField.prototype,{decimalSeparator:".",decimalPrecision:2,minText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æœ€å°?値ã?¯ {0} ã?§ã?™ã€‚",maxText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æœ€å¤§å€¤ã?¯ {0} ã?§ã?™ã€‚",nanText:"{0} ã?¯æ•°å€¤ã?§ã?¯ã?‚ã‚Šã?¾ã?›ã‚“。"})}if(Ext.form.DateField){Ext.apply(Ext.form.DateField.prototype,{disabledDaysText:"無効",disabledDatesText:"無効",minText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æ—¥ä»˜ã?¯ã€? {0} 以é™?ã?®æ—¥ä»˜ã?«è¨å®šã?—ã?¦ã??ã? ã?•ã?„。",maxText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æ—¥ä»˜ã?¯ã€? {0} 以å‰?ã?®æ—¥ä»˜ã?«è¨å®šã?—ã?¦ã??ã? ã?•ã?„。",invalidText:"{0} ã?¯é–“é?•ã?£ã?Ÿæ—¥ä»˜å…¥åŠ›ã?§ã?™ã€‚ - 入力形å¼?ã?¯ã€Œ{1}ã€?ã?§ã?™ã€‚",format:"Y/m/d",altFormats:"y/m/d|m/d/y|m/d/Y|m-d-y|m-d-Y|m/d|m-d|md|mdy|mdY|d|Y-m-d"})}if(Ext.form.ComboBox){Ext.apply(Ext.form.ComboBox.prototype,{loadingText:"èªã?¿è¾¼ã?¿ä¸...",valueNotFoundText:undefined})}if(Ext.form.VTypes){Ext.apply(Ext.form.VTypes,{emailText:'メールアドレスを"user@domain.com"ã?®å½¢å¼?ã?§å…¥åŠ›ã?—ã?¦ã??ã? ã?•ã?„。',urlText:'URLã‚’"http://www.domain.com"ã?®å½¢å¼?ã?§å…¥åŠ›ã?—ã?¦ã??ã? ã?•ã?„。',alphaText:'å?Šè§’英å—ã?¨"_"ã?®ã?¿ã?§ã?™ã€‚',alphanumText:'å?Šè§’英数ã?¨"_"ã?®ã?¿ã?§ã?™ã€‚'})}if(Ext.form.HtmlEditor){Ext.apply(Ext.form.HtmlEditor.prototype,{createLinkText:"リンクã?®URLを入力ã?—ã?¦ã??ã? ã?•ã?„:",buttonTips:{bold:{title:"å¤ªå— (コントãƒãƒ¼ãƒ«+B)",text:"é?¸æŠžãƒ†ã‚ストを太å—ã?«ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},italic:{title:"斜体 (コントãƒãƒ¼ãƒ«+I)",text:"é?¸æŠžãƒ†ã‚ストを斜体ã?«ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},underline:{title:"下線 (コントãƒãƒ¼ãƒ«+U)",text:"é?¸æŠžãƒ†ã‚ストã?«ä¸‹ç·šã‚’引ã??ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},increasefontsize:{title:"æ–‡å—を大ã??ã??",text:"フォントサイズを大ã??ã??ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},decreasefontsize:{title:"æ–‡å—ã‚’å°?ã?•ã??",text:"フォントサイズをå°?ã?•ã??ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},backcolor:{title:"æ–‡å—ã?®ãƒ?イライト",text:"é?¸æŠžãƒ†ã‚ストã?®èƒŒæ™¯è‰²ã‚’変更ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},forecolor:{title:"æ–‡å—ã?®è‰²",text:"é?¸æŠžãƒ†ã‚ストã?®è‰²ã‚’変更ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},justifyleft:{title:"å·¦æ?ƒã?ˆ",text:"テã‚ストを左æ?ƒã?ˆã?«ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},justifycenter:{title:"ä¸å¤®æ?ƒã?ˆ",text:"テã‚ストをä¸å¤®æ?ƒã?ˆã?«ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},justifyright:{title:"å?³æ?ƒã?ˆ",text:"テã‚ストをå?³æ?ƒã?ˆã?«ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},insertunorderedlist:{title:"番å?·ã?ªã?—箇æ?¡æ›¸ã??",text:"番å?·ã?ªã?—箇æ?¡æ›¸ã??を開始ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},insertorderedlist:{title:"番å?·ä»˜ã??箇æ?¡æ›¸ã??",text:"番å?·ä»˜ã??箇æ?¡æ›¸ã??を開始ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},createlink:{title:"ãƒ?イパーリンク",text:"é?¸æŠžãƒ†ã‚ストをãƒ?イパーリンクã?«ã?—ã?¾ã?™ã€‚",cls:"x-html-editor-tip"},sourceedit:{title:"ソース編集",text:"ソース編集モードã?«åˆ‡ã‚Šæ›¿ã?ˆã?¾ã?™ã€‚",cls:"x-html-editor-tip"}}})}if(Ext.grid.GridView){Ext.apply(Ext.grid.GridView.prototype,{sortAscText:"昇順",sortDescText:"é™?é †",columnsText:"カラム"})}if(Ext.grid.GroupingView){Ext.apply(Ext.grid.GroupingView.prototype,{emptyGroupText:"(ã?ªã?—)",groupByText:"ã?“ã?®ã‚«ãƒ©ãƒ ã?§ã‚°ãƒ«ãƒ¼ãƒ”ング",showGroupsText:"グルーピング"})}if(Ext.grid.PropertyColumnModel){Ext.apply(Ext.grid.PropertyColumnModel.prototype,{nameText:"å??称",valueText:"値",dateFormat:"Y/m/d"})}if(Ext.layout.BorderLayout&&Ext.layout.BorderLayout.SplitRegion){Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype,{splitTip:"ドラッグã?™ã‚‹ã?¨ãƒªã‚µã‚¤ã‚ºã?§ã??ã?¾ã?™ã€‚",collapsibleSplitTip:"ドラッグã?§ãƒªã‚µã‚¤ã‚ºã€‚ ダブルクリックã?§éš ã?™ã€‚"})}if(Ext.form.TimeField){Ext.apply(Ext.form.TimeField.prototype,{minText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æ™‚刻ã?¯ã€? {0} 以é™?ã?®æ™‚刻ã?«è¨å®šã?—ã?¦ã??ã? ã?•ã?„。",maxText:"ã?“ã?®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã?®æ™‚刻ã?¯ã€? {0} 以å‰?ã?®æ™‚刻ã?«è¨å®šã?—ã?¦ã??ã? ã?•ã?„。",invalidText:"{0} ã?¯é–“é?•ã?£ã?Ÿæ™‚刻入力ã?§ã?™ã€‚",format:"g:i A",altFormats:"g:ia|g:iA|g:i a|g:i A|h:i|g:i|H:i|ga|ha|gA|h a|g a|g A|gi|hi|gia|hia|g|H"})}if(Ext.form.CheckboxGroup){Ext.apply(Ext.form.CheckboxGroup.prototype,{blankText:"ã?“ã?®ã‚°ãƒ«ãƒ¼ãƒ—ã?‹ã‚‰æœ€ä½Žï¼‘ã?¤ã?®ã‚¢ã‚¤ãƒ†ãƒ ã‚’é?¸æŠžã?—ã?ªã?‘ã‚Œã?°ã?ªã‚Šã?¾ã?›ã‚“。"})}if(Ext.form.RadioGroup){Ext.apply(Ext.form.RadioGroup.prototype,{blankText:"ã?“ã?®ã‚°ãƒ«ãƒ¼ãƒ—ã?‹ã‚‰ï¼‘ã?¤ã?®ã‚¢ã‚¤ãƒ†ãƒ ã‚’é?¸æŠžã?—ã?ªã?‘ã‚Œã?°ã?ªã‚Šã?¾ã?›ã‚“。"})};
+\ No newline at end of file
++Ext.UpdateManager.defaults.indicatorText='<div class="loading-indicator">読�込�中...</div>';if(Ext.DataView){Ext.DataView.prototype.emptyText=""}if(Ext.grid.GridPanel){Ext.grid.GridPanel.prototype.ddText="{0} 行�択"}if(Ext.LoadMask){Ext.LoadMask.prototype.msg="読�込�中..."}Date.monthNames=["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];Date.getShortMonthName=function(a){return""+(a+1)};Date.monthNumbers={"1":0,"2":1,"3":2,"4":3,"5":4,"6":5,"7":6,"8":7,"9":8,"10":9,"11":10,"12":11};Date.getMonthNumber=function(a){return Date.monthNumbers[a.substring(0,a.length-1)]};Date.dayNames=["日曜日","月曜日","�曜日","水曜日","木曜日","金曜日","土曜日"];Date.getShortDayName=function(a){return Date.dayNames[a].substring(0,1)};Date.formatCodes.a="(this.getHours() < 12 ? '��' : '�後')";Date.formatCodes.A="(this.getHours() < 12 ? '��' : '�後')";if(Ext.MessageBox){Ext.MessageBox.buttonText={ok:"OK",cancel:"キャンセル",yes:"��",no:"���"}}if(Ext.util.Format){Ext.util.Format.date=function(a,b){if(!a){return""}if(!(a instanceof Date)){a=new Date(Date.parse(a))}return a.dateFormat(b||"Y/m/d")}}if(Ext.DatePicker){Ext.apply(Ext.DatePicker.prototype,{todayText:"今日",minText:"�択��日付�最�値以下��。",maxText:"�択��日付�最大値以上��。",disabledDaysText:"",disabledDatesText:"",monthNames:Date.monthNames,dayNames:Date.dayNames,nextText:"次月� (コントロール+�)",prevText:"�月� (コントロール+左)",monthYearText:"月�択 (コントロール+上/下�年移動)",todayTip:"{0} (スペースキー)",format:"Y/m/d",okText:"OK",cancelText:"キャンセル",startDay:0})}if(Ext.PagingToolbar){Ext.apply(Ext.PagingToolbar.prototype,{beforePageText:"ページ",afterPageText:"/ {0}",firstText:"最��ページ",prevText:"��ページ",nextText:"次�ページ",lastText:"最後�ページ",refreshText:"更新",displayMsg:"{2} 件中 {0} - {1} を表示",emptyMsg:"表示�るデータ��り��ん。"})}if(Ext.form.Field){Ext.form.Field.prototype.invalidText="フィールド�値��正��。"}if(Ext.form.TextField){Ext.apply(Ext.form.TextField.prototype,{minLengthText:"��フィールド�最�値� {0} ��。",maxLengthText:"��フィールド�最大値� {0} ��。",blankText:"必須項目��。",regexText:"",emptyText:null})}if(Ext.form.NumberField){Ext.apply(Ext.form.NumberField.prototype,{decimalSeparator:".",decimalPrecision:2,minText:"��フィールド�最�値� {0} ��。",maxText:"��フィールド�最大値� {0} ��。",nanText:"{0} �数値���り��ん。"})}if(Ext.form.DateField){Ext.apply(Ext.form.DateField.prototype,{disabledDaysText:"無効",disabledDatesText:"無効",minText:"��フィールド�日付�� {0} 以��日付�設定������。",maxText:"��フィールド�日付�� {0} 以��日付�設定������。",invalidText:"{0} �間���日付入力��。 - 入力形��「{1}���。",format:"Y/m/d",altFormats:"y/m/d|m/d/y|m/d/Y|m-d-y|m-d-Y|m/d|m-d|md|mdy|mdY|d|Y-m-d"})}if(Ext.form.ComboBox){Ext.apply(Ext.form.ComboBox.prototype,{loadingText:"読�込�中...",valueNotFoundText:undefined})}if(Ext.form.VTypes){Ext.apply(Ext.form.VTypes,{emailText:'メールアドレスを"user@domain.com"�形��入力������。',urlText:'URLを"http://www.domain.com"�形��入力������。',alphaText:'�角英字�"_"����。',alphanumText:'�角英数�"_"����。'})}if(Ext.form.HtmlEditor){Ext.apply(Ext.form.HtmlEditor.prototype,{createLinkText:"リンク�URLを入力������:",buttonTips:{bold:{title:"太字 (コントロール+B)",text:"�択テキストを太字����。",cls:"x-html-editor-tip"},italic:{title:"斜体 (コントロール+I)",text:"�択テキストを斜体����。",cls:"x-html-editor-tip"},underline:{title:"下線 (コントロール+U)",text:"�択テキスト�下線を引���。",cls:"x-html-editor-tip"},increasefontsize:{title:"文字を大��",text:"フォントサイズを大�����。",cls:"x-html-editor-tip"},decreasefontsize:{title:"文字を���",text:"フォントサイズを������。",cls:"x-html-editor-tip"},backcolor:{title:"文字��イライト",text:"�択テキスト�背景色を変更���。",cls:"x-html-editor-tip"},forecolor:{title:"文字�色",text:"�択テキスト�色を変更���。",cls:"x-html-editor-tip"},justifyleft:{title:"左��",text:"テキストを左������。",cls:"x-html-editor-tip"},justifycenter:{title:"中央��",text:"テキストを中央������。",cls:"x-html-editor-tip"},justifyright:{title:"���",text:"テキストを�������。",cls:"x-html-editor-tip"},insertunorderedlist:{title:"番���箇�書�",text:"番���箇�書�を開始���。",cls:"x-html-editor-tip"},insertorderedlist:{title:"番�付�箇�書�",text:"番�付�箇�書�を開始���。",cls:"x-html-editor-tip"},createlink:{title:"�イパーリンク",text:"�択テキストを�イパーリンク����。",cls:"x-html-editor-tip"},sourceedit:{title:"ソース編集",text:"ソース編集モード�切り替���。",cls:"x-html-editor-tip"}}})}if(Ext.grid.GridView){Ext.apply(Ext.grid.GridView.prototype,{sortAscText:"昇順",sortDescText:"�順",columnsText:"カラム"})}if(Ext.grid.GroupingView){Ext.apply(Ext.grid.GroupingView.prototype,{emptyGroupText:"(��)",groupByText:"��カラム�グルーピング",showGroupsText:"グルーピング"})}if(Ext.grid.PropertyColumnModel){Ext.apply(Ext.grid.PropertyColumnModel.prototype,{nameText:"�称",valueText:"値",dateFormat:"Y/m/d"})}if(Ext.layout.BorderLayout&&Ext.layout.BorderLayout.SplitRegion){Ext.apply(Ext.layout.BorderLayout.SplitRegion.prototype,{splitTip:"ドラッグ�る�リサイズ����。",collapsibleSplitTip:"ドラッグ�リサイズ。 ダブルクリック�隠�。"})}if(Ext.form.TimeField){Ext.apply(Ext.form.TimeField.prototype,{minText:"��フィールド�時刻�� {0} 以��時刻�設定������。",maxText:"��フィールド�時刻�� {0} 以��時刻�設定������。",invalidText:"{0} �間���時刻入力��。",format:"g:i A",altFormats:"g:ia|g:iA|g:i a|g:i A|h:i|g:i|H:i|ga|ha|gA|h a|g a|g A|gi|hi|gia|hia|g|H"})}if(Ext.form.CheckboxGroup){Ext.apply(Ext.form.CheckboxGroup.prototype,{blankText:"��グループ�ら最低１��アイテムを�択���れ��り��ん。"})}if(Ext.form.RadioGroup){Ext.apply(Ext.form.RadioGroup.prototype,{blankText:"��グループ�ら１��アイテムを�択���れ��り��ん。"})};
+\ No newline at end of file