V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 1c4015d359 - Show all commits

View File

@ -92,7 +92,7 @@ class Ui_settingsDialog(object):
self.languageComboBox.addItem(_fromUtf8("")) self.languageComboBox.addItem(_fromUtf8(""))
self.languageComboBox.setItemText(4, _fromUtf8("Deutsch")) self.languageComboBox.setItemText(4, _fromUtf8("Deutsch"))
self.languageComboBox.addItem(_fromUtf8("")) self.languageComboBox.addItem(_fromUtf8(""))
self.languageComboBox.setItemText(5, _fromUtf8("Españl")) self.languageComboBox.setItemText(5, _fromUtf8("Español"))
self.languageComboBox.addItem(_fromUtf8("")) self.languageComboBox.addItem(_fromUtf8(""))
self.languageComboBox.setItemText(6, _fromUtf8("русский")) self.languageComboBox.setItemText(6, _fromUtf8("русский"))
self.languageComboBox.addItem(_fromUtf8("")) self.languageComboBox.addItem(_fromUtf8(""))

View File

@ -153,7 +153,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string notr="true" comment="es">Españl</string> <string notr="true" comment="es">Español</string>
</property> </property>
</item> </item>
<item> <item>