Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
b6147734
Commit
b6147734
authored
Nov 22, 2017
by
Дмитрий Никулин
Committed by
Vitaly Lipatov
Nov 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add helper message on conflict
parent
0a962c57
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
midair.html.tmpl
template/en/default/bug/process/midair.html.tmpl
+7
-0
midair.html.tmpl
template/ru/default/bug/process/midair.html.tmpl
+7
-0
No files found.
template/en/default/bug/process/midair.html.tmpl
View file @
b6147734
...
...
@@ -55,6 +55,12 @@
[% END %]
<p>
Return to previous page, copy your comment text, refresh the page
and then submit the comment again.
</p>
<!--
<p>
You have the following choices:
</p>
...
...
@@ -88,5 +94,6 @@ You have the following choices:
[%+ "revisit $terms.bug $bug.id" FILTER bug_link(bug) FILTER none %]
</li>
</ul>
-->
[% PROCESS global/footer.html.tmpl %]
template/ru/default/bug/process/midair.html.tmpl
View file @
b6147734
...
...
@@ -55,6 +55,12 @@
[% END %]
<p>
Вернитесь на предыдущую страницу, сохраните текст комментария,
обновите страницу, после чего снова отправьте комментарий.
</p>
<!--
<p>
Возможные варианты:
</p>
...
...
@@ -88,5 +94,6 @@
[%+ "вернуться к $terms.bug $bug.id" FILTER bug_link(bug) FILTER none %]
</li>
</ul>
-->
[% PROCESS global/footer.html.tmpl %]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment