summaryrefslogtreecommitdiffstats
path: root/l10n-en-GB/editor/ui/chrome/dialogs/EditConflict.dtd
diff options
context:
space:
mode:
Diffstat (limited to 'l10n-en-GB/editor/ui/chrome/dialogs/EditConflict.dtd')
-rw-r--r--l10n-en-GB/editor/ui/chrome/dialogs/EditConflict.dtd10
1 files changed, 10 insertions, 0 deletions
diff --git a/l10n-en-GB/editor/ui/chrome/dialogs/EditConflict.dtd b/l10n-en-GB/editor/ui/chrome/dialogs/EditConflict.dtd
new file mode 100644
index 0000000000..d874ff06b0
--- /dev/null
+++ b/l10n-en-GB/editor/ui/chrome/dialogs/EditConflict.dtd
@@ -0,0 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - 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/. -->
+
+<!-- Window title -->
+<!ENTITY windowTitle.label "Select Edit Changes">
+<!ENTITY conflictWarning.label "This page has been modified by another program, but you also have unsaved changes in Composer.">
+<!ENTITY conflictResolve.label "Select which version to keep:">
+<!ENTITY keepCurrentPageButton.label "Keep current page changes">
+<!ENTITY useOtherPageButton.label "Replace current page with other changes">