more branding changes
authorKai Engert <kaie@kuix.de>
Tue, 08 May 2012 22:50:55 +0200
changeset 9879 f0bf7e86a40581d6de0bbbe986c0e75037ca6ca7
parent 9878 fdcbc6d83a13fb984b6ce51450ff8fa53bc087c0
child 9880 776f9bfe41eb6dde67cdf5ff2c21b8e38bb4637a
push id1
push userkaie@kuix.de
push dateTue, 08 May 2012 23:46:14 +0000
more branding changes
mail/app/Makefile.in
mail/app/application.ini
mail/app/macbuild/Contents/Info.plist.in
mail/components/migration/src/nsProfileMigrator.cpp
mail/components/search/SpotlightIntegration.js
mail/components/search/nsMailWinSearchHelper.cpp
mail/components/shell/nsMailWinIntegration.cpp
mail/components/wintaskbar/windowsJumpLists.js
mail/confvars.sh
mail/installer/windows/nsis/installer.nsi
mail/locales/en-US/feedback/main.dtd
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -43,17 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 AB_CD = $(MOZ_UI_LOCALE) 
 
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 
 DEFINES += \
-  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/flowerbat.ico\" \
+  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/flowerduck.ico\" \
   -DAB_CD=$(AB_CD) \
   -DGRE_MILESTONE=$(GRE_MILESTONE) \
   -DGRE_BUILDID=$(GRE_BUILDID) \
    $(NULL)
 
 MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
 ifdef MOZ_SOURCE_STAMP
 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
@@ -296,17 +296,17 @@ libs:: $(PROGRAM)
 	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
 	sed -e "s/%APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
 	sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj/InfoPlist.strings
 	rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
 	rm -f $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
 	mkdir -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight
 	rsync -a --copy-unsafe-links $(DIST)/package/thunderbird.mdimporter $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight
-	cp -RL $(DIST)/branding/flowerbat.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/flowerbat.icns
+	cp -RL $(DIST)/branding/flowerduck.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/flowerduck.icns
 	printf APPLMOZM > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/PkgInfo
 #       remove CVS dirs from packaged app
 	find $(DIST)/$(MOZ_MACBUNDLE_NAME) -type d -name "CVS" -prune -exec rm -rf {} \;
 
 clean clobber::
 	rm -rf $(DIST)/$(MOZ_MACBUNDLE_NAME)
 endif
 
--- a/mail/app/application.ini
+++ b/mail/app/application.ini
@@ -33,17 +33,17 @@
 ; 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 *****
 
 #filter substitution
 [App]
 Vendor=Kuix.de
-Name=Flowerbat
+Name=Flowerduck
 Version=@APP_VERSION@
 #ifdef MOZ_APP_PROFILE
 Profile=@MOZ_APP_PROFILE@
 #endif
 BuildID=@GRE_BUILDID@
 #ifdef MOZ_SOURCE_REPO
 SourceRepository=@MOZ_SOURCE_REPO@
 #endif
--- a/mail/app/macbuild/Contents/Info.plist.in
+++ b/mail/app/macbuild/Contents/Info.plist.in
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>flowerbat</string>
+	<string>flowerduck</string>
 	<key>CFBundleGetInfoString</key>
 	<string>%MAC_APP_NAME% %APP_VERSION%</string>
 	<key>CFBundleIconFile</key>
-	<string>flowerbat</string>
+	<string>flowerduck</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.mozilla.%LOWER_MAC_APP_NAME%</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>%MAC_APP_NAME%</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
@@ -63,21 +63,21 @@
 		<string>10.5.0</string>
 		<key>x86_64</key>
 		<string>10.6.0</string>
         </dict>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
 			<key>UTTypeIdentifier</key>
-			<string>de.kuix.flowerbat.mozeml</string>
+			<string>de.kuix.flowerduck.mozeml</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://www.mozilla.com/Flowerbat</string>
+			<string>http://www.mozilla.com/Flowerduck</string>
 			<key>UTTypeDescription</key>
-			<string>Flowerbat Mail Message</string>
+			<string>Flowerduck Mail Message</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
 				<string>public.content</string>
 				<string>public.email-message</string>
 			</array>
 			<key>UTTypeTagSpecification</key>
 			<dict>
@@ -99,31 +99,31 @@
 				<string>mozeml</string>
 			</array>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>TBMZ</string>
 			</array>
 
 			<key>CFBundleTypeName</key>
-			<string>Flowerbat Mail Message</string>
+			<string>Flowerduck Mail Message</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>LSTypeIsPackage</key>
 			<false/>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>de.kuix.flowerbat.mozeml</string>
