Skip to content

Commit

Permalink
remove trailing whitespace (vimperator#638)
Browse files Browse the repository at this point in the history
  • Loading branch information
lazysoundsystem authored and timss committed Nov 7, 2016
1 parent 6ac98f1 commit b9c1f0d
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 38 deletions.
18 changes: 9 additions & 9 deletions License.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
4 changes: 2 additions & 2 deletions common/content/help.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
<xsl:apply-templates select="@*"/>
<div style="clear: both;"/>
<span liberator:highlight="HelpNote">Note:</span>
<xsl:text> </xsl:text>
<xsl:text> </xsl:text>
<xsl:apply-templates select="node()"/>
</p>
</xsl:template>
Expand All @@ -337,7 +337,7 @@
<xsl:apply-templates select="@*"/>
<div style="clear: both;"/>
<span liberator:highlight="HelpWarning">Warning:</span>
<xsl:text> </xsl:text>
<xsl:text> </xsl:text>
<xsl:apply-templates select="node()"/>
</p>
</xsl:template>
Expand Down
4 changes: 2 additions & 2 deletions common/content/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const History = Module("history", {

commands.add(["hist[ory]", "hs"],
"Show recently visited URLs",
function (args) {
function (args) {
if (args["-remove"]) {
let items = completion.runCompleter("history", args.join(" "), args["-max"] || 1000);
if (items.length == 0)
Expand All @@ -203,7 +203,7 @@ const History = Module("history", {
else
liberator.echo("Removed " + urls.length + " history items matching " + args.join(" "));
}
} else
} else
history.list(args.join(" "), args.bang, args["-max"] || 1000);
}, {
bang: true,
Expand Down
2 changes: 1 addition & 1 deletion common/content/liberator-overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
let prefix = [BASE];

Components.utils.import("resource://liberator/template-tag.js", modules);

// TODO: This list is much too long, we should try to minimize
// the number of required components for easier porting to new applications
["base.js",
Expand Down
2 changes: 1 addition & 1 deletion common/locale/ja/hints.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
たいていの場合、移動先をひとつ選ぶには文字をいくつか打ち込んで候補を絞り込んでから、
数字をひとつ指定するというふたつのテクニックを組み合わせるのが便利です。
<k name="Leader"/> ( 初期設定は <ex>:let mapleader = "\"</ex> ) を押すことでエスケープモードへ切り替わり、
数字をテキストとして認識させることができます。
数字をテキストとして認識させることができます。
<k name="Esc"/> でこのモードをいつでも中止することができます。
</p>
</description>
Expand Down
2 changes: 1 addition & 1 deletion common/locale/ja/options.xml
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@
現在の単語がマッチしない場合、次の単語の最初からマッチがなされます。
単語はリンクに現れる順番でマッチされます。
入力された文字列が空白を含む場合、文字列は空白で区切られます。
これらの文字列は最初の単語からマッチしていき、リンクに現れる順に単語がマッチしていきます。
これらの文字列は最初の単語からマッチしていき、リンクに現れる順に単語がマッチしていきます。
</dd>
<dt>firstletters</dt>
<dd>
Expand Down
4 changes: 2 additions & 2 deletions muttator/content/mail.js
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ const Mail = Module("mail", {
reverse ? (i >= 0) : (i < gDBView.rowCount);
reverse ? i-- : i++) {
let key = gDBView.getKeyAt(i);
let folder = gDBView.getFolderForViewIndex(i);
let folder = gDBView.getFolderForViewIndex(i);
let msg = folder.msgDatabase.GetMsgHdrForKey(key);

// a closed thread
Expand Down Expand Up @@ -482,7 +482,7 @@ const Mail = Module("mail", {
let tabmail = document.getElementById("tabmail");

if (!(targets instanceof Array))
targets = [targets];
targets = [targets];

if (!params)
params = {};
Expand Down
6 changes: 3 additions & 3 deletions muttator/locale/en-US/intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ hitting the back button in the toolbar.
its command line interface more consistent and easier to use, while still
being a powerful extension for advanced users.
</p>

<p>
But &liberator.appname; is more than just a simple command interface to &liberator.host; — it is a
complete development environment as well. If you are a web developer, you can
Expand All @@ -52,7 +52,7 @@ hitting the back button in the toolbar.
Stubenschrott</link> but has found many other
<link topic="http://vimperator-labs.googlecode.com/hg/muttator/AUTHORS/">invaluable contributors</link>
who helped out fixing bugs and adding new features.

If you appreciate the work on &liberator.appname; and want to
encourage us working on it more, you can send us greetings, patches, or
donations:
Expand All @@ -76,7 +76,7 @@ hitting the back button in the toolbar.
documentation available yet. However, the <link
topic="tutorial">Tutorial</link> should provide some basic information
to help you get up and running for now.
</p>
</p>

<p> Please also note that navigation in this help screen is quite limited yet -
<em>using the links within the help system will not always work</em> as
Expand Down
8 changes: 4 additions & 4 deletions muttator/locale/en-US/tutorial.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@

<p>
&liberator.appname;'s power, like Vim's, comes from it's modal interface. Keys have
different meanings depending on which mode &liberator.host; is in. &liberator.appname; has four basic modes:
different meanings depending on which mode &liberator.host; is in. &liberator.appname; has four basic modes:
Normal mode and Message mode when viewing messages and Insert mode as well as Compose mode when writing a new message.
</p>

<p>You can always use <ex>:usage</ex> for a quick reference
<p>You can always use <ex>:usage</ex> for a quick reference
about available mappings, commands and options. When in Message mode
(activated by <k>m</k>), most mappings from Vimperator are also available.</p>

Expand All @@ -57,7 +57,7 @@ about available mappings, commands and options. When in Message mode
There you can use <k>h</k>, <k>j</k>, <k>k</k>, <k>l</k> etc. to navigate the message body.
You can also press <k>f</k> to start hinting mode (which works similar to Vimperator).
Pressing <k>Esc</k> brings you back to Normal mode.
</p>
</p>

<p>
When opening up the compose window (i.e. for writing a new message, triggered by <k>c</k> or <ex>:compose</ex>),
Expand Down Expand Up @@ -189,7 +189,7 @@ about available mappings, commands and options. When in Message mode

<p>
The most common hint mode is called <t>quick-hints</t>.
To activate QuickHint mode, press <k>f</k>.
To activate QuickHint mode, press <k>f</k>.
</p>

<h2 tag="quitting-without-menus">Find the exit nearest you</h2>
Expand Down
2 changes: 1 addition & 1 deletion vimperator/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
* Expose Command constructor

2016-01-26:
* QuickMarks: new mapping [m]gw{a-z}[m] to open Quickmark in a new window as the single open tab
* QuickMarks: new mapping [m]gw{a-z}[m] to open Quickmark in a new window as the single open tab
* :delmacro matches the syntax and behaviour of :delqmark, e.g. allowing ranges as argument
* Stop propagation for keyboard event if that key are contained in -except option on :ignorekeys
* Improvements in handling Esc for unfocusing text fields
Expand Down
2 changes: 1 addition & 1 deletion vimperator/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ FEATURES:
8 use the storage module for autocommands
8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
8 all search commands should start searching from the top of the visible viewport
8 :bmark -keyword wikpedia http://en.wikipedia.org/wiki/Special:Search?search=%s
8 :bmark -keyword wikpedia http://en.wikipedia.org/wiki/Special:Search?search=%s
should overwrite existing keywords. This allows saving of quick searches in the RC file.
8 <C-o>/<C-i> should work as in vim (i.e., save page positions as well as
locations in the history list).
Expand Down
4 changes: 2 additions & 2 deletions vimperator/locale/en-US/intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ toolbar.
its command line interface more consistent and easier to use, while still
being a powerful extension for advanced users.
</p>

<p>
But &liberator.appname; is more than just a simple command interface to Firefox — it is a
complete development environment as well. If you are a web developer, you can
Expand All @@ -54,7 +54,7 @@ toolbar.
Stubenschrott</link> but has found many other
<link topic="http://vimperator-labs.googlecode.com/hg/vimperator/AUTHORS/">invaluable contributors</link>
who helped out fixing bugs and adding new features.

If you appreciate the work on &liberator.appname; and want to
encourage us working on it more, you can send us greetings, patches, or
donations:
Expand Down
2 changes: 1 addition & 1 deletion vimperator/locale/en-US/tabs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
Move the current tab to a group named <a>groupName</a>.
</p>
<p>
If the group does not exist, you can use <oa>!</oa>
If the group does not exist, you can use <oa>!</oa>
to automatically create a new group named <a>groupName</a> and
move the tab there.
</p>
Expand Down
4 changes: 2 additions & 2 deletions vimperator/locale/ja/intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
これは、新しいグラフィカルな機能だけでなく高速なコンピュータを使うことを意味します。
その上、上級講座のパワフルなアドオンでありながら、より矛盾なく容易にコマンドラインインターフェイスを使用できるように細心の注意が払われています。
</p>

<p>
しかし、Vimperator は単なる Firefox のコマンドインターフェイスではなく、完全な開発環境でもあります。
あなたが Web 開発者であれば、補完機能をもったインタラクティブな JavaScript Shell を満喫できるでしょう。
Expand All @@ -45,7 +45,7 @@
<tags>author donaton sponsor</tags>
<strut/>
<p>
&liberator.appname; は <link topic="mailto:[email protected]">Martin Stubenschrott</link>
&liberator.appname; は <link topic="mailto:[email protected]">Martin Stubenschrott</link>
により開発が始まり、今では多くの<link topic="http://vimperator.org/trac/wiki/&liberator.appname;/Authors">貢献者</link>
によって開発されています。
&liberator.appname; をいいな、開発を応援したいなと思ってくれた方はぜひはげましのおたよりやパッチ、寄付を送ってください。
Expand Down
12 changes: 6 additions & 6 deletions vimperator/locale/ja/tutorial.xml
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,14 @@

<p>
テキストリンクにはさらにショートカットがあります。
リンクに含まれる一部のテキストを入力することで &liberator.appname;
リンクに含まれる一部のテキストを入力することで &liberator.appname;
はすべてのリンクを検索してマッチするリンクを見つけ出し、一覧を絞り込むことができます。
あなたが入力したテキストによって与えられたリンクがひとつに絞られると、 &liberator.appname;
あなたが入力したテキストによって与えられたリンクがひとつに絞られると、 &liberator.appname;
はそれ以上のユーザの入力なしで直ちにリンクを辿ります。
</p>

<p>
目的のリンクを選択するためにどちらの方法を選んだとしても、 &liberator.appname;
目的のリンクを選択するためにどちらの方法を選んだとしても、 &liberator.appname;
があなたが辿りたいリンクを強調表示したら、単に <k name="Enter"/> を入力することで開くことができます。
</p>

Expand All @@ -194,7 +194,7 @@
<k>f</k> もしくは <k>F</k> でクイックヒントモードを開始して現在見えているリンクをすべて強調表示させてください。
それからリンクのテキストを入力してください。
リンクはすぐにひとつに絞られ、 &liberator.appname; がそれを開くでしょう。
その操作を行う前に、ここに戻ってくるためには <k name="C-o"/> (<em>履歴を戻る</em>) もしくは <k>d</k> (<em>バッファを閉じる</em>)
その操作を行う前に、ここに戻ってくるためには <k name="C-o"/> (<em>履歴を戻る</em>) もしくは <k>d</k> (<em>バッファを閉じる</em>)
を使うということを覚えておいてください ( どちらを使うかはクイックヒントモードを起動するために使ったキーによって異なります ) 。
</p>

Expand Down Expand Up @@ -276,10 +276,10 @@

<p>
ここから先は遠慮することなくいろいろと試してみてください。
もし <ex>:tabopen</ex> コマンドを使うなら、このページに戻ってくるには <k>gt</k>/<k>gT</k>
もし <ex>:tabopen</ex> コマンドを使うなら、このページに戻ってくるには <k>gt</k>/<k>gT</k>
というキーマッピングを使うことを覚えておいてください。
また、もし <ex>:open</ex> コマンドを使うなら、戻ってくるには履歴用のキー ( 例: <k>H</k> ) を使ってください。
もしも現在どこにいるかわからなくなってしまったら、戻ってくるために
もしも現在どこにいるかわからなくなってしまったら、戻ってくるために
<ex>:help<k name="CR"/></ex> と入力して <em>Tutorial</em> のリンクをクリックしてください。
</p>

Expand Down

0 comments on commit b9c1f0d

Please sign in to comment.