Issue 29631579: Issue 6170 - import translations for the conflict message

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 29631579: Issue 6170 - import translations for the conflict message (Closed)

Created:
Dec. 6, 2017, 2:31 p.m. by saroyanm

Modified:
Dec. 6, 2017, 6:25 p.m.

Reviewers:
tamara

CC:
kzar, Sebastian Noack

Visibility:
Public.

Description

Issue 6170 - import translations for the conflict message

Patch Set 1 : #

Created: Dec. 6, 2017, 2:54 p.m.

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+650 lines, -0 lines)			Patch
M	locale/ar/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/be/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/bg/desktop-options.json	View	1 chunk	+3 lines, -0 lines	0 comments	Download
M	locale/ca/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/de/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/es/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/es_AR/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/es_CL/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/es_MX/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/et/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/fr/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/he/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/hu/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/it/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/lt/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/nl/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/pl/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/ro/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/ru/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/sk/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/sl/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/th/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/tr/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download
M	locale/vi/desktop-options.json	View	1 chunk	+3 lines, -0 lines	0 comments	Download
M	locale/zh_CN/desktop-options.json	View	1 chunk	+28 lines, -0 lines	0 comments	Download

Messages

Total messages: 3

Expand All Messages | Collapse All Messages

saroyanm

@Tamara can you please have a look and let me know if i can give ...

Dec. 6, 2017, 2:57 p.m. (2017-12-06 14:57:51 UTC) #1

On 2017/12/06 14:58:56, saroyanm wrote:

LGTM

Expand All Messages | Collapse All Messages