mirror of https://github.com/borgbase/vorta
Translation-related improvements and German translation (#146)
* Add translations with a minimum of 90% completion. * Adjust packaging to include compiled .qm files. Fixes #135 * Improve repo tab layout. Avoid overflowing lines. #139
This commit is contained in:
Manuel Riel
GitHub
parent
d3dbd4d686
commit
6e0904647b
|
|
@ -1,11 +1,10 @@
|
|||
.DS_Store
|
||||
.idea/
|
||||
bin/
|
||||
build/
|
||||
dist/
|
||||
docs/
|
||||
*.autosave
|
||||
bin/macosx64/Sparkle.framework
|
||||
bin/macosx64/borg
|
||||
__pycache__
|
||||
.eggs
|
||||
vorta.egg-info
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ host = https://www.transifex.com
|
|||
|
||||
[vorta.vorta]
|
||||
file_filter = src/vorta/i18n/ts/vorta.<lang>.ts
|
||||
minimum_perc = 0
|
||||
minimum_perc = 90
|
||||
source_file = src/vorta/i18n/ts/vorta.en_US.ts
|
||||
source_lang = en_US
|
||||
type = QT
|
||||
|
|
|
|||
|
|
@ -1,2 +1,7 @@
|
|||
graft src/vorta/assets
|
||||
|
||||
# Include all compiled .qm language files, but exclude the source language – en_US.
|
||||
recursive-include src/vorta/i18n/qm *.qm
|
||||
exclude src/vorta/i18n/qm/vorta.en_US.qm
|
||||
|
||||
recursive-exclude tests *
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -4,7 +4,7 @@ export QT_SELECT=5
|
|||
.PHONY : help
|
||||
.DEFAULT_GOAL := help
|
||||
|
||||
Vorta.app:
|
||||
Vorta.app: translations-to-qm
|
||||
#pyrcc5 -o src/vorta/views/collection_rc.py src/vorta/assets/icons/collection.qrc
|
||||
pyinstaller --clean --noconfirm vorta.spec
|
||||
cp -R bin/macosx64/Sparkle.framework dist/Vorta.app/Contents/Frameworks/
|
||||
|
|
@ -22,7 +22,7 @@ github-release: Vorta.dmg
|
|||
git push upstream gh-pages
|
||||
git checkout master
|
||||
|
||||
pypi-release:
|
||||
pypi-release: translations-to-qm
|
||||
python setup.py sdist
|
||||
twine upload dist/vorta-0.6.5.tar.gz
|
||||
|
||||
|
|
|
|||
3
setup.py
3
setup.py
|
|
@ -3,5 +3,6 @@ from setuptools import setup, find_packages
|
|||
setup(
|
||||
include_package_data=True,
|
||||
packages=find_packages('src'),
|
||||
package_dir={'': 'src'}
|
||||
package_dir={'': 'src'},
|
||||
package_data={'vorta.i18n': ['qm/*.qm']}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -23,30 +23,99 @@
|
|||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="bottomMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetNoConstraint</enum>
|
||||
</property>
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
||||
</property>
|
||||
<property name="rowWrapPolicy">
|
||||
<enum>QFormLayout::DontWrapRows</enum>
|
||||
</property>
|
||||
<property name="labelAlignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_14">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">margin-top: 4;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>SSH Key:</string>
|
||||
<string>Repository:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="topMargin">
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
<property name="horizontalSpacing">
|
||||
<number>-1</number>
|
||||
</property>
|
||||
<item>
|
||||
<property name="verticalSpacing">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>11</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p>Remote or local backup repository. For simple and secure backup hosting, try <a href="https://www.borgbase.com/?utm_source=vorta&amp;utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a>.</p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="repoSelector">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
|
|
@ -64,7 +133,7 @@
|
|||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QToolButton" name="repoRemoveToolbutton">
|
||||
<property name="toolTip">
|
||||
<string>Unlink Repository (This doesn't delete any data. You can always add a repo again later.)</string>
|
||||
|
|
@ -83,25 +152,19 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">margin-bottom: 10;
|
||||
margin-left: 5</string>
|
||||
<string notr="true">margin-top: 4;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>To securely access remote repositories. Keep default to use all your existing keys. Or create new key.</string>
|
||||
<string>SSH Key:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
|
|
@ -109,71 +172,17 @@ margin-left: 5</string>
|
|||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">margin-bottom: 10;
|
||||
margin-left: 5</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p>Remote or local backup repository. For simple and secure backup hosting, try <a href="https://www.borgbase.com/?utm_source=vorta&amp;utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a>.</p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<property name="verticalSpacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Compression:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QComboBox" name="sshComboBox"/>
|
||||
</item>
|
||||
<item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QToolButton" name="sshKeyToClipboardButton">
|
||||
<property name="toolTip">
|
||||
<string>Copy public SSH key to clipboard.</string>
|
||||
|
|
@ -196,54 +205,58 @@ margin-left: 5</string>
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QComboBox" name="repoCompression"/>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="sshComboBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>11</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>To securely access remote repositories. Keep default to use all your existing keys. Or create new key.</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>5</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Repository:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">margin-bottom: 10;
|
||||
margin-left: 5</string>
|
||||
<string notr="true">margin-top: 4;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p>Compression used for new data. Can be changed and doesn't affect deduplication. Read <a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-compression"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>.</p></body></html></string>
|
||||
<string>Compression:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
|
|
@ -251,8 +264,58 @@ margin-left: 5</string>
|
|||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<property name="verticalSpacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="repoCompression">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>11</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p>Compression used for new data. Can be changed and doesn't affect deduplication. Read <a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-compression"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>.</p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="indent">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -18,6 +18,7 @@ a = Analysis(['src/vorta/__main__.py'],
|
|||
datas=[
|
||||
('src/vorta/assets/UI/*', 'assets/UI'),
|
||||
('src/vorta/assets/icons/*', 'assets/icons'),
|
||||
('src/vorta/i18n/qm/*', 'vorta/i18n/qm'),
|
||||
],
|
||||
hiddenimports=[
|
||||
'vorta.views.collection_rc',
|
||||
|
|
|
|||
Loading…
Reference in New Issue