diff options
| author | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
|---|---|---|
| committer | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
| commit | e169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch) | |
| tree | ae9e92c7e885791c7f47645184070cbcd441ab94 /nls/en_US/Translation.m | |
| parent | c82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff) | |
| parent | 91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff) | |
| download | fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2 | |
Merge branch 'master' into to_push
Diffstat (limited to 'nls/en_US/Translation.m')
| -rw-r--r-- | nls/en_US/Translation.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nls/en_US/Translation.m b/nls/en_US/Translation.m index 49d3e4e..16a8bb7 100644 --- a/nls/en_US/Translation.m +++ b/nls/en_US/Translation.m | |||
| @@ -170,7 +170,7 @@ $set 13 #Slit | |||
| 170 | 1 Clients | 170 | 1 Clients |
| 171 | 2 Cycle Down | 171 | 2 Cycle Down |
| 172 | 3 Cycle Up | 172 | 3 Cycle Up |
| 173 | 4 Slit Direction | 173 | 4 Slit Direction: |
| 174 | 5 Slit Layer | 174 | 5 Slit Layer |
| 175 | 6 Slit on Head | 175 | 6 Slit on Head |
| 176 | 7 Slit Placement | 176 | 7 Slit Placement |
| @@ -258,6 +258,7 @@ Website: http://www.fluxbox.org/\n\n\ | |||
| 258 | -rc <string>\t\t\tuse alternate resource file.\n\ | 258 | -rc <string>\t\t\tuse alternate resource file.\n\ |
| 259 | -version\t\t\tdisplay version and exit.\n\ | 259 | -version\t\t\tdisplay version and exit.\n\ |
| 260 | -info\t\t\t\tdisplay some useful information.\n\ | 260 | -info\t\t\t\tdisplay some useful information.\n\ |
| 261 | -list-commands\t\t\tlist all valid key commands.\n\ | ||
| 261 | -log <filename>\t\t\tlog output to file.\n\ | 262 | -log <filename>\t\t\tlog output to file.\n\ |
| 262 | -help\t\t\t\tdisplay this help text and exit.\n\n | 263 | -help\t\t\t\tdisplay this help text and exit.\n\n |
| 263 | 14 warning: couldn't set environment variable 'DISPLAY' | 264 | 14 warning: couldn't set environment variable 'DISPLAY' |