Commit 8b65ce02 authored by mkaply%us.ibm.com's avatar mkaply%us.ibm.com
Browse files

Bring CCK current on the trunk since development was happening on the 1.8.0 branch

parent 0c64f259

extensions/cck/browser/install.rdf

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> 
            <Description>

                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>

                <em:minVersion>1.5</em:minVersion>

                <em:maxVersion>3.0</em:maxVersion>

                <em:maxVersion>3.0a1</em:maxVersion>

            </Description>

        </em:targetApplication>

extensions/cck/browser/jar.mn

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ cckwizard.jar: 
% content cckwizard %content/cckwizard/

% overlay chrome://browser/content/browser.xul         chrome://cckwizard/content/cckwizard-browser-overlay.xul

 content/cckwizard/cckwizard-browser-overlay.xul          (resources/content/cckwizard/cckwizard-browser-overlay.xul)

 content/cckwizard/cckwizard.js                           (resources/content/cckwizard/cckwizard.js)

* content/cckwizard/cckwizard.js                           (resources/content/cckwizard/cckwizard.js)

 content/cckwizard/cckwizard.png                          (resources/content/cckwizard/cckwizard.png)

 content/cckwizard/cckwizard.xul                          (resources/content/cckwizard/cckwizard.xul)

 content/cckwizard/config.xul                             (resources/content/cckwizard/config.xul)

extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd

+10 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
<!ENTITY  beforeYouBegin.label          "Before You Begin">

<!ENTITY  beforeYouBegin.description    "Decide which customizations you want to make and create/collect the customized files, such as:

                                         <html:ul>

                                         <html:li>Custom animation files for browser's animated logo</html:li>

                                         <html:li>Custom animation files for browser&apos;s animated logo</html:li>

                                         <html:li>Search engines (SRC files and the corresponding images)</html:li>

                                         <html:li>Browser plug-ins</html:li>

                                         <html:li>Extensions/themes</html:li>
@@ -12,7 +12,7 @@ 
                                         

<!ENTITY  configurePage.label           "Extension Configurations">

<!ENTITY  selectConfig.label            "Select an Existing Configuration or Create a New One">

<!ENTITY  selectConfig.description      "Select an existing configuration, or click 'New' to create a new configuration and workspace in which to store your custom files. To edit an existing configuration without overwriting the original configuration, select it from the list and click 'Copy'.">

<!ENTITY  selectConfig.description      "Select an existing configuration, or click &apos;New&apos; to create a new configuration and workspace in which to store your custom files. To edit an existing configuration without overwriting the original configuration, select it from the list and click &apos;Copy&apos;.">

<!ENTITY  showConfig.label              "Show Config Info">

<!ENTITY  newConfig.label               "New">

<!ENTITY  copyConfig.label              "Copy">
@@ -54,7 +54,7 @@ 


<!ENTITY  customizePartOne.label        "Customize the Browser - Part One">



<!ENTITY  orgName.description           "The Company Identifier is included as part of the browser's user agent string which appears when you open the Help menu and select About Mozilla Firefox. It is required.">

<!ENTITY  orgName.description           "The Company Identifier is included as part of the browser&apos;s user agent string which appears when you open the Help menu and select About Mozilla Firefox. It is required.">

<!ENTITY  orgName.label                 "Enter Your Company Identifier (up to 10 characters; no spaces):">

<!ENTITY  orgName.caption               "Company Identifier">
@@ -66,7 +66,7 @@ 
<!ENTITY  homePageOverride.description  "This page is displayed  on the very first invocation of Firefox after a new profile is created. It is optional.">





<!ENTITY  titleBar.caption              "Browser Window's Title Bar Text">

<!ENTITY  titleBar.caption              "Browser Window&apos;s Title Bar Text">

<!ENTITY  titleBar.label                "Custom Title Bar Text:">

<!ENTITY  titleBar.description          "The text you enter (for example, your company name) appears after the page title in the title bar. It is recommended that you use the format

                                         <html:i>Mozilla Firefox: Companyname Edition</html:i>">
@@ -103,6 +103,8 @@ 
<!ENTITY  customizeSearchEngines.label  "Customize Search Engines">

<!ENTITY  searchEngines.description     "Use the buttons below to add search engines.">



<!ENTITY  defaultSearchEngine.label     "Default Search Engine">



<!ENTITY  engines.label                 "Search Engines">

<!ENTITY  engines.description           "Please select a .src file and the corresponding image.">
@@ -215,6 +217,10 @@ 
<!ENTITY  autoTypeRadio.accesskey       "a">

<!ENTITY  configAutoconfigText.label    "Configuration location (URL):">

<!ENTITY  configAutoconfigText.accesskey "u">

<!ENTITY  autoCCKTypeRadio.label        "Store proxy configuration file in the CCK:">

<!ENTITY  autoCCKTypeRadio.accesskey    "i">





