Skip to content

Commit 6b98ff1

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 2849b05 + f57601a commit 6b98ff1

6 files changed

Lines changed: 66 additions & 66 deletions

File tree

channels/i3/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ This document will show how to use Alter Linux i3 Edition.
33
このドキュメントでは、Alter Linux i3エディションの使い方を紹介します。
44

55
1. [日本語](#目次)
6-
1. [English](#Table-of-Contents)
6+
1. [English](#table-of-contents)
77

88
---
99
## 目次

channels/i3/airootfs.any/etc/skel/.config/conky/conky-jp.conf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ conky.config = {
3636
}
3737

3838
conky.text = [[
39-
${color0}ターミナルを開く ${color1} : ${color2}mod+Enter
40-
${color0}アクティブウィンドウを閉じる ${color1} : ${color2}mod+Shift+Q
41-
42-
${color0}アクティブウィンドウの変更 ${color1} : ${color2}mod+Shift+←↓↑→
43-
${color0}ワークスペースの変更 ${color1} : ${color2}mod+(0~9)
44-
${color0}ウィンドウを他のワークスペースへ移動 ${color1} : ${color2}mod+Shift+(0~9)
45-
${color0}リサイズモード ${color1} : ${color2}mod+R
46-
47-
${color0}ランチャーの表示 ${color1} : ${color2}mod+D
48-
${color0}ファイルマネージャ ${color1} : ${color2}mod+Shift+F
49-
${color0}テーママネージャ ${color1} : ${color2}mod+Shift+S
50-
${color0}システム設定マネージャ ${color1} : ${color2}mod+B
51-
${color0}電源メニュー ${color1} : ${color2}mod+Shift+E
52-
53-
${color0}ヘルプの表示 ${color1} : ${color2}mod+Shift+H
54-
${color0}画面のロック ${color1} : ${color2}mod+Esc
39+
${color0}ターミナルを開く ${color1} : ${color2}mod + Enter
40+
${color0}アクティブウィンドウを閉じる ${color1} : ${color2}mod + Shift + Q
41+
42+
${color0}アクティブウィンドウの変更 ${color1} : ${color2}mod + Shift + ( ← ↓ ↑ → )
43+
${color0}ワークスペースの変更 ${color1} : ${color2}mod + (0~9)
44+
${color0}ウィンドウを他のワークスペースへ移動 ${color1} : ${color2}mod + Shift + (0~9)
45+
${color0}リサイズモード ${color1} : ${color2}mod + R
46+
47+
${color0}ランチャーの表示 ${color1} : ${color2}mod + D
48+
${color0}ファイルマネージャ ${color1} : ${color2}mod + Shift + F
49+
${color0}テーママネージャ ${color1} : ${color2}mod + Shift + S
50+
${color0}システム設定マネージャ ${color1} : ${color2}mod + B
51+
${color0}電源メニュー ${color1} : ${color2}mod + Shift + E
52+
53+
${color0}ヘルプの表示 ${color1} : ${color2}mod + Shift + H
54+
${color0}画面のロック ${color1} : ${color2}mod + Esc
5555
]]

channels/i3/airootfs.any/etc/skel/.config/conky/conky-live-jp.conf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ conky.config = {
3636
}
3737

3838
conky.text = [[
39-
${color0}ターミナルを開く ${color1} : ${color2}mod+Enter
40-
${color0}アクティブウィンドウを閉じる ${color1} : ${color2}mod+Shift+Q
41-
42-
${color0}アクティブウィンドウの変更 ${color1} : ${color2}mod+Shift+←↓↑→
43-
${color0}ワークスペースの変更 ${color1} : ${color2}mod+(0~9)
44-
${color0}ウィンドウを他のワークスペースへ移動 ${color1} : ${color2}mod+Shift+(0~9)
45-
${color0}リサイズモード ${color1} : ${color2}mod+R
46-
47-
${color0}ランチャーの表示 ${color1} : ${color2}mod+D
48-
${color0}ファイルマネージャ ${color1} : ${color2}mod+Shift+F
49-
${color0}テーママネージャ ${color1} : ${color2}mod+Shift+S
50-
${color0}システム設定マネージャ ${color1} : ${color2}mod+B
51-
${color0}電源メニュー ${color1} : ${color2}mod+Shift+E
52-
53-
${color0}ヘルプの表示 ${color1} : ${color2}mod+Shift+H
54-
${color0}Alter Linuxをインストールする ${color1} : ${color2}mod+I
39+
${color0}ターミナルを開く ${color1} : ${color2}mod + Enter
40+
${color0}アクティブウィンドウを閉じる ${color1} : ${color2}mod + Shift + Q
41+
42+
${color0}アクティブウィンドウの変更 ${color1} : ${color2}mod + Shift + ( ← ↓ ↑ → )
43+
${color0}ワークスペースの変更 ${color1} : ${color2}mod + (0~9)
44+
${color0}ウィンドウを他のワークスペースへ移動 ${color1} : ${color2}mod + Shift + (0~9)
45+
${color0}リサイズモード ${color1} : ${color2}mod + R
46+
47+
${color0}ランチャーの表示 ${color1} : ${color2}mod + D
48+
${color0}ファイルマネージャ ${color1} : ${color2}mod + Shift + F
49+
${color0}テーママネージャ ${color1} : ${color2}mod + Shift + S
50+
${color0}システム設定マネージャ ${color1} : ${color2}mod + B
51+
${color0}電源メニュー ${color1} : ${color2}mod + Shift + E
52+
53+
${color0}ヘルプの表示 ${color1} : ${color2}mod + Shift + H
54+
${color0}Alter Linuxをインストールする ${color1} : ${color2}mod + I
5555
]]

channels/i3/airootfs.any/etc/skel/.config/conky/conky-live.conf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ conky.config = {
3636
}
3737

3838
conky.text = [[
39-
${color0}Open terminal ${color1} : ${color2}mod+Enter
40-
${color0}Kill active window ${color1} : ${color2}mod+Shift+Q
41-
42-
${color0}Change active window${color1} : ${color2}mod+←↓↑→
43-
${color0}Change workspace ${color1} : ${color2}mod+(0~9)
44-
${color0}Send active window ${color1} : ${color2}mod+Shift+(0~9)
45-
${color0}Resize mode ${color1} : ${color2}mod+R
46-
47-
${color0}Software launcher ${color1} : ${color2}mod+D
48-
${color0}File manager ${color1} : ${color2}mod+Shift+F
49-
${color0}Theme setting ${color1} : ${color2}mod+Shift+S
50-
${color0}System setting ${color1} : ${color2}mod+B
51-
${color0}Power menu ${color1} : ${color2}mod+Shift+E
52-
53-
${color0}Show help document ${color1} : ${color2}mod+Shift+H
54-
${color0}Install Alter Linux ${color1} : ${color2}mod+I
39+
${color0}Open terminal ${color1} : ${color2}mod + Enter
40+
${color0}Kill active window ${color1} : ${color2}mod + Shift + Q
41+
42+
${color0}Change active window${color1} : ${color2}mod + ( ← ↓ ↑ → )
43+
${color0}Change workspace ${color1} : ${color2}mod + (0~9)
44+
${color0}Send active window ${color1} : ${color2}mod + Shift + (0~9)
45+
${color0}Resize mode ${color1} : ${color2}mod + R
46+
47+
${color0}Software launcher ${color1} : ${color2}mod + D
48+
${color0}File manager ${color1} : ${color2}mod + Shift + F
49+
${color0}Theme setting ${color1} : ${color2}mod + Shift + S
50+
${color0}System setting ${color1} : ${color2}mod + B
51+
${color0}Power menu ${color1} : ${color2}mod + Shift + E
52+
53+
${color0}Show help document ${color1} : ${color2}mod + Shift + H
54+
${color0}Install Alter Linux ${color1} : ${color2}mod + I
5555
]]

channels/i3/airootfs.any/etc/skel/.config/conky/conky.conf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ conky.config = {
3636
}
3737

3838
conky.text = [[
39-
${color0}Open terminal ${color1} : ${color2}mod+Enter
40-
${color0}Kill active window ${color1} : ${color2}mod+Shift+Q
41-
42-
${color0}Change active window${color1} : ${color2}mod+←↓↑→
43-
${color0}Change workspace ${color1} : ${color2}mod+(0~9)
44-
${color0}Send active window ${color1} : ${color2}mod+Shift+(0~9)
45-
${color0}Resize mode ${color1} : ${color2}mod+R
46-
47-
${color0}Software launcher ${color1} : ${color2}mod+D
48-
${color0}File manager ${color1} : ${color2}mod+Shift+F
49-
${color0}Theme setting ${color1} : ${color2}mod+Shift+S
50-
${color0}System setting ${color1} : ${color2}mod+B
51-
${color0}Power menu ${color1} : ${color2}mod+Shift+E
52-
53-
${color0}Show help document ${color1} : ${color2}mod+Shift+H
54-
${color0}Lock screen ${color1} : ${color2}mod+Esc
39+
${color0}Open terminal ${color1} : ${color2}mod + Enter
40+
${color0}Kill active window ${color1} : ${color2}mod + Shift + Q
41+
42+
${color0}Change active window${color1} : ${color2}mod + ( ← ↓ ↑ → )
43+
${color0}Change workspace ${color1} : ${color2}mod + (0~9)
44+
${color0}Send active window ${color1} : ${color2}mod + Shift + (0~9)
45+
${color0}Resize mode ${color1} : ${color2}mod + R
46+
47+
${color0}Software launcher ${color1} : ${color2}mod + D
48+
${color0}File manager ${color1} : ${color2}mod + Shift + F
49+
${color0}Theme setting ${color1} : ${color2}mod + Shift + S
50+
${color0}System setting ${color1} : ${color2}mod + B
51+
${color0}Power menu ${color1} : ${color2}mod + Shift + E
52+
53+
${color0}Show help document ${color1} : ${color2}mod + Shift + H
54+
${color0}Lock screen ${color1} : ${color2}mod + Esc
5555
]]

channels/i3/airootfs.any/usr/share/doc/alter-i3/Document.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ <h1 id="thank-you-for-try-alter-linux-i3-edition">Thank you for try Alter Linux
370370
このドキュメントでは、Alter Linux i3エディションの使い方を紹介します。</p>
371371
<ol>
372372
<li><a href="#%E7%9B%AE%E6%AC%A1">日本語</a></li>
373-
<li><a href="#Table-of-Contents">English</a></li>
373+
<li><a href="#table-of-contents">English</a></li>
374374
</ol>
375375
<hr>
376376
<h2 id="%E7%9B%AE%E6%AC%A1">目次</h2>

0 commit comments

Comments
 (0)