Merge
authorTheo Chevalier <theo.chevalier11@gmail.com>
Tue, 09 Oct 2012 21:09:11 +0200
changeset 4117 a1c2aff1d7175f4886559545aa837d53d1cf9e9b
parent 2996 9177cdecafc2b708ee6d89d99370af2939c1e75c (current diff)
parent 4116 f5f5952be02b6e1cb6e80ca244f3b194a006b6b9 (diff)
child 4118 aa104dad9791e995a0092c189c37a437f7fea28f
push id3471
push usertheo.chevalier11@gmail.com
push dateWed, 06 Nov 2013 19:31:44 +0000
Merge
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/openLocation.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/applicationManager.properties
browser/chrome/browser/preferences/colors.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/languages.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/overrides/netError.dtd
browser/feedback/main.dtd
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
browser/updater/updater.ini
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/lightning/lightning-toolbar.dtd
chat/irc.properties
chat/xmpp.properties
dom/chrome/accessibility/mac/accessible.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/netError.dtd
editor/ui/chrome/composer/editingOverlay.dtd
editor/ui/chrome/dialogs/EdColorPicker.dtd
editor/ui/chrome/dialogs/EdDialogOverlay.dtd
editor/ui/chrome/dialogs/EditorPublish.dtd
embedding/android/android_strings.dtd
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-junk.dtd
mail/chrome/messenger/chat.dtd
mail/chrome/messenger/chat.properties
mail/chrome/messenger/eudoraImportMsgs.properties
mail/chrome/messenger/imAccountWizard.dtd
mail/chrome/messenger/importMsgs.properties
mail/chrome/messenger/joinChat.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/preferences/applicationManager.properties
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/permissions.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/overrides/netError.dtd
mail/feedback/main.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/config.dtd
mobile/android/chrome/phishing.dtd
mobile/overrides/appstrings.properties
mobile/overrides/netError.dtd
mobile/xul/chrome/browser.dtd
mobile/xul/chrome/browser.properties
mobile/xul/chrome/phishing.dtd
netwerk/necko.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pipnss/security.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
services/sync/sync.properties
suite/chrome/browser/navigator.dtd
suite/chrome/browser/navigatorOverlay.dtd
suite/chrome/browser/pageInfo.dtd
suite/chrome/browser/pageInfo.properties
suite/chrome/common/dataman/dataman.dtd
suite/chrome/common/dataman/dataman.properties
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_getting_started.xhtml
suite/chrome/common/help/mailnews_organizing.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/using_priv_help.xhtml
suite/chrome/common/notification.properties
suite/chrome/common/openLocation.dtd
suite/chrome/common/openLocation.properties
suite/chrome/common/permissions/permissionsManager.dtd
suite/chrome/common/permissions/permissionsManager.properties
suite/chrome/common/pref/mac/platformPrefOverlay.dtd
suite/chrome/common/pref/pref-applicationManager.properties
suite/chrome/common/pref/pref-applications.properties
suite/chrome/common/pref/pref-cache.dtd
suite/chrome/common/pref/pref-colors.dtd
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/pref/pref-fonts.dtd
suite/chrome/common/pref/pref-http.dtd
suite/chrome/common/pref/pref-languages.dtd
suite/chrome/common/pref/pref-locationbar.dtd
suite/chrome/common/pref/pref-masterpass.dtd
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/common/pref/pref-offlineapps.dtd
suite/chrome/common/pref/pref-passwords.dtd
suite/chrome/common/pref/pref-policies.dtd
suite/chrome/common/pref/pref-search.dtd
suite/chrome/common/pref/pref-smartupdate.dtd
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/common/sanitize.dtd
suite/chrome/common/sync/syncSetup.properties
suite/chrome/common/tasksOverlay.dtd
suite/chrome/mailnews/addressbook/abCardOverlay.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/eudoraImportMsgs.properties
suite/chrome/mailnews/importMsgs.properties
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/msgAccountCentral.dtd
suite/chrome/mailnews/msgHdrViewOverlay.dtd
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/newsblog/am-newsblog.dtd
suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
suite/chrome/mailnews/pref/am-identities-list.dtd
suite/chrome/mailnews/pref/am-junk.dtd
suite/chrome/mailnews/pref/pref-composing_messages.dtd
suite/chrome/mailnews/pref/prefs.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/browser.properties
toolkit/chrome/global/contentAreaCommands.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/mozilla.dtd
toolkit/chrome/mozapps/extensions/about.dtd
toolkit/chrome/mozapps/extensions/update.dtd
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/preferences/preferences.properties