diff options
-rw-r--r-- | nls/C/Translation.m | 9 | ||||
-rw-r--r-- | src/Keys.cc | 4 | ||||
-rw-r--r-- | src/MenuCreator.cc | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/nls/C/Translation.m b/nls/C/Translation.m index 4dcb17a..8d4c46f 100644 --- a/nls/C/Translation.m +++ b/nls/C/Translation.m | |||
@@ -132,6 +132,8 @@ $set 9 #Keys | |||
132 | 1 Keys: Error on line | 132 | 1 Keys: Error on line |
133 | 2 Keys: Failed to merge keytree!_OBSOLETE | 133 | 2 Keys: Failed to merge keytree!_OBSOLETE |
134 | 3 Keys: Invalid key/modifier on line | 134 | 3 Keys: Invalid key/modifier on line |
135 | 4 3rd argument is not a command. | ||
136 | 5 Error loading keys file: | ||
135 | 137 | ||
136 | $set 10 #Menu | 138 | $set 10 #Menu |
137 | 139 | ||
@@ -145,6 +147,11 @@ $set 10 #Menu | |||
145 | 8 Reload Config | 147 | 8 Reload Config |
146 | 9 Restart | 148 | 9 Restart |
147 | 10 Warning: unbalanced [encoding] tags | 149 | 10 Warning: unbalanced [encoding] tags |
150 | 11 Warning: Menu field %s is not a string | ||
151 | 12 Warning: Menu is not a lua table | ||
152 | 13 Loading root menu failed: | ||
153 | 14 Loading window menu failed: | ||
154 | 15 Unknown menu type: | ||
148 | 155 | ||
149 | $set 11 #Remember | 156 | $set 11 #Remember |
150 | 157 | ||
@@ -281,4 +288,6 @@ $set 20 #layers | |||
281 | 5 Normal | 288 | 5 Normal |
282 | 6 Top | 289 | 6 Top |
283 | 290 | ||
291 | $set 21 #FbCommands | ||
284 | 292 | ||
293 | 1 Failed to load menu file '%s': %s | ||
diff --git a/src/Keys.cc b/src/Keys.cc index fcf8150..2c5f46c 100644 --- a/src/Keys.cc +++ b/src/Keys.cc | |||
@@ -223,7 +223,7 @@ int Keys::t_key::newindex(lua::state *l) | |||
223 | } else if(l->isnil(3)) | 223 | } else if(l->isnil(3)) |
224 | k2.reset(); | 224 | k2.reset(); |
225 | else { | 225 | else { |
226 | _FB_USES_NLS; | 226 | _FB_USES_NLS; |
227 | throw KeyError(_FB_CONSOLETEXT(Keys, Bad3rdArg, "3rd argument is not a command.", | 227 | throw KeyError(_FB_CONSOLETEXT(Keys, Bad3rdArg, "3rd argument is not a command.", |
228 | "3rd argument is not a command.")); | 228 | "3rd argument is not a command.")); |
229 | } | 229 | } |
@@ -581,7 +581,7 @@ void Keys::reload() { | |||
581 | l.call(0, 0); | 581 | l.call(0, 0); |
582 | } | 582 | } |
583 | catch(std::runtime_error &e) { | 583 | catch(std::runtime_error &e) { |
584 | _FB_USES_NLS; | 584 | _FB_USES_NLS; |
585 | cerr << _FB_CONSOLETEXT(Keys, LoadError, "Error loading keys file: ", | 585 | cerr << _FB_CONSOLETEXT(Keys, LoadError, "Error loading keys file: ", |
586 | "Actual error message follows") << e.what() << endl; | 586 | "Actual error message follows") << e.what() << endl; |
587 | loadDefaults(l); | 587 | loadDefaults(l); |
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc index 0b0baf7..56b90c0 100644 --- a/src/MenuCreator.cc +++ b/src/MenuCreator.cc | |||
@@ -319,7 +319,7 @@ MenuCreator::createMenu(FbTk::Menu &inject_into, lua::state &l, FbTk::AutoReload | |||
319 | lua::stack_sentry s(l, -1); | 319 | lua::stack_sentry s(l, -1); |
320 | 320 | ||
321 | if(l.type(-1) != lua::TTABLE) { | 321 | if(l.type(-1) != lua::TTABLE) { |
322 | _FB_USES_NLS; | 322 | _FB_USES_NLS; |
323 | cerr << _FB_CONSOLETEXT(Menu, MenuNotTable, "Warning: Menu is not a lua table", | 323 | cerr << _FB_CONSOLETEXT(Menu, MenuNotTable, "Warning: Menu is not a lua table", |
324 | "Menu is not a lua table") << endl; | 324 | "Menu is not a lua table") << endl; |
325 | return; | 325 | return; |