summaryrefslogtreecommitdiffstats
path: root/l10n-cak/editor/ui/chrome/dialogs/EditConflict.dtd
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 14:29:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 14:29:10 +0000
commit2aa4a82499d4becd2284cdb482213d541b8804dd (patch)
treeb80bf8bf13c3766139fbacc530efd0dd9d54394c /l10n-cak/editor/ui/chrome/dialogs/EditConflict.dtd
parentInitial commit. (diff)
downloadfirefox-2aa4a82499d4becd2284cdb482213d541b8804dd.tar.xz
firefox-2aa4a82499d4becd2284cdb482213d541b8804dd.zip
Adding upstream version 86.0.1.upstream/86.0.1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'l10n-cak/editor/ui/chrome/dialogs/EditConflict.dtd')
-rw-r--r--l10n-cak/editor/ui/chrome/dialogs/EditConflict.dtd10
1 files changed, 10 insertions, 0 deletions
diff --git a/l10n-cak/editor/ui/chrome/dialogs/EditConflict.dtd b/l10n-cak/editor/ui/chrome/dialogs/EditConflict.dtd
new file mode 100644
index 0000000000..633a3336c9
--- /dev/null
+++ b/l10n-cak/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 "Ticha' Kenuk' taq Jaloj">
+<!ENTITY conflictWarning.label "Xajalatäj re ruxaq re' ruma jun chik cholkema', chuqa' e k'o taq jaloj, ri man eyakon ta pa ri Nuk'unel.">
+<!ENTITY conflictResolve.label "Tacha' ri ruwäch xtijike':">
+<!ENTITY keepCurrentPageButton.label "Keyake' ri taq rujaloj ruxaq k'o wakami">
+<!ENTITY useOtherPageButton.label "Tik'ex ri ruxaq k'o wakami rik'in ri ch'aqa' chik taq jaloj">