src/bitmessageqt/__init__.py

@@ -3262,7 +3262,7 @@ class settingsDialog(QtGui.QDialog):
             shared.safeConfigGetBoolean('bitmessagesettings', 'useidenticons'))
         
         global languages 
-        languages = ['system','en','eo','fr','de','es','ru','en_pirate','other']
+        languages = ['system','en','eo','fr','de','es','ru','no','en_pirate','other']
         user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale'))
         if user_countrycode in languages:
             curr_index = languages.index(user_countrycode)

src/bitmessageqt/settings.py

@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Tue Nov 05 22:56:35 2013
+# Created: Mon Dec 16 00:08:18 2013
-#      by: PyQt4 UI code generator 4.10.2
+#      by: PyQt4 UI code generator 4.10.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -88,6 +88,7 @@ class Ui_settingsDialog(object):
         self.languageComboBox.addItem(_fromUtf8(""))
         self.languageComboBox.addItem(_fromUtf8(""))
         self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
         self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.languageComboBox)
         self.formLayout.setWidget(8, QtGui.QFormLayout.FieldRole, self.groupBox)
         self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
@@ -397,8 +398,9 @@ class Ui_settingsDialog(object):
         self.languageComboBox.setItemText(4, _translate("settingsDialog", "Deutsch", "de"))
         self.languageComboBox.setItemText(5, _translate("settingsDialog", "Españl", "es"))
         self.languageComboBox.setItemText(6, _translate("settingsDialog", "русский язык", "ru"))
-        self.languageComboBox.setItemText(7, _translate("settingsDialog", "Pirate English", "en_pirate"))
+        self.languageComboBox.setItemText(7, _translate("settingsDialog", "norsk", "no"))
-        self.languageComboBox.setItemText(8, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
+        self.languageComboBox.setItemText(8, _translate("settingsDialog", "Pirate English", "en_pirate"))
+        self.languageComboBox.setItemText(9, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
         self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", None))
         self.groupBox1.setTitle(_translate("settingsDialog", "Listening port", None))
         self.label.setText(_translate("settingsDialog", "Listen for connections on port:", None))

src/bitmessageqt/settings.ui

@@ -154,6 +154,11 @@
               <string comment="ru">русский язык</string>
              </property>
             </item>
+            <item>
+             <property name="text">
+              <string comment="no">norsk</string>
+             </property>
+            </item>
             <item>
              <property name="text">
               <string comment="en_pirate">Pirate English</string>