From 7846bf5e403d7d81d99d4fd248e5b6861aedf61a Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Mon, 26 Oct 2009 21:26:14 +0100 Subject: [PATCH] Minor changes to translation strings which got messed up. --- picard/ui/coverartbox.py | 2 +- picard/ui/ui_metadata.py | 258 +++++++++++++++--------------- picard/ui/ui_options_interface.py | 4 +- po/picard.pot | 106 ++++++------ ui/metadata.ui | 58 +++++-- 5 files changed, 232 insertions(+), 196 deletions(-) diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py index 4eb14dbd3..e25520445 100644 --- a/picard/ui/coverartbox.py +++ b/picard/ui/coverartbox.py @@ -44,7 +44,7 @@ class ActiveLabel(QtGui.QLabel): class CoverArtBox(QtGui.QGroupBox): def __init__(self, parent): - QtGui.QGroupBox.__init__(self, _(" ")) + QtGui.QGroupBox.__init__(self, " ") self.layout = QtGui.QVBoxLayout() self.layout.setSpacing(0) self.layout.setContentsMargins (7,7,0,0) diff --git a/picard/ui/ui_metadata.py b/picard/ui/ui_metadata.py index 6238180ad..369056475 100644 --- a/picard/ui/ui_metadata.py +++ b/picard/ui/ui_metadata.py @@ -1,127 +1,131 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'ui\metadata.ui' -# -# Created: Mon Oct 26 04:58:54 2009 -# by: PyQt4 UI code generator 4.5.4 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -class Ui_Form(object): - def setupUi(self, Form): - Form.setObjectName("Form") - Form.resize(343, 120) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth()) - Form.setSizePolicy(sizePolicy) - self.vboxlayout = QtGui.QVBoxLayout(Form) - self.vboxlayout.setSpacing(6) - self.vboxlayout.setMargin(9) - self.vboxlayout.setObjectName("vboxlayout") - self.gridlayout = QtGui.QGridLayout() - self.gridlayout.setMargin(0) - self.gridlayout.setHorizontalSpacing(2) - self.gridlayout.setVerticalSpacing(3) - self.gridlayout.setObjectName("gridlayout") - self.label = QtGui.QLabel(Form) - self.label.setObjectName("label") - self.gridlayout.addWidget(self.label, 0, 0, 1, 1) - self.title = QtGui.QLineEdit(Form) - self.title.setObjectName("title") - self.gridlayout.addWidget(self.title, 0, 1, 1, 7) - self.label_2 = QtGui.QLabel(Form) - self.label_2.setObjectName("label_2") - self.gridlayout.addWidget(self.label_2, 1, 0, 1, 1) - self.artist = QtGui.QLineEdit(Form) - self.artist.setObjectName("artist") - self.gridlayout.addWidget(self.artist, 1, 1, 1, 7) - self.label_3 = QtGui.QLabel(Form) - self.label_3.setObjectName("label_3") - self.gridlayout.addWidget(self.label_3, 2, 0, 1, 1) - self.album = QtGui.QLineEdit(Form) - self.album.setObjectName("album") - self.gridlayout.addWidget(self.album, 2, 1, 1, 7) - self.label_4 = QtGui.QLabel(Form) - self.label_4.setObjectName("label_4") - self.gridlayout.addWidget(self.label_4, 3, 0, 1, 1) - self.tracknumber = QtGui.QLineEdit(Form) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(1) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.tracknumber.sizePolicy().hasHeightForWidth()) - self.tracknumber.setSizePolicy(sizePolicy) - self.tracknumber.setMinimumSize(QtCore.QSize(25, 0)) - self.tracknumber.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.tracknumber.setObjectName("tracknumber") - self.gridlayout.addWidget(self.tracknumber, 3, 1, 1, 1) - self.label_5 = QtGui.QLabel(Form) - self.label_5.setObjectName("label_5") - self.gridlayout.addWidget(self.label_5, 3, 2, 1, 1) - self.length = QtGui.QLineEdit(Form) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(3) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.length.sizePolicy().hasHeightForWidth()) - self.length.setSizePolicy(sizePolicy) - self.length.setMinimumSize(QtCore.QSize(35, 0)) - self.length.setAlignment(QtCore.Qt.AlignCenter) - self.length.setReadOnly(True) - self.length.setObjectName("length") - self.gridlayout.addWidget(self.length, 3, 3, 1, 1) - self.label_6 = QtGui.QLabel(Form) - self.label_6.setObjectName("label_6") - self.gridlayout.addWidget(self.label_6, 3, 4, 1, 1) - self.date = QtGui.QLineEdit(Form) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(5) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.date.sizePolicy().hasHeightForWidth()) - self.date.setSizePolicy(sizePolicy) - self.date.setMinimumSize(QtCore.QSize(65, 0)) - self.date.setAlignment(QtCore.Qt.AlignCenter) - self.date.setObjectName("date") - self.gridlayout.addWidget(self.date, 3, 5, 1, 1) - spacerItem = QtGui.QSpacerItem(4, 20, QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Minimum) - self.gridlayout.addItem(spacerItem, 3, 6, 1, 1) - self.lookup = QtGui.QPushButton(Form) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(10) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lookup.sizePolicy().hasHeightForWidth()) - self.lookup.setSizePolicy(sizePolicy) - self.lookup.setMinimumSize(QtCore.QSize(75, 0)) - self.lookup.setObjectName("lookup") - self.gridlayout.addWidget(self.lookup, 3, 7, 1, 1) - self.vboxlayout.addLayout(self.gridlayout) - spacerItem1 = QtGui.QSpacerItem(20, 0, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.vboxlayout.addItem(spacerItem1) - self.label.setBuddy(self.title) - self.label_2.setBuddy(self.artist) - self.label_3.setBuddy(self.album) - self.label_4.setBuddy(self.tracknumber) - self.label_5.setBuddy(self.length) - self.label_6.setBuddy(self.date) - - self.retranslateUi(Form) - QtCore.QMetaObject.connectSlotsByName(Form) - Form.setTabOrder(self.title, self.artist) - Form.setTabOrder(self.artist, self.album) - Form.setTabOrder(self.album, self.tracknumber) - Form.setTabOrder(self.tracknumber, self.length) - Form.setTabOrder(self.length, self.date) - Form.setTabOrder(self.date, self.lookup) - - def retranslateUi(self, Form): - self.label.setText(_("Title:")) - self.label_2.setText(_("Artist:")) - self.label_3.setText(_("Album:")) - self.label_4.setText(_("Track:")) - self.label_5.setText(_(" Length:")) - self.label_6.setText(_(" Date:")) - self.date.setInputMask(_("0000-00-00; ")) - self.lookup.setText(_("Lookup")) - +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'ui/metadata.ui' +# +# Created: Mon Oct 26 21:12:18 2009 +# by: PyQt4 UI code generator 4.6 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +class Ui_Form(object): + def setupUi(self, Form): + Form.setObjectName("Form") + Form.resize(380, 143) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth()) + Form.setSizePolicy(sizePolicy) + self.vboxlayout = QtGui.QVBoxLayout(Form) + self.vboxlayout.setSpacing(6) + self.vboxlayout.setMargin(9) + self.vboxlayout.setObjectName("vboxlayout") + self.gridlayout = QtGui.QGridLayout() + self.gridlayout.setMargin(0) + self.gridlayout.setHorizontalSpacing(2) + self.gridlayout.setVerticalSpacing(3) + self.gridlayout.setObjectName("gridlayout") + self.label = QtGui.QLabel(Form) + self.label.setObjectName("label") + self.gridlayout.addWidget(self.label, 0, 0, 1, 1) + self.title = QtGui.QLineEdit(Form) + self.title.setObjectName("title") + self.gridlayout.addWidget(self.title, 0, 1, 1, 9) + self.label_2 = QtGui.QLabel(Form) + self.label_2.setObjectName("label_2") + self.gridlayout.addWidget(self.label_2, 1, 0, 1, 1) + self.artist = QtGui.QLineEdit(Form) + self.artist.setObjectName("artist") + self.gridlayout.addWidget(self.artist, 1, 1, 1, 9) + self.label_3 = QtGui.QLabel(Form) + self.label_3.setObjectName("label_3") + self.gridlayout.addWidget(self.label_3, 2, 0, 1, 1) + self.album = QtGui.QLineEdit(Form) + self.album.setObjectName("album") + self.gridlayout.addWidget(self.album, 2, 1, 1, 9) + self.label_4 = QtGui.QLabel(Form) + self.label_4.setObjectName("label_4") + self.gridlayout.addWidget(self.label_4, 3, 0, 1, 1) + self.tracknumber = QtGui.QLineEdit(Form) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(1) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.tracknumber.sizePolicy().hasHeightForWidth()) + self.tracknumber.setSizePolicy(sizePolicy) + self.tracknumber.setMinimumSize(QtCore.QSize(25, 0)) + self.tracknumber.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.tracknumber.setObjectName("tracknumber") + self.gridlayout.addWidget(self.tracknumber, 3, 1, 1, 1) + self.label_5 = QtGui.QLabel(Form) + self.label_5.setObjectName("label_5") + self.gridlayout.addWidget(self.label_5, 3, 3, 1, 1) + self.length = QtGui.QLineEdit(Form) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(3) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.length.sizePolicy().hasHeightForWidth()) + self.length.setSizePolicy(sizePolicy) + self.length.setMinimumSize(QtCore.QSize(35, 0)) + self.length.setAlignment(QtCore.Qt.AlignCenter) + self.length.setReadOnly(True) + self.length.setObjectName("length") + self.gridlayout.addWidget(self.length, 3, 4, 1, 1) + self.label_6 = QtGui.QLabel(Form) + self.label_6.setObjectName("label_6") + self.gridlayout.addWidget(self.label_6, 3, 6, 1, 1) + self.date = QtGui.QLineEdit(Form) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(5) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.date.sizePolicy().hasHeightForWidth()) + self.date.setSizePolicy(sizePolicy) + self.date.setMinimumSize(QtCore.QSize(65, 0)) + self.date.setAlignment(QtCore.Qt.AlignCenter) + self.date.setObjectName("date") + self.gridlayout.addWidget(self.date, 3, 7, 1, 1) + spacerItem = QtGui.QSpacerItem(4, 20, QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Minimum) + self.gridlayout.addItem(spacerItem, 3, 8, 1, 1) + self.lookup = QtGui.QPushButton(Form) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(10) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lookup.sizePolicy().hasHeightForWidth()) + self.lookup.setSizePolicy(sizePolicy) + self.lookup.setMinimumSize(QtCore.QSize(75, 0)) + self.lookup.setObjectName("lookup") + self.gridlayout.addWidget(self.lookup, 3, 9, 1, 1) + spacerItem1 = QtGui.QSpacerItem(4, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + self.gridlayout.addItem(spacerItem1, 3, 2, 1, 1) + spacerItem2 = QtGui.QSpacerItem(4, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + self.gridlayout.addItem(spacerItem2, 3, 5, 1, 1) + self.vboxlayout.addLayout(self.gridlayout) + spacerItem3 = QtGui.QSpacerItem(20, 0, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.vboxlayout.addItem(spacerItem3) + self.label.setBuddy(self.title) + self.label_2.setBuddy(self.artist) + self.label_3.setBuddy(self.album) + self.label_4.setBuddy(self.tracknumber) + self.label_5.setBuddy(self.length) + self.label_6.setBuddy(self.date) + + self.retranslateUi(Form) + QtCore.QMetaObject.connectSlotsByName(Form) + Form.setTabOrder(self.title, self.artist) + Form.setTabOrder(self.artist, self.album) + Form.setTabOrder(self.album, self.tracknumber) + Form.setTabOrder(self.tracknumber, self.length) + Form.setTabOrder(self.length, self.date) + Form.setTabOrder(self.date, self.lookup) + + def retranslateUi(self, Form): + self.label.setText(_("Title:")) + self.label_2.setText(_("Artist:")) + self.label_3.setText(_("Album:")) + self.label_4.setText(_("Track:")) + self.label_5.setText(_("Length:")) + self.label_6.setText(_("Date:")) + self.date.setInputMask(_("0000-00-00; ")) + self.lookup.setText(_("Lookup")) + diff --git a/picard/ui/ui_options_interface.py b/picard/ui/ui_options_interface.py index 75d59e46d..b1bb196cd 100644 --- a/picard/ui/ui_options_interface.py +++ b/picard/ui/ui_options_interface.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'ui/options_interface.ui' # -# Created: Mon Feb 16 19:51:51 2009 -# by: PyQt4 UI code generator 4.4.3 +# Created: Mon Oct 26 21:12:18 2009 +# by: PyQt4 UI code generator 4.6 # # WARNING! All changes made in this file will be lost! diff --git a/po/picard.pot b/po/picard.pot index 07143ba17..2f82ca9c0 100644 --- a/po/picard.pot +++ b/po/picard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n" -"POT-Creation-Date: 2009-10-25 23:48+0100\n" +"POT-Creation-Date: 2009-10-26 21:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1086,146 +1086,154 @@ msgid "Arabic" msgstr "" #: ../picard/const.py:318 -msgid "Catalan" +msgid "Bulgarian" msgstr "" #: ../picard/const.py:319 -msgid "Czech" +msgid "Catalan" msgstr "" #: ../picard/const.py:320 -msgid "Welsh" +msgid "Czech" msgstr "" #: ../picard/const.py:321 -msgid "Danish" +msgid "Welsh" msgstr "" #: ../picard/const.py:322 -msgid "German" +msgid "Danish" msgstr "" #: ../picard/const.py:323 -msgid "English" +msgid "German" msgstr "" #: ../picard/const.py:324 -msgid "English (Canada)" +msgid "English" msgstr "" #: ../picard/const.py:325 -msgid "English (UK)" +msgid "English (Canada)" msgstr "" #: ../picard/const.py:326 -msgid "Spanish" +msgid "English (UK)" msgstr "" #: ../picard/const.py:327 -msgid "Estonian" +msgid "Spanish" msgstr "" #: ../picard/const.py:328 -msgid "Persian" +msgid "Estonian" msgstr "" #: ../picard/const.py:329 -msgid "Finnish" +msgid "Persian" msgstr "" #: ../picard/const.py:330 -msgid "French" +msgid "Finnish" msgstr "" #: ../picard/const.py:331 -msgid "Frisian" +msgid "French" msgstr "" #: ../picard/const.py:332 -msgid "Galician" +msgid "Frisian" msgstr "" #: ../picard/const.py:333 -msgid "Hebrew" +msgid "Galician" msgstr "" #: ../picard/const.py:334 -msgid "Hindi" +msgid "Hebrew" msgstr "" #: ../picard/const.py:335 -msgid "Hungarian" +msgid "Hindi" msgstr "" #: ../picard/const.py:336 -msgid "Islandic" +msgid "Hungarian" msgstr "" #: ../picard/const.py:337 -msgid "Italian" +msgid "Islandic" msgstr "" #: ../picard/const.py:338 -msgid "Kannada" +msgid "Italian" msgstr "" #: ../picard/const.py:339 -msgid "Korean" +msgid "Kannada" msgstr "" #: ../picard/const.py:340 -msgid "Lithuanian" +msgid "Korean" msgstr "" #: ../picard/const.py:341 -msgid "Norwegian Bokmal" +msgid "Lithuanian" msgstr "" #: ../picard/const.py:342 -msgid "Dutch" +msgid "Norwegian Bokmal" msgstr "" #: ../picard/const.py:343 -msgid "Polish" +msgid "Dutch" msgstr "" #: ../picard/const.py:344 -msgid "Portuguese" +msgid "Polish" msgstr "" #: ../picard/const.py:345 -msgid "Brazilian Portuguese" +msgid "Portuguese" msgstr "" #: ../picard/const.py:346 -msgid "Romanian" +msgid "Brazilian Portuguese" msgstr "" #: ../picard/const.py:347 -msgid "Russian" +msgid "Romanian" msgstr "" #: ../picard/const.py:348 -msgid "Scots" +msgid "Russian" msgstr "" #: ../picard/const.py:349 -msgid "Slovak" +msgid "Scots" msgstr "" #: ../picard/const.py:350 -msgid "Slovenian" +msgid "Slovak" msgstr "" #: ../picard/const.py:351 -msgid "Swedish" +msgid "Slovenian" msgstr "" #: ../picard/const.py:352 -msgid "Turkish" +msgid "Serbian" msgstr "" #: ../picard/const.py:353 +msgid "Swedish" +msgstr "" + +#: ../picard/const.py:354 +msgid "Turkish" +msgstr "" + +#: ../picard/const.py:355 msgid "Chinese" msgstr "" @@ -2004,7 +2012,7 @@ msgstr "" msgid "Size:" msgstr "" -#: ../picard/ui/tageditor.py:249 +#: ../picard/ui/tageditor.py:249 ../picard/ui/ui_metadata.py:127 msgid "Length:" msgstr "" @@ -2032,10 +2040,6 @@ msgstr "" msgid "Channels:" msgstr "" -#: ../picard/ui/coverartbox.py:47 -msgid " " -msgstr "" - #: ../picard/ui/coverartbox.py:101 msgid "Buy the album on Amazon" msgstr "" @@ -2325,35 +2329,31 @@ msgstr "" msgid "&Cancel" msgstr "" -#: ../picard/ui/ui_metadata.py:119 +#: ../picard/ui/ui_metadata.py:123 msgid "Title:" msgstr "" -#: ../picard/ui/ui_metadata.py:120 +#: ../picard/ui/ui_metadata.py:124 msgid "Artist:" msgstr "" -#: ../picard/ui/ui_metadata.py:121 +#: ../picard/ui/ui_metadata.py:125 msgid "Album:" msgstr "" -#: ../picard/ui/ui_metadata.py:122 +#: ../picard/ui/ui_metadata.py:126 msgid "Track:" msgstr "" -#: ../picard/ui/ui_metadata.py:123 -msgid " Length:" +#: ../picard/ui/ui_metadata.py:128 +msgid "Date:" msgstr "" -#: ../picard/ui/ui_metadata.py:124 -msgid " Date:" -msgstr "" - -#: ../picard/ui/ui_metadata.py:125 +#: ../picard/ui/ui_metadata.py:129 msgid "0000-00-00; " msgstr "" -#: ../picard/ui/ui_metadata.py:126 +#: ../picard/ui/ui_metadata.py:130 msgid "Lookup" msgstr "" diff --git a/ui/metadata.ui b/ui/metadata.ui index 012651458..56b235db5 100644 --- a/ui/metadata.ui +++ b/ui/metadata.ui @@ -6,8 +6,8 @@ 0 0 - 343 - 120 + 380 + 143 @@ -47,7 +47,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -105,17 +105,17 @@ - + - Length: + Length: length - + @@ -140,17 +140,17 @@ - + - Date: + Date: date - + @@ -172,7 +172,7 @@ - + Qt::Horizontal @@ -188,7 +188,7 @@ - + @@ -207,6 +207,38 @@ + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 4 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 4 + 20 + + + +