[Zaf-commit] [translate/mozilla-l10n] a47790: Templates: update header to in include X-Merge-On

[Dwayne B. <dw...@tr...>]

  Branch: refs/heads/master
  Home:   https://github.com/translate/mozilla-l10n
  Commit: a4779052ab5a9b49a97c54d70751cb2d456c41aa
      https://github.com/translate/mozilla-l10n/commit/a4779052ab5a9b49a97c54d70751cb2d456c41aa
  Author: Dwayne Bailey <dw...@tr...>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M templates/browser/branding/official/brand.dtd.pot
    M templates/browser/branding/official/brand.properties.pot
    M templates/browser/chrome/browser-region/region.properties.pot
    M templates/browser/chrome/browser/aboutCertError.dtd.pot
    M templates/browser/chrome/browser/aboutDialog.dtd.pot
    M templates/browser/chrome/browser/aboutHome.dtd.pot
    M templates/browser/chrome/browser/aboutPrivateBrowsing.dtd.pot
    M templates/browser/chrome/browser/aboutRobots.dtd.pot
    M templates/browser/chrome/browser/aboutSessionRestore.dtd.pot
    M templates/browser/chrome/browser/aboutSyncTabs.dtd.pot
    M templates/browser/chrome/browser/baseMenuOverlay.dtd.pot
    M templates/browser/chrome/browser/browser.dtd.pot
    M templates/browser/chrome/browser/browser.properties.pot
    M templates/browser/chrome/browser/devtools/debugger.dtd.pot
    M templates/browser/chrome/browser/devtools/debugger.properties.pot
    M templates/browser/chrome/browser/devtools/gcli.properties.pot
    M templates/browser/chrome/browser/devtools/gclicommands.properties.pot
    M templates/browser/chrome/browser/devtools/inspector.properties.pot
    M templates/browser/chrome/browser/devtools/layoutview.dtd.pot
    M templates/browser/chrome/browser/devtools/responsiveUI.properties.pot
    M templates/browser/chrome/browser/devtools/scratchpad.dtd.pot
    M templates/browser/chrome/browser/devtools/scratchpad.properties.pot
    M templates/browser/chrome/browser/devtools/sourceeditor.dtd.pot
    M templates/browser/chrome/browser/devtools/sourceeditor.properties.pot
    M templates/browser/chrome/browser/devtools/styleeditor.dtd.pot
    M templates/browser/chrome/browser/devtools/styleeditor.properties.pot
    M templates/browser/chrome/browser/devtools/styleinspector.dtd.pot
    M templates/browser/chrome/browser/devtools/styleinspector.properties.pot
    M templates/browser/chrome/browser/devtools/tilt.properties.pot
    M templates/browser/chrome/browser/devtools/webConsole.dtd.pot
    M templates/browser/chrome/browser/devtools/webconsole.properties.pot
    M templates/browser/chrome/browser/downloads/downloads.dtd.pot
    M templates/browser/chrome/browser/downloads/downloads.properties.pot
    M templates/browser/chrome/browser/engineManager.dtd.pot
    M templates/browser/chrome/browser/engineManager.properties.pot
    M templates/browser/chrome/browser/feeds/subscribe.dtd.pot
    M templates/browser/chrome/browser/feeds/subscribe.properties.pot
    M templates/browser/chrome/browser/migration/migration.dtd.pot
    M templates/browser/chrome/browser/migration/migration.properties.pot
    M templates/browser/chrome/browser/newTab.dtd.pot
    M templates/browser/chrome/browser/newTab.properties.pot
    M templates/browser/chrome/browser/openLocation.dtd.pot
    M templates/browser/chrome/browser/openLocation.properties.pot
    M templates/browser/chrome/browser/pageInfo.dtd.pot
    M templates/browser/chrome/browser/pageInfo.properties.pot
    M templates/browser/chrome/browser/places/bookmarkProperties.properties.pot
    M templates/browser/chrome/browser/places/editBookmarkOverlay.dtd.pot
    M templates/browser/chrome/browser/places/moveBookmarks.dtd.pot
    M templates/browser/chrome/browser/places/places.dtd.pot
    M templates/browser/chrome/browser/places/places.properties.pot
    M templates/browser/chrome/browser/preferences/aboutPermissions.dtd.pot
    M templates/browser/chrome/browser/preferences/aboutPermissions.properties.pot
    M templates/browser/chrome/browser/preferences/advanced-scripts.dtd.pot
    M templates/browser/chrome/browser/preferences/advanced.dtd.pot
    M templates/browser/chrome/browser/preferences/applicationManager.dtd.pot
    M templates/browser/chrome/browser/preferences/applicationManager.properties.pot
    M templates/browser/chrome/browser/preferences/applications.dtd.pot
    M templates/browser/chrome/browser/preferences/colors.dtd.pot
    M templates/browser/chrome/browser/preferences/connection.dtd.pot
    M templates/browser/chrome/browser/preferences/content.dtd.pot
    M templates/browser/chrome/browser/preferences/cookies.dtd.pot
    M templates/browser/chrome/browser/preferences/fonts.dtd.pot
    M templates/browser/chrome/browser/preferences/languages.dtd.pot
    M templates/browser/chrome/browser/preferences/main.dtd.pot
    M templates/browser/chrome/browser/preferences/permissions.dtd.pot
    M templates/browser/chrome/browser/preferences/preferences.dtd.pot
    M templates/browser/chrome/browser/preferences/preferences.properties.pot
    M templates/browser/chrome/browser/preferences/privacy.dtd.pot
    M templates/browser/chrome/browser/preferences/security.dtd.pot
    M templates/browser/chrome/browser/preferences/selectBookmark.dtd.pot
    M templates/browser/chrome/browser/preferences/sync.dtd.pot
    M templates/browser/chrome/browser/preferences/tabs.dtd.pot
    M templates/browser/chrome/browser/quitDialog.properties.pot
    M templates/browser/chrome/browser/safeMode.dtd.pot
    M templates/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd.pot
    M templates/browser/chrome/browser/safebrowsing/report-phishing.dtd.pot
    M templates/browser/chrome/browser/sanitize.dtd.pot
    M templates/browser/chrome/browser/search.properties.pot
    M templates/browser/chrome/browser/searchbar.dtd.pot
    M templates/browser/chrome/browser/setDesktopBackground.dtd.pot
    M templates/browser/chrome/browser/shellservice.properties.pot
    M templates/browser/chrome/browser/syncBrand.dtd.pot
    M templates/browser/chrome/browser/syncGenericChange.properties.pot
    M templates/browser/chrome/browser/syncKey.dtd.pot
    M templates/browser/chrome/browser/syncProgress.dtd.pot
    M templates/browser/chrome/browser/syncQuota.dtd.pot
    M templates/browser/chrome/browser/syncQuota.properties.pot
    M templates/browser/chrome/browser/syncSetup.dtd.pot
    M templates/browser/chrome/browser/syncSetup.properties.pot
    M templates/browser/chrome/browser/tabbrowser.dtd.pot
    M templates/browser/chrome/browser/tabbrowser.properties.pot
    M templates/browser/chrome/browser/tabview.properties.pot
    M templates/browser/chrome/browser/taskbar.properties.pot
    M templates/browser/chrome/overrides/appstrings.properties.pot
    M templates/browser/chrome/overrides/netError.dtd.pot
    M templates/browser/chrome/overrides/settingsChange.dtd.pot
    M templates/browser/crashreporter/crashreporter-override.ini.pot
    M templates/browser/defines.inc.pot
    M templates/browser/feedback/main.dtd.pot
    M templates/browser/feedback/main.properties.pot
    M templates/browser/installer/custom.properties.pot
    M templates/browser/installer/mui.properties.pot
    M templates/browser/installer/nsisstrings.properties.pot
    M templates/browser/installer/override.properties.pot
    M templates/browser/pdfviewer/chrome.properties.pot
    M templates/browser/pdfviewer/viewer.properties.pot
    M templates/browser/profile/bookmarks.inc.pot
    M templates/browser/searchplugins/eBay.xml
    M templates/browser/updater/updater.ini.pot
    M templates/browser/webapp-uninstaller/webapp-uninstaller.properties.pot
    M templates/browser/webapprt/webapp.dtd.pot
    M templates/browser/webapprt/webapp.properties.pot
    M templates/dom/chrome/accessibility/AccessFu.properties.pot
    M templates/dom/chrome/accessibility/mac/accessible.properties.pot
    M templates/dom/chrome/accessibility/unix/accessible.properties.pot
    M templates/dom/chrome/accessibility/win/accessible.properties.pot
    M templates/dom/chrome/appstrings.properties.pot
    M templates/dom/chrome/charsetTitles.properties.pot
    M templates/dom/chrome/dom/dom.properties.pot
    M templates/dom/chrome/global-strres.properties.pot
    M templates/dom/chrome/global.dtd.pot
    M templates/dom/chrome/layout/HtmlForm.properties.pot
    M templates/dom/chrome/layout/MediaDocument.properties.pot
    M templates/dom/chrome/layout/css.properties.pot
    M templates/dom/chrome/layout/htmlparser.properties.pot
    M templates/dom/chrome/layout/layout_errors.properties.pot
    M templates/dom/chrome/layout/printing.properties.pot
    M templates/dom/chrome/layout/xbl.properties.pot
    M templates/dom/chrome/layout/xmlparser.properties.pot
    M templates/dom/chrome/layout/xul.properties.pot
    M templates/dom/chrome/netError.dtd.pot
    M templates/dom/chrome/netErrorApp.dtd.pot
    M templates/dom/chrome/nsWebBrowserPersist.properties.pot
    M templates/dom/chrome/plugins.properties.pot
    M templates/dom/chrome/security/caps.properties.pot
    M templates/dom/chrome/security/csp.properties.pot
    M templates/dom/chrome/svg/svg.properties.pot
    M templates/dom/chrome/xml/prettyprint.dtd.pot
    M templates/dom/chrome/xslt/xslt.properties.pot
    M templates/embedding/android/android_strings.dtd.pot
    M templates/mobile/android/base/android_strings.dtd.pot
    M templates/mobile/android/base/sync_strings.dtd.pot
    M templates/mobile/android/chrome/about.dtd.pot
    M templates/mobile/android/chrome/aboutAddons.dtd.pot
    M templates/mobile/android/chrome/aboutAddons.properties.pot
    M templates/mobile/android/chrome/aboutApps.dtd.pot
    M templates/mobile/android/chrome/aboutApps.properties.pot
    M templates/mobile/android/chrome/aboutCertError.dtd.pot
    M templates/mobile/android/chrome/aboutDownloads.dtd.pot
    M templates/mobile/android/chrome/aboutDownloads.properties.pot
    M templates/mobile/android/chrome/aboutFeedback.dtd.pot
    M templates/mobile/android/chrome/aboutReader.properties.pot
    M templates/mobile/android/chrome/browser.properties.pot
    M templates/mobile/android/chrome/checkbox.dtd.pot
    M templates/mobile/android/chrome/config.dtd.pot
    M templates/mobile/android/chrome/config.properties.pot
    M templates/mobile/android/chrome/feedback.dtd.pot
    M templates/mobile/android/chrome/localepicker.properties.pot
    M templates/mobile/android/chrome/notification.dtd.pot
    M templates/mobile/android/chrome/phishing.dtd.pot
    M templates/mobile/android/chrome/prompt.dtd.pot
    M templates/mobile/android/chrome/sync.dtd.pot
    M templates/mobile/android/chrome/sync.properties.pot
    M templates/mobile/android/defines.inc.pot
    M templates/mobile/chrome/region.properties.pot
    M templates/mobile/overrides/appstrings.properties.pot
    M templates/mobile/overrides/netError.dtd.pot
    M templates/mobile/overrides/passwordmgr.properties.pot
    M templates/mobile/profile/bookmarks.inc.pot
    M templates/mobile/searchplugins/twitter.xml
    M templates/mobile/xul/chrome/about.dtd.pot
    M templates/mobile/xul/chrome/aboutCertError.dtd.pot
    M templates/mobile/xul/chrome/aboutHome.dtd.pot
    M templates/mobile/xul/chrome/browser.dtd.pot
    M templates/mobile/xul/chrome/browser.properties.pot
    M templates/mobile/xul/chrome/checkbox.dtd.pot
    M templates/mobile/xul/chrome/config.dtd.pot
    M templates/mobile/xul/chrome/feedback.dtd.pot
    M templates/mobile/xul/chrome/localepicker.properties.pot
    M templates/mobile/xul/chrome/notification.dtd.pot
    M templates/mobile/xul/chrome/phishing.dtd.pot
    M templates/mobile/xul/chrome/preferences.dtd.pot
    M templates/mobile/xul/chrome/prompt.dtd.pot
    M templates/mobile/xul/chrome/sync.dtd.pot
    M templates/mobile/xul/chrome/sync.properties.pot
    M templates/mobile/xul/chrome/webapps.dtd.pot
    M templates/mobile/xul/crashreporter/crashreporter-override.ini.pot
    M templates/mobile/xul/defines.inc.pot
    M templates/mobile/xul/updater/updater.ini.pot
    M templates/netwerk/necko.properties.pot
    M templates/security/manager/chrome/pipnss/nsserrors.properties.pot
    M templates/security/manager/chrome/pipnss/pipnss.properties.pot
    M templates/security/manager/chrome/pipnss/security.properties.pot
    M templates/security/manager/chrome/pippki/certManager.dtd.pot
    M templates/security/manager/chrome/pippki/deviceManager.dtd.pot
    M templates/security/manager/chrome/pippki/pippki.dtd.pot
    M templates/security/manager/chrome/pippki/pippki.properties.pot
    M templates/security/manager/chrome/pippki/validation.dtd.pot
    M templates/services/sync/errors.properties.pot
    M templates/services/sync/sync.properties.pot
    M templates/toolkit/chrome/alerts/notificationNames.properties.pot
    M templates/toolkit/chrome/autoconfig/autoconfig.properties.pot
    M templates/toolkit/chrome/cookie/cookieAcceptDialog.dtd.pot
    M templates/toolkit/chrome/cookie/cookieAcceptDialog.properties.pot
    M templates/toolkit/chrome/global-platform/mac/intl.properties.pot
    M templates/toolkit/chrome/global-platform/mac/platformKeys.properties.pot
    M templates/toolkit/chrome/global-platform/unix/intl.properties.pot
    M templates/toolkit/chrome/global-platform/unix/platformKeys.properties.pot
    M templates/toolkit/chrome/global-platform/win/intl.properties.pot
    M templates/toolkit/chrome/global-platform/win/platformKeys.properties.pot
    M templates/toolkit/chrome/global-region/region.properties.pot
    M templates/toolkit/chrome/global/about.dtd.pot
    M templates/toolkit/chrome/global/aboutAbout.dtd.pot
    M templates/toolkit/chrome/global/aboutRights.dtd.pot
    M templates/toolkit/chrome/global/aboutRights.properties.pot
    M templates/toolkit/chrome/global/aboutSupport.dtd.pot
    M templates/toolkit/chrome/global/aboutSupport.properties.pot
    M templates/toolkit/chrome/global/aboutTelemetry.dtd.pot
    M templates/toolkit/chrome/global/aboutTelemetry.properties.pot
    M templates/toolkit/chrome/global/actions.dtd.pot
    M templates/toolkit/chrome/global/appPicker.dtd.pot
    M templates/toolkit/chrome/global/browser.properties.pot
    M templates/toolkit/chrome/global/charsetOverlay.dtd.pot
    M templates/toolkit/chrome/global/commonDialog.dtd.pot
    M templates/toolkit/chrome/global/commonDialogs.properties.pot
    M templates/toolkit/chrome/global/config.dtd.pot
    M templates/toolkit/chrome/global/config.properties.pot
    M templates/toolkit/chrome/global/console.dtd.pot
    M templates/toolkit/chrome/global/console.properties.pot
    M templates/toolkit/chrome/global/contentAreaCommands.properties.pot
    M templates/toolkit/chrome/global/customizeCharset.dtd.pot
    M templates/toolkit/chrome/global/customizeToolbar.dtd.pot
    M templates/toolkit/chrome/global/customizeToolbar.properties.pot
    M templates/toolkit/chrome/global/dateFormat.properties.pot
    M templates/toolkit/chrome/global/datetimepicker.dtd.pot
    M templates/toolkit/chrome/global/devtools/debugger.properties.pot
    M templates/toolkit/chrome/global/dialog.properties.pot
    M templates/toolkit/chrome/global/dialogOverlay.dtd.pot
    M templates/toolkit/chrome/global/downloadProgress.properties.pot
    M templates/toolkit/chrome/global/editMenuOverlay.dtd.pot
    M templates/toolkit/chrome/global/filefield.properties.pot
    M templates/toolkit/chrome/global/filepicker.dtd.pot
    M templates/toolkit/chrome/global/filepicker.properties.pot
    M templates/toolkit/chrome/global/findbar.dtd.pot
    M templates/toolkit/chrome/global/findbar.properties.pot
    M templates/toolkit/chrome/global/finddialog.dtd.pot
    M templates/toolkit/chrome/global/finddialog.properties.pot
    M templates/toolkit/chrome/global/globalKeys.dtd.pot
    M templates/toolkit/chrome/global/headsUpDisplay.properties.pot
    M templates/toolkit/chrome/global/intl.properties.pot
    M templates/toolkit/chrome/global/keys.properties.pot
    M templates/toolkit/chrome/global/languageNames.properties.pot
    M templates/toolkit/chrome/global/mozilla.dtd.pot
    M templates/toolkit/chrome/global/notification.dtd.pot
    M templates/toolkit/chrome/global/nsTreeSorting.properties.pot
    M templates/toolkit/chrome/global/preferences.dtd.pot
    M templates/toolkit/chrome/global/printPageSetup.dtd.pot
    M templates/toolkit/chrome/global/printPreview.dtd.pot
    M templates/toolkit/chrome/global/printPreviewProgress.dtd.pot
    M templates/toolkit/chrome/global/printProgress.dtd.pot
    M templates/toolkit/chrome/global/printdialog.dtd.pot
    M templates/toolkit/chrome/global/printdialog.properties.pot
    M templates/toolkit/chrome/global/printjoboptions.dtd.pot
    M templates/toolkit/chrome/global/regionNames.properties.pot
    M templates/toolkit/chrome/global/resetProfile.dtd.pot
    M templates/toolkit/chrome/global/textcontext.dtd.pot
    M templates/toolkit/chrome/global/tree.dtd.pot
    M templates/toolkit/chrome/global/videocontrols.dtd.pot
    M templates/toolkit/chrome/global/viewSource.dtd.pot
    M templates/toolkit/chrome/global/viewSource.properties.pot
    M templates/toolkit/chrome/global/webapps.properties.pot
    M templates/toolkit/chrome/global/wizard.dtd.pot
    M templates/toolkit/chrome/global/wizard.properties.pot
    M templates/toolkit/chrome/global/xpinstall/xpinstall.properties.pot
    M templates/toolkit/chrome/mozapps/downloads/downloads.dtd.pot
    M templates/toolkit/chrome/mozapps/downloads/downloads.properties.pot
    M templates/toolkit/chrome/mozapps/downloads/settingsChange.dtd.pot
    M templates/toolkit/chrome/mozapps/downloads/unknownContentType.dtd.pot
    M templates/toolkit/chrome/mozapps/downloads/unknownContentType.properties.pot
    M templates/toolkit/chrome/mozapps/extensions/about.dtd.pot
    M templates/toolkit/chrome/mozapps/extensions/blocklist.dtd.pot
    M templates/toolkit/chrome/mozapps/extensions/extensions.dtd.pot
    M templates/toolkit/chrome/mozapps/extensions/extensions.properties.pot
    M templates/toolkit/chrome/mozapps/extensions/newaddon.dtd.pot
    M templates/toolkit/chrome/mozapps/extensions/newaddon.properties.pot
    M templates/toolkit/chrome/mozapps/extensions/selectAddons.dtd.pot
    M templates/toolkit/chrome/mozapps/extensions/selectAddons.properties.pot
    M templates/toolkit/chrome/mozapps/extensions/update.dtd.pot
    M templates/toolkit/chrome/mozapps/extensions/update.properties.pot
    M templates/toolkit/chrome/mozapps/extensions/xpinstallConfirm.dtd.pot
    M templates/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties.pot
    M templates/toolkit/chrome/mozapps/handling/handling.dtd.pot
    M templates/toolkit/chrome/mozapps/handling/handling.properties.pot
    M templates/toolkit/chrome/mozapps/help/help.dtd.pot
    M templates/toolkit/chrome/mozapps/help/help.properties.pot
    M templates/toolkit/chrome/mozapps/plugins/plugins.dtd.pot
    M templates/toolkit/chrome/mozapps/plugins/plugins.properties.pot
    M templates/toolkit/chrome/mozapps/preferences/changemp.dtd.pot
    M templates/toolkit/chrome/mozapps/preferences/ocsp.dtd.pot
    M templates/toolkit/chrome/mozapps/preferences/preferences.properties.pot
    M templates/toolkit/chrome/mozapps/preferences/removemp.dtd.pot
    M templates/toolkit/chrome/mozapps/profile/createProfileWizard.dtd.pot
    M templates/toolkit/chrome/mozapps/profile/profileSelection.dtd.pot
    M templates/toolkit/chrome/mozapps/profile/profileSelection.properties.pot
    M templates/toolkit/chrome/mozapps/update/history.dtd.pot
    M templates/toolkit/chrome/mozapps/update/updates.dtd.pot
    M templates/toolkit/chrome/mozapps/update/updates.properties.pot
    M templates/toolkit/chrome/passwordmgr/passwordManager.dtd.pot
    M templates/toolkit/chrome/passwordmgr/passwordmgr.properties.pot
    M templates/toolkit/chrome/places/places.properties.pot
    M templates/toolkit/chrome/search/search.properties.pot
    M templates/toolkit/crashreporter/crashes.dtd.pot
    M templates/toolkit/crashreporter/crashes.properties.pot
    M templates/toolkit/crashreporter/crashreporter.ini.pot
    M templates/toolkit/defines.inc.pot

  Log Message:
  -----------
  Templates: update header to in include X-Merge-On