resolve merge conflictissue_405

1 files changed, 15 insertions, 3 deletions

diff --git a/locale.js b/locale.js
index e12ac03..ecb77fd 100644
--- a/locale.js
+++ b/locale.js
@@ -42,7 +42,7 @@
 
 /*global modules, contains*/
 
-modules.locale = '2014-July-29';
+modules.locale = '2014-December-02';
 
 // Global stuff
 
@@ -209,7 +209,7 @@ SnapTranslator.dict.pt = {
     'translator_e-mail':
         'mmsequeira@gmail.com',
     'last_changed':
-        '2014-07-29'
+        '2014-10-01'
 };
 
 SnapTranslator.dict.cs = {
@@ -281,7 +281,7 @@ SnapTranslator.dict.ru = {
     'translator_e-mail':
         'svetlanap@berkeley.edu',
     'last_changed':
-        '2013-03-19'
+        '2014-09-29'
 };
 
 SnapTranslator.dict.es = {
@@ -415,3 +415,15 @@ SnapTranslator.dict.bn = {
     'last_changed':
         '2014-07-02'
 };
+
+SnapTranslator.dict.kn = {
+    // translations meta information
+    'language_name':
+        '\u0C95\u0CA8\u0CCD\u0CA8\u0CA1',
+    'language_translator':
+        'Vinayakumar R',
+    'translator_e-mail':
+        'vnkmr7620@gmail.com',
+    'last_changed':
+        '2014-12-02'
+};