##// END OF EJS Templates
crecord: filter text via i18n...
Jun Wu -
r30535:3899c358 default
parent child Browse files
Show More
@@ -960,10 +960,10 b' class curseschunkselector(object):'
960 pairname='legend')
960 pairname='legend')
961 self.statuswin.refresh()
961 self.statuswin.refresh()
962 return
962 return
963 line1 = ("SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; "
963 line1 = _("SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; "
964 "(space/A) toggle hunk/all; (e)dit hunk;")
964 "(space/A) toggle hunk/all; (e)dit hunk;")
965 line2 = (" (f)old/unfold; (c)onfirm applied; (q)uit; (?) help "
965 line2 = _(" (f)old/unfold; (c)onfirm applied; (q)uit; (?) help "
966 "| [X]=hunk applied **=folded, toggle [a]mend mode")
966 "| [X]=hunk applied **=folded, toggle [a]mend mode")
967
967
968 printstring(self.statuswin,
968 printstring(self.statuswin,
969 util.ellipsis(line1, self.xscreensize - 1),
969 util.ellipsis(line1, self.xscreensize - 1),
@@ -1305,7 +1305,8 b' class curseschunkselector(object):'
1305
1305
1306 def helpwindow(self):
1306 def helpwindow(self):
1307 "print a help window to the screen. exit after any keypress."
1307 "print a help window to the screen. exit after any keypress."
1308 helptext = """ [press any key to return to the patch-display]
1308 helptext = _(
1309 """ [press any key to return to the patch-display]
1309
1310
1310 crecord allows you to interactively choose among the changes you have made,
1311 crecord allows you to interactively choose among the changes you have made,
1311 and confirm only those changes you select for further processing by the command
1312 and confirm only those changes you select for further processing by the command
@@ -1329,7 +1330,7 b' the following are valid keystrokes:'
1329 c : confirm selected changes
1330 c : confirm selected changes
1330 r : review/edit and confirm selected changes
1331 r : review/edit and confirm selected changes
1331 q : quit without confirming (no changes will be made)
1332 q : quit without confirming (no changes will be made)
1332 ? : help (what you're currently reading)"""
1333 ? : help (what you're currently reading)""")
1333
1334
1334 helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
1335 helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
1335 helplines = helptext.split("\n")
1336 helplines = helptext.split("\n")
@@ -1368,7 +1369,7 b' the following are valid keystrokes:'
1368 def reviewcommit(self):
1369 def reviewcommit(self):
1369 """ask for 'y' to be pressed to confirm selected. return True if
1370 """ask for 'y' to be pressed to confirm selected. return True if
1370 confirmed."""
1371 confirmed."""
1371 confirmtext = (
1372 confirmtext = _(
1372 """if you answer yes to the following, the your currently chosen patch chunks
1373 """if you answer yes to the following, the your currently chosen patch chunks
1373 will be loaded into an editor. you may modify the patch from the editor, and
1374 will be loaded into an editor. you may modify the patch from the editor, and
1374 save the changes if you wish to change the patch. otherwise, you can just
1375 save the changes if you wish to change the patch. otherwise, you can just
@@ -1400,19 +1401,19 b' are you sure you want to review/edit and'
1400 except ValueError:
1401 except ValueError:
1401 ver = 1
1402 ver = 1
1402 if ver < 2.19:
1403 if ver < 2.19:
1403 msg = ("The amend option is unavailable with hg versions < 2.2\n\n"
1404 msg = _("The amend option is unavailable with hg versions < 2.2\n\n"
1404 "Press any key to continue.")
1405 "Press any key to continue.")
1405 elif opts.get('amend') is None:
1406 elif opts.get('amend') is None:
1406 opts['amend'] = True
1407 opts['amend'] = True
1407 msg = ("Amend option is turned on -- committing the currently "
1408 msg = _("Amend option is turned on -- committing the currently "
1408 "selected changes will not create a new changeset, but "
1409 "selected changes will not create a new changeset, but "
1409 "instead update the most recently committed changeset.\n\n"
1410 "instead update the most recently committed changeset.\n\n"
1410 "Press any key to continue.")
1411 "Press any key to continue.")
1411 elif opts.get('amend') is True:
1412 elif opts.get('amend') is True:
1412 opts['amend'] = None
1413 opts['amend'] = None
1413 msg = ("Amend option is turned off -- committing the currently "
1414 msg = _("Amend option is turned off -- committing the currently "
1414 "selected changes will create a new changeset.\n\n"
1415 "selected changes will create a new changeset.\n\n"
1415 "Press any key to continue.")
1416 "Press any key to continue.")
1416 if not test:
1417 if not test:
1417 self.confirmationwindow(msg)
1418 self.confirmationwindow(msg)
1418
1419
General Comments 0
You need to be logged in to leave comments. Login now