From 5db77881da1cc861c0cd6bd426fd7a9931c9e44b Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavelo@centrum.sk>
Date: Sat, 6 Aug 2011 11:39:01 +0200
Subject: Add new translations to the C locale and fluxbox-nls.hh

---
 nls/C/Translation.m | 9 +++++++++
 src/Keys.cc         | 4 ++--
 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
 1 Keys: Error on line
 2 Keys: Failed to merge keytree!_OBSOLETE
 3 Keys: Invalid key/modifier on line
+4 3rd argument is not a command.
+5 Error loading keys file: 
 
 $set 10 #Menu
 
@@ -145,6 +147,11 @@ $set 10 #Menu
 8 Reload Config
 9 Restart
 10 Warning: unbalanced [encoding] tags
+11 Warning: Menu field %s is not a string
+12 Warning: Menu is not a lua table
+13 Loading root menu failed:
+14 Loading window menu failed: 
+15 Unknown menu type: 
 
 $set 11 #Remember
 
@@ -281,4 +288,6 @@ $set 20 #layers
 5 Normal
 6 Top
 
+$set 21 #FbCommands
 
+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)
             } else if(l->isnil(3))
                 k2.reset();
             else {
-		_FB_USES_NLS;
+                _FB_USES_NLS;
                 throw KeyError(_FB_CONSOLETEXT(Keys, Bad3rdArg, "3rd argument is not a command.",
                             "3rd argument is not a command."));
             }
@@ -581,7 +581,7 @@ void Keys::reload() {
         l.call(0, 0);
     }
     catch(std::runtime_error &e) {
-	_FB_USES_NLS;
+        _FB_USES_NLS;
         cerr << _FB_CONSOLETEXT(Keys, LoadError, "Error loading keys file: ",
                 "Actual error message follows") << e.what() << endl;
         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
     lua::stack_sentry s(l, -1);
 
     if(l.type(-1) != lua::TTABLE) {
-	_FB_USES_NLS;
+        _FB_USES_NLS;
         cerr << _FB_CONSOLETEXT(Menu, MenuNotTable, "Warning: Menu is not a lua table",
                         "Menu is not a lua table") << endl;
         return;
-- 
cgit v0.11.2