resolve merge conflictanykey_issue387

1 files changed, 25 insertions, 1 deletions

diff --git a/locale.js b/locale.js
index 2db2e1f..b3c2ce5 100644
--- a/locale.js
+++ b/locale.js
@@ -42,7 +42,7 @@
 
 /*global modules, contains*/
 
-modules.locale = '2014-October-01';
+modules.locale = '2014-December-15';
 
 // Global stuff
 
@@ -392,6 +392,18 @@ SnapTranslator.dict.fi = {
         '2014-04-18'
 };
 
+SnapTranslator.dict.sv = {
+    // meta information
+    'language_name':
+        'svenska',
+    'language_translator':
+        'Erik A. Olsson',
+    'translator_e-mail':
+        'eolsson@gmail.com',
+    'last_changed':
+        '2014-12-14'
+};
+
 SnapTranslator.dict.pt_BR = {
     // meta information
     'language_name':
@@ -415,3 +427,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'
+};