diff --git a/k-meleon/locales/en-US/chrome/browser/aboutHome.dtd b/k-meleon/locales/en-US/chrome/browser/aboutHome.dtd index e84341f5..1832f3e6 100644 --- a/k-meleon/locales/en-US/chrome/browser/aboutHome.dtd +++ b/k-meleon/locales/en-US/chrome/browser/aboutHome.dtd @@ -4,8 +4,7 @@ %brandDTD; - -%syncBrandDTD; + diff --git a/k-meleon/locales/en-US/chrome/browser/downloads/downloads.dtd b/k-meleon/locales/en-US/chrome/browser/downloads/downloads.dtd index feabcc86..e1344b46 100644 --- a/k-meleon/locales/en-US/chrome/browser/downloads/downloads.dtd +++ b/k-meleon/locales/en-US/chrome/browser/downloads/downloads.dtd @@ -66,6 +66,31 @@ + + + + + + + + + + + + + + + + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/advanced.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/advanced.dtd index 10024661..8c08812c 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/advanced.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/advanced.dtd @@ -26,28 +26,18 @@ - - - - - - - - - - - + + - @@ -125,12 +115,12 @@ - + - + + + - - - + - + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/colors.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/colors.dtd index bf434888..7456f48b 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/colors.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/colors.dtd @@ -6,21 +6,25 @@ - - + + + + + + - + - + - + - + - + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/content.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/content.dtd index 2e881e47..a4f6436d 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/content.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/content.dtd @@ -27,3 +27,24 @@ + + + + + + + + + + + + + + + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/cookies.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/cookies.dtd index 06f57c43..6dc08d56 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/cookies.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/cookies.dtd @@ -7,11 +7,13 @@ - - - - - + + + + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/fonts.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/fonts.dtd index 534cb56d..f2847edf 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/fonts.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/fonts.dtd @@ -3,9 +3,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - @@ -24,18 +21,17 @@ - - + + - - - + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/main.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/main.dtd index 5c65fc8d..95a44981 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/main.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/main.dtd @@ -30,3 +30,14 @@ + + + + + + + + + + + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/preferences.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/preferences.dtd index 41cfc0cf..678cd298 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/preferences.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/preferences.dtd @@ -4,6 +4,8 @@ + + @@ -13,6 +15,7 @@ + @@ -21,5 +24,5 @@ - - \ No newline at end of file + + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/preferences.properties b/k-meleon/locales/en-US/chrome/browser/preferences/preferences.properties index df2b3c7a..9e3cb536 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/preferences.properties +++ b/k-meleon/locales/en-US/chrome/browser/preferences/preferences.properties @@ -13,6 +13,10 @@ phishBeforeText=Selecting this option will send the address of web pages you are labelDefaultFont=Default (%S) +veryLargeMinimumFontTitle=Large minimum font size +veryLargeMinimumFontWarning=You have selected a very large minimum font size (more than 24 pixels). This may make it difficult or impossible to use some important configuration pages like this one. +acceptVeryLargeMinimumFont=Keep my changes anyway + #### Permissions Manager cookiepermissionstext=You can specify which websites are always or never allowed to use cookies. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow. @@ -92,8 +96,17 @@ cannot=Block noCookieSelected= cookiesAll=The following cookies are stored on your computer: cookiesFiltered=The following cookies match your search: +# LOCALIZATION NOTE (removeSelectedCookies): +# Semicolon-separated list of plural forms. See: +# http://developer.mozilla.org/en/docs/Localization_and_Plurals +# If you need to display the number of selected elements in your language, +# you can use #1 in your localization as a placeholder for the number. +# For example this is the English string with numbers: +# removeSelectedCookied=Remove #1 Selected;Remove #1 Selected +removeSelectedCookies=Remove Selected;Remove Selected #### Offline apps +offlineAppsList.height=7em offlineAppRemoveTitle=Remove offline website data offlineAppRemovePrompt=After removing this data, %S will not be available offline. Are you sure you want to remove this offline website? offlineAppRemoveConfirm=Remove offline data @@ -136,9 +149,3 @@ syncUnlinkConfirm.label=Unlink featureEnableRequiresRestart=%S must restart to enable this feature. featureDisableRequiresRestart=%S must restart to disable this feature. shouldRestartTitle=Restart %S - -###Preferences::Sync::Firefox Accounts -firefoxAccountsVerificationSentTitle=Verification Sent -# LOCALIZATION NOTE: %S = user's email address. -firefoxAccountsVerificationSentHeading=A verification link has been sent to %S -firefoxAccountVerificationSentDescription=Please check your email and click the link to begin syncing. diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/privacy.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/privacy.dtd index d8ce26a0..6b72352e 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -4,25 +4,24 @@ - - - - + + + - - - - + + - + + + @@ -34,7 +33,7 @@ - + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/search.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/search.dtd new file mode 100644 index 00000000..5c4e7e57 --- /dev/null +++ b/k-meleon/locales/en-US/chrome/browser/preferences/search.dtd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/tabs.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/tabs.dtd index f035de9f..8480d9ca 100644 --- a/k-meleon/locales/en-US/chrome/browser/preferences/tabs.dtd +++ b/k-meleon/locales/en-US/chrome/browser/preferences/tabs.dtd @@ -9,13 +9,13 @@ - + - + - + diff --git a/k-meleon/locales/en-US/chrome/browser/preferences/translation.dtd b/k-meleon/locales/en-US/chrome/browser/preferences/translation.dtd new file mode 100644 index 00000000..fc5fb2b7 --- /dev/null +++ b/k-meleon/locales/en-US/chrome/browser/preferences/translation.dtd @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/k-meleon/locales/en-US/chrome/browser/sanitize.dtd b/k-meleon/locales/en-US/chrome/browser/sanitize.dtd index 0a034215..7e082fa1 100644 --- a/k-meleon/locales/en-US/chrome/browser/sanitize.dtd +++ b/k-meleon/locales/en-US/chrome/browser/sanitize.dtd @@ -3,7 +3,23 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + + + + + + + + + @@ -53,10 +69,3 @@ that require it. --> that appears when "Time range to clear" is set to "Everything". See UI mockup at bug 480169 --> - - - - diff --git a/k-meleon/locales/en-US/chrome/kmeleon/_netError.dtd b/k-meleon/locales/en-US/chrome/kmeleon/_netError.dtd new file mode 100644 index 00000000..9f6cf045 --- /dev/null +++ b/k-meleon/locales/en-US/chrome/kmeleon/_netError.dtd @@ -0,0 +1,197 @@ + + + +%brandDTD; + + + + + + + + + + + + + + +
  • Check the address for typing errors such as + ww.example.com instead of + www.example.com
    • +
  • If you are unable to load any pages, check your computer's network + connection.
    • +
  • If your computer or network is protected by a firewall or proxy, make sure + that &brandShortName; is permitted to access the Web.
    • + +"> + + + +
  • Check the file name for capitalization or other typing errors.
    • +
  • Check to see if the file was moved, renamed or deleted.
    • + +"> + + + +&brandShortName; can't load this page for some reason.

    +"> + + + +
  • Web addresses are usually written like + http://www.example.com/
    • +
  • Make sure that you're using forward slashes (i.e. + /).
    • + +"> + + + + + +The requested document is not available in &brandShortName;'s cache.

    "> + + + +
  • Press "Try Again" to switch to online mode and reload the page.
    • + +"> + + + +
  • Please contact the website owners to inform them of this problem.
    • + +"> + + + +
  • Please contact the website owners to inform them of this problem.
    • + +"> + + + + + + + + + +
  • You might need to install other software to open this address.
    • + +"> + + + +
  • Check the proxy settings to make sure that they are correct.
    • +
  • Contact your network administrator to make sure the proxy server is + working.
    • + +"> + + + +
  • Check the proxy settings to make sure that they are correct.
    • +
  • Check to make sure your computer has a working network connection.
    • +
  • If your computer or network is protected by a firewall or proxy, make sure + that &brandShortName; is permitted to access the Web.
    • + +"> + + + +
  • This problem can sometimes be caused by disabling or refusing to accept + cookies.
    • + +"> + + + +
  • Check to make sure your system has the Personal Security Manager + installed.
    • +
  • This might be due to a non-standard configuration on the server.
    • + +"> + + + +
  • The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
    • +
  • Please contact the website owners to inform them of this problem. Alternatively, use the command found in the help menu to report this broken site.
    • + +"> + + + +
  • This could be a problem with the server's configuration, or it could be +someone trying to impersonate the server.
    • +
  • If you have connected to this server successfully in the past, the error may +be temporary, and you can try again later.
    • + +"> + + +
  • The site could be temporarily unavailable or too busy. Try again in a few + moments.
    • +
  • If you are unable to load any pages, check your computer's network + connection.
    • +
  • If your computer or network is protected by a firewall or proxy, make sure + that &brandShortName; is permitted to access the Web.
    • + +"> + + +Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.

    +

    Website owners who believe their site has been reported as an attack site in error may request a review.

    +"> + + +Entering any personal information on this page may result in identity theft or other fraud.

    +

    These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.

    +"> + + +&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.

    "> + + +The page you are trying to view cannot be shown because an error in the data transmission was detected.

    "> + + + + + + + + +You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.

    + + + +"> + + +

    "> diff --git a/k-meleon/locales/en-US/chrome/kmeleon/netError.dtd b/k-meleon/locales/en-US/chrome/kmeleon/netError.dtd index 9f6cf045..533af480 100644 --- a/k-meleon/locales/en-US/chrome/kmeleon/netError.dtd +++ b/k-meleon/locales/en-US/chrome/kmeleon/netError.dtd @@ -2,76 +2,40 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - -%brandDTD; - - + - - + +Though the site seems valid, the browser was unable to establish a connection.

    "> - - + +The requested address specified a port (e.g. mozilla.org:80 for port 80 on mozilla.org) normally used for purposes other than Web browsing. The browser has canceled the request for your protection and security.

    "> - - -
  • Check the address for typing errors such as - ww.example.com instead of - www.example.com
    • -
  • If you are unable to load any pages, check your computer's network - connection.
    • -
  • If your computer or network is protected by a firewall or proxy, make sure - that &brandShortName; is permitted to access the Web.
    • - -"> + +The browser could not find the host server for the provided address.

    "> - - -
  • Check the file name for capitalization or other typing errors.
    • -
  • Check to see if the file was moved, renamed or deleted.
    • - -"> + +
  • Could the item have been renamed, removed, or relocated?
  • Is there a spelling, capitalization, or other typographical error in the address?
  • Do you have sufficient access permissions to the requested item?
    • "> + +Additional information about this problem or error is currently unavailable.

    "> - -&brandShortName; can't load this page for some reason.

    -"> - - - -
  • Web addresses are usually written like - http://www.example.com/
    • -
  • Make sure that you're using forward slashes (i.e. - /).
    • - -"> + +The provided address is not in a recognized format. Please check the location bar for mistakes and try again.

    "> - - + +The browser connected successfully, but the connection was interrupted while transferring information. Please try again.

    "> -The requested document is not available in &brandShortName;'s cache.

    "> +The requested document is not available in the browser's cache.

    "> - - -
  • Press "Try Again" to switch to online mode and reload the page.
    • - -"> + +The browser is operating in its offline mode and cannot connect to the requested item.

    "> - -
  • Please contact the website owners to inform them of this problem.
    • - -"> +The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.

    "> "> - - + +The network link was interrupted while negotiating a connection. Please try again.

    "> - - + +The requested site did not respond to a connection request and the browser has stopped waiting for a reply.

    "> - - -
  • You might need to install other software to open this address.
    • - -"> + +The address specifies a protocol (e.g. wxyz://) the browser does not recognize, so the browser cannot properly connect to the site.

    "> - - -
  • Check the proxy settings to make sure that they are correct.
    • -
  • Contact your network administrator to make sure the proxy server is - working.
    • - -"> + +The browser is configured to use a proxy server, but the proxy refused a connection.

    "> - - -
  • Check the proxy settings to make sure that they are correct.
    • -
  • Check to make sure your computer has a working network connection.
    • -
  • If your computer or network is protected by a firewall or proxy, make sure - that &brandShortName; is permitted to access the Web.
    • - -"> + +The browser is configured to use a proxy server, but the proxy could not be found.

    "> - - -
  • This problem can sometimes be caused by disabling or refusing to accept - cookies.
    • - -"> + +The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.

    "> - - -
  • Check to make sure your system has the Personal Security Manager - installed.
    • -
  • This might be due to a non-standard configuration on the server.
    • - -"> + +The site responded to the network request in an unexpected way and the browser cannot continue.

    "> - -
  • The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
    • -
  • Please contact the website owners to inform them of this problem. Alternatively, use the command found in the help menu to report this broken site.
    • - -"> +The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.

    "> - -
  • This could be a problem with the server's configuration, or it could be -someone trying to impersonate the server.
    • -
  • If you have connected to this server successfully in the past, the error may -be temporary, and you can try again later.
    • - -"> - - -
  • The site could be temporarily unavailable or too busy. Try again in a few - moments.
    • -
  • If you are unable to load any pages, check your computer's network - connection.
    • -
  • If your computer or network is protected by a firewall or proxy, make sure - that &brandShortName; is permitted to access the Web.
    • + +
  • This could be a problem with the server's configuration, or it could be someone trying to impersonate the server.
    • +
  • If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.
    • "> @@ -170,28 +87,18 @@ be temporary, and you can try again later.

    These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.

    "> - -&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.

    "> + +The browser prevented this page from loading in this way because the page has a content security policy that disallows it.

    "> The page you are trying to view cannot be shown because an error in the data transmission was detected.

    "> - - - - - - - -You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.

    - - - -"> -

    "> + + + +%netErrorAppDTD; diff --git a/k-meleon/locales/en-US/chrome/kmprefs/kplugins/gestures.dtd b/k-meleon/locales/en-US/chrome/kmprefs/kplugins/gestures.dtd index 8d3a1d19..2f90df41 100644 --- a/k-meleon/locales/en-US/chrome/kmprefs/kplugins/gestures.dtd +++ b/k-meleon/locales/en-US/chrome/kmprefs/kplugins/gestures.dtd @@ -16,6 +16,13 @@ + + + + + + + @@ -30,6 +37,7 @@ + @@ -57,4 +65,7 @@ - \ No newline at end of file + + + + diff --git a/k-meleon/locales/en-US/chrome/kmprefs/kplugins/macros.properties b/k-meleon/locales/en-US/chrome/kmprefs/kplugins/macros.properties index 317ced51..01044339 100644 --- a/k-meleon/locales/en-US/chrome/kmprefs/kplugins/macros.properties +++ b/k-meleon/locales/en-US/chrome/kmprefs/kplugins/macros.properties @@ -2,6 +2,7 @@ custom=(user-defined) accel=Sets keyboard and mouse accelerators cfg=Provides acces to K-Meleon's configuration files compat=Updates preferences to the current version of K-Meleon +compat75=Adds more compatibility with old settings console2=Integrates the Console\u00B2 extension (enhanced error console) docinfo=Provides document information (links, images, linked images) domcomplete=Provides keyboard accelerators for manual domain completion diff --git a/k-meleon/locales/en-US/chrome/kmprefs/pref-privacy.dtd b/k-meleon/locales/en-US/chrome/kmprefs/pref-privacy.dtd index d17fb366..1feee1f5 100644 --- a/k-meleon/locales/en-US/chrome/kmprefs/pref-privacy.dtd +++ b/k-meleon/locales/en-US/chrome/kmprefs/pref-privacy.dtd @@ -9,6 +9,7 @@ +