summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskiidoo <skiidoo@users.sourceforge.net>2008-05-31 10:07:10 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2008-06-11 05:47:02 (GMT)
commitbe3ac3723da5bc5203c68ea3bea597e8a6ba9c8d (patch)
treed9974b7d87ae951e79a2266572240ea4fcf147a9
parenta84fe20c49198c1ef74616e51152a5e1363fab41 (diff)
downloadfluxbox_lack-be3ac3723da5bc5203c68ea3bea597e8a6ba9c8d.zip
fluxbox_lack-be3ac3723da5bc5203c68ea3bea597e8a6ba9c8d.tar.bz2
updated the copyright where it's easily visible: `fluxbox -v` and COPYRIGHT.
nls/translators: typo, plus Translation.m.desc never existed. Never. more consistent keys file comments in fluxbox-update_config.
-rw-r--r--COPYING2
-rw-r--r--nls/translators.txt4
-rw-r--r--src/main.cc4
-rw-r--r--util/fluxbox-update_configs.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/COPYING b/COPYING
index eb0115c..db0fb54 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
1Copyright (c) 2001-2007 Henrik Kinnunen (fluxgen@fluxbox.org) 1Copyright (c) 2001-2008 Henrik Kinnunen (fluxgen@fluxbox.org)
2 2
3Permission is hereby granted, free of charge, to any person obtaining a 3Permission is hereby granted, free of charge, to any person obtaining a
4copy of this software and associated documentation files (the "Software"), 4copy of this software and associated documentation files (the "Software"),
diff --git a/nls/translators.txt b/nls/translators.txt
index ec54cf2..aab4147 100644
--- a/nls/translators.txt
+++ b/nls/translators.txt
@@ -16,9 +16,9 @@ Adding a new translation
16 16
17 17
18 Details regarding the meaning of all of the positions & default values 18 Details regarding the meaning of all of the positions & default values
19 are listed in Translation.m.desc 19 would be listed in Translation.m.desc, if you're kind enough to write it.
20 20
21List of translators contrubutors 21List of translators contributors
22-------------------------------- 22--------------------------------
23 23
24ru_RU: Slava Semushin <php-coder@altlinux.ru> 24ru_RU: Slava Semushin <php-coder@altlinux.ru>
diff --git a/src/main.cc b/src/main.cc
index bc43a93..fb47bc7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -221,7 +221,7 @@ int main(int argc, char **argv) {
221 } 221 }
222 } else if (arg == "-version" || arg == "-v") { 222 } else if (arg == "-version" || arg == "-v") {
223 // print current version string 223 // print current version string
224 cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2007 Fluxbox Team " << endl << endl; 224 cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2008 Fluxbox Team " << endl << endl;
225 exit(EXIT_SUCCESS); 225 exit(EXIT_SUCCESS);
226 } else if (arg == "-log") { 226 } else if (arg == "-log") {
227 if (++i >= argc) { 227 if (++i >= argc) {
@@ -244,7 +244,7 @@ int main(int argc, char **argv) {
244 "-help\t\t\t\tdisplay this help text and exit.\n\n", 244 "-help\t\t\t\tdisplay this help text and exit.\n\n",
245 245
246 "Main usage string. Please lay it out nicely. There is one %s that is given the version").c_str(), 246 "Main usage string. Please lay it out nicely. There is one %s that is given the version").c_str(),
247 __fluxbox_version, "2001-2007"); 247 __fluxbox_version, "2001-2008");
248 exit(EXIT_SUCCESS); 248 exit(EXIT_SUCCESS);
249 } else if (arg == "-info" || arg == "-i") { 249 } else if (arg == "-info" || arg == "-i") {
250 showInfo(cout); 250 showInfo(cout);
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index be22383..365136b 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -282,7 +282,7 @@ int run_updates(int old_version, FbTk::ResourceManager &rm) {
282 string whole_keyfile = read_file(keyfilename); 282 string whole_keyfile = read_file(keyfilename);
283 string new_keyfile = ""; 283 string new_keyfile = "";
284 // let's put our new keybindings first, so they're easy to find 284 // let's put our new keybindings first, so they're easy to find
285 new_keyfile += "# start tabbing windows together\n"; 285 new_keyfile += "!mouse actions added by fluxbox-update_configs\n";
286 new_keyfile += "OnTitlebar Mouse2 :StartTabbing\n\n"; 286 new_keyfile += "OnTitlebar Mouse2 :StartTabbing\n\n";
287 new_keyfile += whole_keyfile; // don't forget user's old keybindings 287 new_keyfile += whole_keyfile; // don't forget user's old keybindings
288 288