diff options
Diffstat (limited to 'src/Keys.cc')
-rw-r--r-- | src/Keys.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Keys.cc b/src/Keys.cc index c6276c5..eb51f9a 100644 --- a/src/Keys.cc +++ b/src/Keys.cc | |||
@@ -226,7 +226,7 @@ bool Keys::addBinding(const std::string &linebuffer) { | |||
226 | key = FbTk::KeyUtil::getKey(val[argc].c_str()); | 226 | key = FbTk::KeyUtil::getKey(val[argc].c_str()); |
227 | 227 | ||
228 | if (key == 0) { | 228 | if (key == 0) { |
229 | cerr<<_FBTEXT(Keys, InvalidKeyMod, | 229 | cerr<<_FB_CONSOLETEXT(Keys, InvalidKeyMod, |
230 | "Keys: Invalid key/modifier on line", | 230 | "Keys: Invalid key/modifier on line", |
231 | "A bad key/modifier string was found on line (number following)")<<" "<< | 231 | "A bad key/modifier string was found on line (number following)")<<" "<< |
232 | m_current_line<<"): "<<linebuffer<<endl; | 232 | m_current_line<<"): "<<linebuffer<<endl; |
@@ -244,7 +244,7 @@ bool Keys::addBinding(const std::string &linebuffer) { | |||
244 | 244 | ||
245 | } else { // parse command line | 245 | } else { // parse command line |
246 | if (last_key == 0) { | 246 | if (last_key == 0) { |
247 | cerr<<_FBTEXT(Keys, BadLine, "Keys: Error on line", "Error on line (number following)")<<": "<<m_current_line<<endl; | 247 | cerr<<_FB_CONSOLETEXT(Keys, BadLine, "Keys: Error on line", "Error on line (number following)")<<": "<<m_current_line<<endl; |
248 | cerr<<"> "<<linebuffer<<endl; | 248 | cerr<<"> "<<linebuffer<<endl; |
249 | return false; | 249 | return false; |
250 | } | 250 | } |
@@ -253,7 +253,7 @@ bool Keys::addBinding(const std::string &linebuffer) { | |||
253 | FbTk::StringUtil::strcasestr(linebuffer.c_str(), | 253 | FbTk::StringUtil::strcasestr(linebuffer.c_str(), |
254 | val[argc].c_str() + 1); // +1 to skip ':' | 254 | val[argc].c_str() + 1); // +1 to skip ':' |
255 | if (str == 0) { | 255 | if (str == 0) { |
256 | cerr<<_FBTEXT(Keys, BadLine, "Keys: Error on line", "Error on line (number following)")<<": "<<m_current_line<<endl; | 256 | cerr<<_FB_CONSOLETEXT(Keys, BadLine, "Keys: Error on line", "Error on line (number following)")<<": "<<m_current_line<<endl; |
257 | cerr<<"> "<<linebuffer<<endl; | 257 | cerr<<"> "<<linebuffer<<endl; |
258 | ret_val = false; | 258 | ret_val = false; |
259 | } else { | 259 | } else { |
@@ -261,14 +261,14 @@ bool Keys::addBinding(const std::string &linebuffer) { | |||
261 | last_key->m_command = CommandParser::instance().parseLine(str); | 261 | last_key->m_command = CommandParser::instance().parseLine(str); |
262 | 262 | ||
263 | if (*last_key->m_command == 0) { | 263 | if (*last_key->m_command == 0) { |
264 | cerr<<_FBTEXT(Keys, BadLine, "Keys: Error on line", "Error on line (number following)")<<": "<<m_current_line<<endl; | 264 | cerr<<_FB_CONSOLETEXT(Keys, BadLine, "Keys: Error on line", "Error on line (number following)")<<": "<<m_current_line<<endl; |
265 | cerr<<"> "<<linebuffer<<endl; | 265 | cerr<<"> "<<linebuffer<<endl; |
266 | } else { | 266 | } else { |
267 | // need to change keymode here so it doesn't get changed by CommandParser | 267 | // need to change keymode here so it doesn't get changed by CommandParser |
268 | m_keylist = m_map[keyMode]; | 268 | m_keylist = m_map[keyMode]; |
269 | // Add the keychain to list | 269 | // Add the keychain to list |
270 | if (!mergeTree(current_key)) { | 270 | if (!mergeTree(current_key)) { |
271 | cerr<<_FBTEXT(Keys, BadMerge, "Keys: Failed to merge keytree!", "relatively technical error message. Key bindings are stored in a tree structure")<<endl; | 271 | cerr<<_FB_CONSOLETEXT(Keys, BadMerge, "Keys: Failed to merge keytree!", "relatively technical error message. Key bindings are stored in a tree structure")<<endl; |
272 | ret_val = false; | 272 | ret_val = false; |
273 | } | 273 | } |
274 | } | 274 | } |