gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-07 23:03:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into vimperator-2.1

Browse Source 
Conflicts:
	common/content/completion.js
	common/content/liberator.js
	vimperator/NEWS
This commit is contained in:
Doug Kearns
2009-03-29 11:18:10 +11:00
parent 13da8c4519 264b33b608
commit 374297c5da
57 changed files with 448 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vimperator/locale/en-US/browsing.txt
View File

@@ -51,7 +51,7 @@ Each token is analyzed and in this order:
to set a custom name, you can change it with [c]:dialog searchengines[c].
3. Opened with the default search engine or keyword (specified with the
'defsearch' option) if the first word is no search engine ([c]:open linus
torvalds[c] opens a Google search for linux torvalds).
torvalds[c] opens a Google search for linus torvalds).
4. Passed directly to Firefox in all other cases ([c]:open www.osnews.com,
www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new
background tab).
@@ -169,7 +169,7 @@ ________________________________________________________________________________
section:Navigating[navigating]
|H| |<C-o>| |CTRL-O| |:ba| |:back|
||:[count]ba[ck] [url]|| +
||:[count]ba[ck] [a][url][a]|| +
||:ba[ck]!|| +
||CTRL-o||
________________________________________________________________________________
@@ -180,7 +180,7 @@ ________________________________________________________________________________
|L| |<C-i>| |CTRL-i| |:fo| |:fw| |:forward|
||:[count]fo[rward] [url]|| +
||:[count]fo[rward] [a][url][a]|| +
||:fo[rward]!|| +
||CTRL-i||
________________________________________________________________________________