diff --git a/i18n/manuskript_de.qm b/i18n/manuskript_de.qm
index 23115ca..b1af1bd 100644
Binary files a/i18n/manuskript_de.qm and b/i18n/manuskript_de.qm differ
diff --git a/i18n/manuskript_de.ts b/i18n/manuskript_de.ts
index d678099..b463c41 100644
--- a/i18n/manuskript_de.ts
+++ b/i18n/manuskript_de.ts
@@ -271,7 +271,7 @@
-
+
Buchinformationen
@@ -426,7 +426,7 @@
-
+
Basisinformationen
@@ -472,7 +472,7 @@
-
+
Details
@@ -544,7 +544,7 @@
-
+
Redaktion
@@ -1947,12 +1947,12 @@
-
+
Baisinformationen
-
+
Detailierte Informationen
diff --git a/i18n/manuskript_es.qm b/i18n/manuskript_es.qm
index e8f0cd3..1295042 100644
Binary files a/i18n/manuskript_es.qm and b/i18n/manuskript_es.qm differ
diff --git a/i18n/manuskript_es.ts b/i18n/manuskript_es.ts
index e7c868d..4c23d8d 100644
--- a/i18n/manuskript_es.ts
+++ b/i18n/manuskript_es.ts
@@ -332,7 +332,7 @@
-
+
Informaciones de libros
@@ -467,7 +467,7 @@
-
+
Informaciónes básicas
@@ -512,7 +512,7 @@
-
+
Informaciones detalladas
@@ -578,7 +578,7 @@
-
+
Redacción
@@ -834,7 +834,7 @@
-
+
Introduzca información acerca de tu libro y sobre ti mismo.
@@ -873,7 +873,7 @@
-
+
Depura la información. A veces es útil.
@@ -2814,12 +2814,12 @@
-
+
Informaciones básicas
-
+
Informaciones detalladas
diff --git a/i18n/manuskript_fr.qm b/i18n/manuskript_fr.qm
index b310acd..83c98b8 100644
Binary files a/i18n/manuskript_fr.qm and b/i18n/manuskript_fr.qm differ
diff --git a/i18n/manuskript_fr.ts b/i18n/manuskript_fr.ts
index 3cdc906..95199c1 100644
--- a/i18n/manuskript_fr.ts
+++ b/i18n/manuskript_fr.ts
@@ -314,7 +314,7 @@ des lignes:
MainWindow
-
+
Informations sur le livre
@@ -434,7 +434,7 @@ des lignes:
-
+
Informations générales
@@ -479,7 +479,7 @@ des lignes:
-
+
Informations détaillées
@@ -519,7 +519,7 @@ des lignes:
-
+
Rédaction
@@ -704,7 +704,7 @@ des lignes:
-
+
Entrez toutes les informations relatives au livre, ainsi qu'à vous.
@@ -729,8 +729,8 @@ des lignes:
-
- Des infos pour débugger des fois pendant qu'on code c'est utile.
+
+ Des informations pour débugger des fois pendant qu'on code c'est utile.
@@ -2698,12 +2698,12 @@ des lignes:
-
+
Informations générales
-
+
Informations détaillées
diff --git a/icons/Custom/Tabs/redaction-128px.png b/icons/Custom/Tabs/editor-128px.png
similarity index 100%
rename from icons/Custom/Tabs/redaction-128px.png
rename to icons/Custom/Tabs/editor-128px.png
diff --git a/manuskript/mainWindow.py b/manuskript/mainWindow.py
index 9ae189d..483c726 100644
--- a/manuskript/mainWindow.py
+++ b/manuskript/mainWindow.py
@@ -888,7 +888,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
"plot-128px.png",
"world-128px.png",
"outline-128px.png",
- "redaction-128px.png",
+ "editor-128px.png",
""
]
self.tabMain.setTabIcon(i, QIcon(appPath("icons/Custom/Tabs/{}".format(icons[i]))))
@@ -934,7 +934,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# Help box
references = [
(self.lytTabOverview,
- self.tr("Enter infos about your book, and yourself."),
+ self.tr("Enter informations about your book, and yourself."),
0),
(self.lytSituation,
self.tr(
@@ -962,7 +962,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.tr("Write."),
0),
(self.lytTabDebug,
- self.tr("Debug infos. Sometimes useful."),
+ self.tr("Debug info. Sometimes useful."),
0)
]
diff --git a/manuskript/models/references.py b/manuskript/models/references.py
index 749615a..0223b76 100644
--- a/manuskript/models/references.py
+++ b/manuskript/models/references.py
@@ -182,8 +182,8 @@ def infos(ref):
name = c.name()
# Titles
- basicTitle = qApp.translate("references", "Basic infos")
- detailedTitle = qApp.translate("references", "Detailed infos")
+ basicTitle = qApp.translate("references", "Basic info")
+ detailedTitle = qApp.translate("references", "Detailed info")
POVof = qApp.translate("references", "POV of:")
# Goto (link)
diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py
index e4e15e2..ea6b3d2 100644
--- a/manuskript/ui/mainWindow.py
+++ b/manuskript/ui/mainWindow.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui'
#
-# Created: Sat Oct 14 14:03:18 2017
+# Created: Sat Oct 14 20:38:54 2017
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@@ -366,13 +366,13 @@ class Ui_MainWindow(object):
self.verticalLayout_8.addLayout(self.horizontalLayout_14)
self.tabPersos = QtWidgets.QTabWidget(self.splitterPersos)
self.tabPersos.setObjectName("tabPersos")
- self.infos = QtWidgets.QWidget()
- self.infos.setObjectName("infos")
- self.verticalLayout_20 = QtWidgets.QVBoxLayout(self.infos)
+ self.info = QtWidgets.QWidget()
+ self.info.setObjectName("info")
+ self.verticalLayout_20 = QtWidgets.QVBoxLayout(self.info)
self.verticalLayout_20.setSpacing(0)
self.verticalLayout_20.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_20.setObjectName("verticalLayout_20")
- self.scrollAreaPersoInfos = QtWidgets.QScrollArea(self.infos)
+ self.scrollAreaPersoInfos = QtWidgets.QScrollArea(self.info)
self.scrollAreaPersoInfos.setFrameShape(QtWidgets.QFrame.NoFrame)
self.scrollAreaPersoInfos.setLineWidth(0)
self.scrollAreaPersoInfos.setWidgetResizable(True)
@@ -457,7 +457,7 @@ class Ui_MainWindow(object):
self.formLayout_8.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_3)
self.scrollAreaPersoInfos.setWidget(self.scrollAreaPersoInfosWidget)
self.verticalLayout_20.addWidget(self.scrollAreaPersoInfos)
- self.tabPersos.addTab(self.infos, "")
+ self.tabPersos.addTab(self.info, "")
self.tab_11 = QtWidgets.QWidget()
self.tab_11.setObjectName("tab_11")
self.verticalLayout_17 = QtWidgets.QVBoxLayout(self.tab_11)
@@ -1200,10 +1200,10 @@ class Ui_MainWindow(object):
self.retranslateUi(MainWindow)
self.stack.setCurrentIndex(1)
- self.tabMain.setCurrentIndex(2)
+ self.tabMain.setCurrentIndex(3)
self.tabSummary.setCurrentIndex(0)
self.tabPersos.setCurrentIndex(0)
- self.tabPlot.setCurrentIndex(1)
+ self.tabPlot.setCurrentIndex(0)
self.comboBox_2.setCurrentIndex(0)
self.stkPlotSummary.setCurrentIndex(0)
self.tabWorld.setCurrentIndex(0)
@@ -1217,7 +1217,7 @@ class Ui_MainWindow(object):
def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
- self.grpBookInfos.setTitle(_translate("MainWindow", "Book infos"))
+ self.grpBookInfos.setTitle(_translate("MainWindow", "Book informations"))
self.label_10.setText(_translate("MainWindow", "Title"))
self.label_11.setText(_translate("MainWindow", "Subtitle"))
self.label_12.setText(_translate("MainWindow", "Serie"))
@@ -1258,13 +1258,13 @@ class Ui_MainWindow(object):
self.btnStepFour.setText(_translate("MainWindow", "Next"))
self.label_18.setText(_translate("MainWindow", "Importance"))
self.label_3.setText(_translate("MainWindow", "Name"))
- self.tabPersos.setTabText(self.tabPersos.indexOf(self.infos), _translate("MainWindow", "Basic infos"))
+ self.tabPersos.setTabText(self.tabPersos.indexOf(self.info), _translate("MainWindow", "Basic info"))
self.btnStepSix.setText(_translate("MainWindow", "Next"))
self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_11), _translate("MainWindow", "Summary"))
self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_19), _translate("MainWindow", "Notes"))
self.lineEdit.setPlaceholderText(_translate("MainWindow", "Filter"))
self.btnStepEight.setText(_translate("MainWindow", "Next"))
- self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_12), _translate("MainWindow", "Detailed infos"))
+ self.tabPersos.setTabText(self.tabPersos.indexOf(self.tab_12), _translate("MainWindow", "Detailed info"))
self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabPersos), _translate("MainWindow", "Characters"))
self.groupBox_2.setTitle(_translate("MainWindow", "Plots"))
self.txtPlotFilter.setPlaceholderText(_translate("MainWindow", "Filter"))
@@ -1273,7 +1273,7 @@ class Ui_MainWindow(object):
self.label_26.setText(_translate("MainWindow", "Character(s)"))
self.label_27.setText(_translate("MainWindow", "Description"))
self.label_28.setText(_translate("MainWindow", "Result"))
- self.tabPlot.setTabText(self.tabPlot.indexOf(self.infos_2), _translate("MainWindow", "Basic infos"))
+ self.tabPlot.setTabText(self.tabPlot.indexOf(self.infos_2), _translate("MainWindow", "Basic info"))
self.grpSubPlotSummary.setTitle(_translate("MainWindow", "Summary:"))
self.tabPlot.setTabText(self.tabPlot.indexOf(self.tab_15), _translate("MainWindow", "Resolution steps"))
self.grpPlotSummary.setTitle(_translate("MainWindow", "Summary"))
@@ -1292,7 +1292,7 @@ class Ui_MainWindow(object):
self.tabWorld.setTabText(self.tabWorld.indexOf(self.tab_4), _translate("MainWindow", "More"))
self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabContext), _translate("MainWindow", "World"))
self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabOutline), _translate("MainWindow", "Outline"))
- self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabRedac), _translate("MainWindow", "Redaction"))
+ self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabRedac), _translate("MainWindow", "Editor"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_9), _translate("MainWindow", "FlatData"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_10), _translate("MainWindow", "Persos"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Plots"))
@@ -1339,18 +1339,18 @@ class Ui_MainWindow(object):
self.actAbout.setText(_translate("MainWindow", "&About"))
self.actAbout.setToolTip(_translate("MainWindow", "About Manuskript"))
-from manuskript.ui.editors.mainEditor import mainEditor
-from manuskript.ui.views.lineEditView import lineEditView
-from manuskript.ui.views.sldImportance import sldImportance
-from manuskript.ui.views.treeView import treeView
-from manuskript.ui.views.characterTreeView import characterTreeView
from manuskript.ui.views.basicItemView import basicItemView
-from manuskript.ui.views.textEditCompleter import textEditCompleter
-from manuskript.ui.views.plotTreeView import plotTreeView
-from manuskript.ui.views.metadataView import metadataView
-from manuskript.ui.cheatSheet import cheatSheet
-from manuskript.ui.views.storylineView import storylineView
-from manuskript.ui.search import search
-from manuskript.ui.views.textEditView import textEditView
+from manuskript.ui.editors.mainEditor import mainEditor
+from manuskript.ui.views.treeView import treeView
from manuskript.ui.views.outlineView import outlineView
+from manuskript.ui.views.metadataView import metadataView
+from manuskript.ui.views.storylineView import storylineView
+from manuskript.ui.views.lineEditView import lineEditView
from manuskript.ui.welcome import welcome
+from manuskript.ui.search import search
+from manuskript.ui.views.characterTreeView import characterTreeView
+from manuskript.ui.cheatSheet import cheatSheet
+from manuskript.ui.views.textEditView import textEditView
+from manuskript.ui.views.textEditCompleter import textEditCompleter
+from manuskript.ui.views.sldImportance import sldImportance
+from manuskript.ui.views.plotTreeView import plotTreeView
diff --git a/manuskript/ui/mainWindow.ui b/manuskript/ui/mainWindow.ui
index 1920124..c55e710 100644
--- a/manuskript/ui/mainWindow.ui
+++ b/manuskript/ui/mainWindow.ui
@@ -124,7 +124,7 @@
QTabWidget::Rounded
- 2
+ 3
true
@@ -151,7 +151,7 @@
-
- Book infos
+ Book informations
@@ -776,9 +776,9 @@
0
-
+
- Basic infos
+ Basic info
@@ -1008,7 +1008,7 @@
- Detailed infos
+ Detailed info
-
@@ -1173,14 +1173,14 @@
- 1
+ 0
true
- Basic infos
+ Basic info
@@ -1834,7 +1834,7 @@
- Redaction
+ Editor