Updates base translation files, and french translation.

This commit is contained in:
Olivier Keshavjee 2017-11-24 14:52:32 +01:00
parent b94ba7b0de
commit 584e75eba4
9 changed files with 3607 additions and 2014 deletions

View file

@ -22,11 +22,11 @@ FORMS += ../manuskript/ui/revisions_ui.ui
FORMS += ../manuskript/ui/exporters/exportersManager_ui.ui
FORMS += ../manuskript/ui/exporters/manuskript/plainTextSettings_ui.ui
FORMS += ../manuskript/ui/exporters/exporter_ui.ui
SOURCES += ../manuskript/models/outlineModel.py
SOURCES += ../manuskript/models/persosProxyModel.py
SOURCES += ../manuskript/models/plotsProxyModel.py
SOURCES += ../manuskript/models/plotModel.py
SOURCES += ../manuskript/models/worldModel.py
SOURCES += ../manuskript/models/abstractModel.py
SOURCES += ../manuskript/models/characterModel.py
SOURCES += ../manuskript/exporter/pandoc/abstractPlainText.py
SOURCES += ../manuskript/exporter/manuskript/markdown.py
@ -66,8 +66,8 @@ SOURCES += ../manuskript/ui/exporters/manuskript/plainTextSettings.py
SOURCES += ../manuskript/ui/exporters/exporter.py
SOURCES += ../manuskript/ui/exporters/exportersManager.py
SOURCES += ../manuskript/ui/revisions.py
SOURCES += ../manuskript/models/outlineModel.py
SOURCES += ../manuskript/models/references.py
SOURCES += ../manuskript/models/outlineItem.py
SOURCES += ../manuskript/exporter/pandoc/HTML.py
SOURCES += ../manuskript/exporter/pandoc/outputFormats.py
SOURCES += ../manuskript/exporter/pandoc/abstractPlainText.py

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -35,14 +35,14 @@ class aboutDialog(QWidget, Ui_about):
GNU General Public License Version 3
</a><br>"""
)
self.labelManuskriptVersion.setOpenExternalLinks(True)
self.labelSoftwareVersion.setText(
"<b>" + self.tr("Software Versions in Use:") + "</b><br>"
+ "&nbsp;"*5 + self.tr("Python") + " " + python_version() + "<br>"
+ "&nbsp;"*5 + self.tr("PyQt") + " " + PYQT_VERSION_STR + "<br>"
+ "&nbsp;"*5 + self.tr("Qt") + " " + QT_VERSION_STR
+ "&nbsp;"*5 + "Python " + python_version() + "<br>"
+ "&nbsp;"*5 + "PyQt " + PYQT_VERSION_STR + "<br>"
+ "&nbsp;"*5 + "Qt " + QT_VERSION_STR
)
#self.labelPythonVersion.setText()
#self.labelPyQtVersion.setText()

View file

@ -12,6 +12,7 @@ class Ui_generalSettings(object):
def setupUi(self, generalSettings):
generalSettings.setObjectName("generalSettings")
generalSettings.resize(267, 401)
generalSettings.setWindowTitle("Form")
self.verticalLayout_2 = QtWidgets.QVBoxLayout(generalSettings)
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_2.setSpacing(10)
@ -58,7 +59,6 @@ class Ui_generalSettings(object):
def retranslateUi(self, generalSettings):
_translate = QtCore.QCoreApplication.translate
generalSettings.setWindowTitle(_translate("generalSettings", "Form"))
self.chkGeneralSplitScenes.setText(_translate("generalSettings", "Split scenes at:"))
self.txtGeneralSplitScenes.setPlaceholderText(_translate("generalSettings", "\\n---\\n"))
self.chkGeneralTrimTitles.setText(_translate("generalSettings", "Trim long titles (> 32 chars)"))

View file

@ -11,22 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>10</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -50,16 +41,7 @@
<string>General</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>6</number>
</property>
<item>
@ -77,7 +59,7 @@
<item row="3" column="1">
<widget class="QLineEdit" name="txtGeneralSplitScenes">
<property name="text">
<string/>
<string notr="true"/>
</property>
<property name="placeholderText">
<string>\n---\n</string>