<!ENTITY  reload.label                  "Reload">

<!ENTITY  reload.accesskey              "l">

<!ENTITY  ftp.label                     "FTP Proxy:">

extensions/cck/browser/locales/en-US/chrome/cckwizard.properties

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ extensions.cckwizard@extensions.mozilla.org.description=XUL Wizard to create CCK 
id.error=Unique ID is required and is of the format extensionname@organization.tld. It can only contain the letters a-z, the numbers 0-9, and the following symbols: . _ - 

name.error=Name is required

version.error=Version is required

orgName.error=Company Identifier is required and cannot contain any spaces.

OrganizationName.error=Company Identifier is required and cannot contain any spaces.

BookmarkFolder1.error=You must specify a folder name

ToolbarFolder1.error=You must specify a folder name



useBrowserDefault=(use the browser default)

searchEngine.error=SRC file is invalid

extensions/cck/browser/locales/jar.mn.locale

0 → 100644
+39 −0
Original line number Diff line number Diff line 
#filter substitution



cckwizard.jar:

% locale cckwizard @AB_CD@ %locale/@AB_CD@/cckwizard/

% locale cckwizard cs-CZ %locale/cs-CZ/cckwizard/

% locale cckwizard da-DK %locale/da-DK/cckwizard/

% locale cckwizard de-DE %locale/de-DE/cckwizard/

% locale cckwizard es-ES %locale/es-ES/cckwizard/

% locale cckwizard fr-FR %locale/fr-FR/cckwizard/

% locale cckwizard it-IT %locale/it-IT/cckwizard/

% locale cckwizard ja-JP %locale/ja-JP/cckwizard/

% locale cckwizard nl-NL %locale/nl-NL/cckwizard/

% locale cckwizard pt-BR %locale/pt-BR/cckwizard/

% locale cckwizard ru-RU %locale/ru-RU/cckwizard/

% locale cckwizard zh-CN %locale/zh-CN/cckwizard/

  locale/@AB_CD@/cckwizard/cckWizard.dtd                    (@AB_CD@/chrome/cckWizard.dtd)

  locale/@AB_CD@/cckwizard/cckwizard.properties             (@AB_CD@/chrome/cckwizard.properties)

  locale/cs-CZ/cckwizard/cckWizard.dtd                      (cs-CZ/cckwizard/cckWizard.dtd)

  locale/cs-CZ/cckwizard/cckwizard.properties               (cs-CZ/cckwizard/cckwizard.properties)

  locale/da-DK/cckwizard/cckWizard.dtd                      (da-DK/cckwizard/cckWizard.dtd)

  locale/da-DK/cckwizard/cckwizard.properties               (da-DK/cckwizard/cckwizard.properties)

  locale/de-DE/cckwizard/cckWizard.dtd                      (de-DE/cckwizard/cckWizard.dtd)

  locale/de-DE/cckwizard/cckwizard.properties               (de-DE/cckwizard/cckwizard.properties)

  locale/es-ES/cckwizard/cckWizard.dtd                      (es-ES/cckwizard/cckWizard.dtd)

  locale/es-ES/cckwizard/cckwizard.properties               (es-ES/cckwizard/cckwizard.properties)

  locale/fr-FR/cckwizard/cckWizard.dtd                      (fr-FR/cckwizard/cckWizard.dtd)

  locale/fr-FR/cckwizard/cckwizard.properties               (fr-FR/cckwizard/cckwizard.properties)

  locale/it-IT/cckwizard/cckWizard.dtd                      (it-IT/cckwizard/cckWizard.dtd)

  locale/it-IT/cckwizard/cckwizard.properties               (it-IT/cckwizard/cckwizard.properties)

  locale/ja-JP/cckwizard/cckWizard.dtd                      (ja-JP/cckwizard/cckWizard.dtd)

  locale/ja-JP/cckwizard/cckwizard.properties               (ja-JP/cckwizard/cckwizard.properties)

  locale/nl-NL/cckwizard/cckWizard.dtd                      (nl-NL/cckwizard/cckWizard.dtd)

  locale/nl-NL/cckwizard/cckwizard.properties               (nl-NL/cckwizard/cckwizard.properties)

  locale/pt-BR/cckwizard/cckWizard.dtd                      (pt-BR/cckwizard/cckWizard.dtd)

  locale/pt-BR/cckwizard/cckwizard.properties               (pt-BR/cckwizard/cckwizard.properties)

  locale/ru-RU/cckwizard/cckWizard.dtd                      (ru-RU/cckwizard/cckWizard.dtd)

  locale/ru-RU/cckwizard/cckwizard.properties               (ru-RU/cckwizard/cckwizard.properties)

  locale/zh-CN/cckwizard/cckWizard.dtd                      (zh-CN/cckwizard/cckWizard.dtd)

  locale/zh-CN/cckwizard/cckwizard.properties               (zh-CN/cckwizard/cckwizard.properties)