+				<string>de.kuix.flowerduck.mozeml</string>
 			</array>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 			    <string>eml</string>
 			</array>
 			<key>CFBundleTypeName</key>
-			<string>Flowerbat E-mail</string>
+			<string>Flowerduck E-mail</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
 	</array>
 </dict>
 </plist>
--- a/mail/components/migration/src/nsProfileMigrator.cpp
+++ b/mail/components/migration/src/nsProfileMigrator.cpp
@@ -109,17 +109,17 @@ nsProfileMigrator::Migrate(nsIProfileSta
 }
 
 #ifdef XP_WIN
 typedef struct {
   WORD wLanguage;
   WORD wCodePage;
 } LANGANDCODEPAGE;
 
-#define INTERNAL_NAME_THUNDERBIRD     "Flowerbat"
+#define INTERNAL_NAME_THUNDERBIRD     "Flowerduck"
 #define INTERNAL_NAME_SEAMONKEY       "Mozilla"
 #endif
 
 nsresult
 nsProfileMigrator::GetDefaultMailMigratorKey(nsACString& aKey, nsCOMPtr<nsIMailProfileMigrator>& mailMigrator)
 {
   // look up the value of profile.force.migration in case we are supposed to force migration using a particular
   // migrator....
@@ -180,17 +180,17 @@ nsProfileMigrator::GetDefaultMailMigrato
   }
 
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
 nsProfileMigrator::Import()
 {
-  if (ImportRegistryProfiles(NS_LITERAL_CSTRING("Flowerbat")))
+  if (ImportRegistryProfiles(NS_LITERAL_CSTRING("Flowerduck")))
     return NS_OK;
 
   return NS_ERROR_FAILURE;
 }
 
 bool
 nsProfileMigrator::ImportRegistryProfiles(const nsACString& aAppName)
 {
--- a/mail/components/search/SpotlightIntegration.js
+++ b/mail/components/search/SpotlightIntegration.js
@@ -70,17 +70,17 @@ let SearchIntegration =
   {
     delete this._metadataDir;
     let metadataDir = Cc["@mozilla.org/file/directory_service;1"]
                         .getService(Ci.nsIProperties)
                         .get("Home", Ci.nsIFile);
     metadataDir.append("Library");
     metadataDir.append("Caches");
     metadataDir.append("Metadata");
-    metadataDir.append("Flowerbat");
+    metadataDir.append("Flowerduck");
     return this._metadataDir = metadataDir;
   },
 
   /// Spotlight won't index files in the profile dir, but will use ~/Library/Caches/Metadata
   _getSearchPathForFolder: function spotlight_get_search_path(aFolder)
   {
     // Swap the metadata dir for the profile dir prefix in the folder's path
     let folderPath = aFolder.filePath.path;
--- a/mail/components/search/nsMailWinSearchHelper.cpp
+++ b/mail/components/search/nsMailWinSearchHelper.cpp
@@ -55,17 +55,17 @@
 
 static const CLSID CLSID_CSearchManager = {0x7d096c5f, 0xac08, 0x4f1f, {0xbe, 0xb7, 0x5c, 0x22, 0xc5, 0x17, 0xce, 0x39}};
 static const IID IID_ISearchManager = {0xab310581, 0xac80, 0x11d1, {0x8d, 0xf3, 0x00, 0xc0, 0x4f, 0xb6, 0xef, 0x69}};
 
 static const char* const sFoldersToIndex[] = {"Mail", "ImapMail", "News"};
 
 // APP_REG_NAME_MAIL should be kept in synch with AppRegNameMail
 // in the installer file: defines.nsi.in
-#define APP_REG_NAME_MAIL L"Flowerbat"
+#define APP_REG_NAME_MAIL L"Flowerduck"
 
 nsMailWinSearchHelper::nsMailWinSearchHelper()
 {
 }
 
 nsresult nsMailWinSearchHelper::Init()
 {
   CoInitialize(NULL);
--- a/mail/components/shell/nsMailWinIntegration.cpp
+++ b/mail/components/shell/nsMailWinIntegration.cpp
@@ -93,22 +93,22 @@ OpenKeyForReading(HKEY aKeyRoot, const n
 
 typedef enum {
   NO_SUBSTITUTION    = 0x00,
   APP_PATH_SUBSTITUTION  = 0x01
 } SettingFlags;
 
 // APP_REG_NAME_MAIL and APP_REG_NAME_NEWS should be kept in synch with
 // AppRegNameMail and AppRegNameNews in the installer file: defines.nsi.in
-#define APP_REG_NAME_MAIL L"Flowerbat"
-#define APP_REG_NAME_NEWS L"Flowerbat (News)"
-#define CLS_EML "FlowerbatEML"
-#define CLS_MAILTOURL "Flowerbat.Url.mailto"
-#define CLS_NEWSURL "Flowerbat.Url.news"
-#define CLS_FEEDURL "Flowerbat.Url.feed"
+#define APP_REG_NAME_MAIL L"Flowerduck"
+#define APP_REG_NAME_NEWS L"Flowerduck (News)"
+#define CLS_EML "FlowerduckEML"
+#define CLS_MAILTOURL "Flowerduck.Url.mailto"
+#define CLS_NEWSURL "Flowerduck.Url.news"
+#define CLS_FEEDURL "Flowerduck.Url.feed"
 #define SOP "\\shell\\open\\command"
 #define VAL_OPEN "\"%APPPATH%\" \"%1\""
 #define VAL_MAIL_OPEN "\"%APPPATH%\" -osint -mail \"%1\""
 #define VAL_COMPOSE_OPEN "\"%APPPATH%\" -osint -compose \"%1\""
 
 #define MAKE_KEY_NAME1(PREFIX, MID) \
   PREFIX MID
 
--- a/mail/components/wintaskbar/windowsJumpLists.js
+++ b/mail/components/wintaskbar/windowsJumpLists.js
@@ -206,17 +206,17 @@ let WinTaskbarJumpList = {
   /**
    * Jump list item creation helpers
    */
 
   _createHandlerAppItem: function WTBJL__createHandlerAppItem(aTask) {
     let file = Services.dirsvc.get("XCurProcD", Ci.nsILocalFile);
 
     // XXX where can we grab this from in the build? Do we need to?
-    file.append("flowerbat.exe");
+    file.append("flowerduck.exe");
 
     let handlerApp = Cc["@mozilla.org/uriloader/local-handler-app;1"]
                        .createInstance(Ci.nsILocalHandlerApp);
     handlerApp.executable = file;
     // handlers default to the leaf name if a name is not specified
     let title = aTask.title;
     if (title && title.length != 0)
       handlerApp.name = title;
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -31,17 +31,17 @@
 # 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 *****
 
-MOZ_APP_NAME=flowerbat
+MOZ_APP_NAME=flowerduck
 MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
--- a/mail/installer/windows/nsis/installer.nsi
+++ b/mail/installer/windows/nsis/installer.nsi
@@ -226,17 +226,17 @@ Section "-InstallStartCleanup"
   ${If} ${FileExists} "$INSTDIR\components\klthbplg.dll"
     Delete /REBOOTOK "$INSTDIR\components\klthbplg.dll"
   ${EndIf}
   ${If} ${FileExists} "$INSTDIR\components\IKLAntiSpam.xpt"
     Delete /REBOOTOK "$INSTDIR\components\IKLAntiSpam.xpt"
   ${EndIf}
 
   ; Remove the updates directory for Vista and above
-  ${CleanUpdatesDir} "Flowerbat"
+  ${CleanUpdatesDir} "Flowerduck"
 
   ${InstallStartCleanupCommon}
 SectionEnd
 
 Section "-Application" APP_IDX
   ${StartUninstallLog}
 
   SetDetailsPrint both
--- a/mail/locales/en-US/feedback/main.dtd
+++ b/mail/locales/en-US/feedback/main.dtd
@@ -23,14 +23,14 @@
 <!ENTITY testpilot.rawDataWindow.title                  "Test Pilot: Raw Data">
 
 <!-- notification -->
 <!ENTITY testpilot.notification.close.tooltip           "Close">
 
 <!-- Firefox 4 beta version UI -->
 <!ENTITY testpilot.enable.label                         "Turn On User Studies">
 <!ENTITY testpilot.feedbackbutton.label                 "Feedback">
-<!ENTITY testpilot.happy.label                          "Flowerduck Made Me Happy Because…">
-<!ENTITY testpilot.sad.label                            "Flowerduck Made Me Sad Because…">
-<!ENTITY testpilot.happy.thunderbirdLabel               "Flowerbat Made Me Happy Because…">
-<!ENTITY testpilot.sad.thunderbirdLabel                 "Flowerbat Made Me Sad Because…">
+<!ENTITY testpilot.happy.label                          "Flowerbeetle Made Me Happy Because…">
+<!ENTITY testpilot.sad.label                            "Flowerbeetle Made Me Sad Because…">
+<!ENTITY testpilot.happy.thunderbirdLabel               "Flowerduck Made Me Happy Because…">
+<!ENTITY testpilot.sad.thunderbirdLabel                 "Flowerduck Made Me Sad Because…">
 <!ENTITY testpilot.broken.label                         "Report this website as broken…">
 <!ENTITY testpilot.idea.label                           "Give us a suggestion…">