Merge pull request #490 from bitnukl/master

German translation update and main window resize
This commit is contained in:
Jonathan Warren 2013-09-07 15:24:48 -07:00
commit 4c4dc6d7d0
3 changed files with 4 additions and 4 deletions

View File

@ -26,7 +26,7 @@ except AttributeError:
class Ui_MainWindow(object): class Ui_MainWindow(object):
def setupUi(self, MainWindow): def setupUi(self, MainWindow):
MainWindow.setObjectName(_fromUtf8("MainWindow")) MainWindow.setObjectName(_fromUtf8("MainWindow"))
MainWindow.resize(795, 580) MainWindow.resize(885, 580)
icon = QtGui.QIcon() icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
MainWindow.setWindowIcon(icon) MainWindow.setWindowIcon(icon)

Binary file not shown.

View File

@ -17,7 +17,7 @@
<message> <message>
<location filename="../bitmessageqt/__init__.py" line="165"/> <location filename="../bitmessageqt/__init__.py" line="165"/>
<source>Add sender to your Address Book</source> <source>Add sender to your Address Book</source>
<translation>Absender zum Adressbuch hinzufügen.</translation> <translation>Absender zum Adressbuch hinzufügen</translation>
</message> </message>
<message> <message>
<location filename="../bitmessageqt/__init__.py" line="269"/> <location filename="../bitmessageqt/__init__.py" line="269"/>
@ -920,7 +920,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location filename="../bitmessageqt/bitmessageui.py" line="623"/> <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
<source>Ctrl+Q</source> <source>Ctrl+Q</source>
<translation type="unfinished">Strg+Q</translation> <translation>Strg+Q</translation>
</message> </message>
<message> <message>
<location filename="../bitmessageqt/bitmessageui.py" line="625"/> <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
@ -1487,7 +1487,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
<message> <message>
<location filename="../bitmessageqt/settings.py" line="343"/> <location filename="../bitmessageqt/settings.py" line="343"/>
<source>Override automatic language localization (use countycode or language code, e.g. &apos;en_US&apos; or &apos;en&apos;):</source> <source>Override automatic language localization (use countycode or language code, e.g. &apos;en_US&apos; or &apos;en&apos;):</source>
<translation type="unfinished"></translation> <translation>Automatische Sprachauswahl überschreiben (verwenden Sie den Landescode oder Sprachcode, z.B. &quot;de_DE&quot; oder &quot;de&quot;):</translation>
</message> </message>
</context> </context>
</TS> </TS>