Merge pull request #624 from Atheros1/master

changed the Chinese translation of 'Chinese' to the simplified version
This commit is contained in:
Jonathan Warren 2014-01-20 11:31:33 -08:00
commit 792387214c
2 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'settings.ui' # Form implementation generated from reading ui file 'settings.ui'
# #
# Created: Sun Jan 12 20:21:07 2014 # Created: Mon Jan 20 14:26:31 2014
# by: PyQt4 UI code generator 4.10.3 # by: PyQt4 UI code generator 4.10.3
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -402,7 +402,7 @@ class Ui_settingsDialog(object):
self.languageComboBox.setItemText(6, _translate("settingsDialog", "русский язык", "ru")) self.languageComboBox.setItemText(6, _translate("settingsDialog", "русский язык", "ru"))
self.languageComboBox.setItemText(7, _translate("settingsDialog", "Norsk", "no")) self.languageComboBox.setItemText(7, _translate("settingsDialog", "Norsk", "no"))
self.languageComboBox.setItemText(8, _translate("settingsDialog", "العربية", "ar")) self.languageComboBox.setItemText(8, _translate("settingsDialog", "العربية", "ar"))
self.languageComboBox.setItemText(9, _translate("settingsDialog", "中国的", "zh_cn")) self.languageComboBox.setItemText(9, _translate("settingsDialog", "简体中文", "zh_cn"))
self.languageComboBox.setItemText(10, _translate("settingsDialog", "Pirate English", "en_pirate")) self.languageComboBox.setItemText(10, _translate("settingsDialog", "Pirate English", "en_pirate"))
self.languageComboBox.setItemText(11, _translate("settingsDialog", "Other (set in keys.dat)", "other")) self.languageComboBox.setItemText(11, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", None)) self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", None))

View File

@ -166,7 +166,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string comment="zh_cn">中国的</string> <string comment="zh_cn">简体中文</string>
</property> </property>
</item> </item>
<item> <item>