Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added russian translation #76

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/presentation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ set(translation_files
translations/librum_en.ts
translations/librum_de.ts
translations/librum_ru.ts
translations/librum_it.ts
)

# Translations for the application
Expand Down
8 changes: 4 additions & 4 deletions src/presentation/LanguageModel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ListModel {
text: "Deutsch"
code: "de"
}
// ListElement {
// text: "Русский"
// code: "ru"
// }
ListElement {
text: "Русский"
code: "ru"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ Popup {
id: infoText
Layout.topMargin: 20
Layout.leftMargin: 52
Layout.fillWidth: true
wrapMode: Text.WordWrap
textFormat: Text.RichText
text: qsTr("Deleting your account is an irreversible action.<br>Once you delete your account, there is <b>no</b> going back. Please be certain.")
font.pointSize: Fonts.size14
Expand Down
8 changes: 7 additions & 1 deletion src/presentation/modules/CustomComponents/MDualToggle.qml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,16 @@ Item {
property string rightDisplayText: qsTr("Right")
property bool leftSelected: false
property bool rightSelected: true // default
property int minWidth: 178
signal toggled(string newSelected)

implicitHeight: 38
implicitWidth: 178
implicitWidth: {
let biggestText = Math.max(leftLabel.implicitWidth,
rightLabel.implicitWidth)

return Math.max(minWidth, biggestText * 2 + 42)
}

Pane {
id: container
Expand Down
6 changes: 4 additions & 2 deletions src/presentation/settings/MAppearancePage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ Page {

MButton {
id: resetButton
Layout.preferredWidth: 160
Layout.preferredHeight: 38
Layout.alignment: Qt.AlignBottom
borderWidth: 0
horizontalMargins: 12
backgroundColor: Style.colorBasePurple
text: qsTr("Restore Defaults")
fontSize: Fonts.size12
Expand Down Expand Up @@ -212,7 +212,9 @@ Page {
function calculateDefaultIndex() {
let selectedLanguage = AppInfoController.language
for (var i = 0; i < model.count; ++i) {
if (model.get(i).text === selectedLanguage)
if (model.get(i).text.toLowerCase(
) === selectedLanguage.toLowerCase(
))
return i
}

Expand Down
4 changes: 2 additions & 2 deletions src/presentation/settings/MBehaviorPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ MFlickWrapper {
id: hideCursorAfterDelayTitle
Layout.fillWidth: true
Layout.topMargin: 18
text: "Hide cursor after delay"
text: qsTr("Hide cursor after delay")
font.pointSize: Fonts.size13
font.weight: Font.DemiBold
color: Style.colorText
Expand All @@ -154,7 +154,7 @@ MFlickWrapper {
}

Text {
text: "ms"
text: qsTr("ms")
font.pointSize: Fonts.size13
font.weight: Font.DemiBold
color: Style.colorText
Expand Down
44 changes: 27 additions & 17 deletions src/presentation/translations/librum_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,17 +354,17 @@ Wir hoffen, dass du eine tolle Zeit hast! Lass uns doch eine Bewertung da.</tran
<translation>Sprache</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="246"/>
<location filename="../settings/MAppearancePage.qml" line="248"/>
<source>Reading</source>
<translation>Lesen</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="256"/>
<location filename="../settings/MAppearancePage.qml" line="258"/>
<source>Page spacing</source>
<translation>Seiten Abstand</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="283"/>
<location filename="../settings/MAppearancePage.qml" line="285"/>
<source>Display book title in titlebar</source>
<translation>Den Buchtitel in der Titelleiste anzeigen</translation>
</message>
Expand Down Expand Up @@ -413,22 +413,22 @@ Wir hoffen, dass du eine tolle Zeit hast! Lass uns doch eine Bewertung da.</tran
<translation type="vanished">Tauschen</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="308"/>
<location filename="../settings/MAppearancePage.qml" line="310"/>
<source>Default Zoom</source>
<translation>Standard-Zoom</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="354"/>
<location filename="../settings/MAppearancePage.qml" line="356"/>
<source>Highlights</source>
<translation>Markierungen</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="363"/>
<location filename="../settings/MAppearancePage.qml" line="365"/>
<source>Colors</source>
<translation>Farben</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="482"/>
<location filename="../settings/MAppearancePage.qml" line="484"/>
<source>Opacity</source>
<translation>Transparenz</translation>
</message>
Expand Down Expand Up @@ -457,24 +457,24 @@ Wir hoffen, dass du eine tolle Zeit hast! Lass uns doch eine Bewertung da.</tran
<translation type="vanished">Immer sichtbar</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="538"/>
<location filename="../settings/MAppearancePage.qml" line="540"/>
<source>Reset settings?</source>
<translation>Einstellungen zurücksetzen?</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="539"/>
<location filename="../settings/MAppearancePage.qml" line="541"/>
<source>Resetting your settings is a permanent action, there
will be no way to restore them!</source>
<translation>Einstellungen zurückzusetzen ist eine endgültige Aktion,
es gibt keine Möglichkeit sie wiederherzustellen!</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="540"/>
<location filename="../settings/MAppearancePage.qml" line="542"/>
<source>No, Keep</source>
<translation>Nein, behalte</translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="541"/>
<location filename="../settings/MAppearancePage.qml" line="543"/>
<source>Yes, Reset</source>
<translation>Ja, zurücksetzen</translation>
</message>
Expand Down Expand Up @@ -516,6 +516,16 @@ es gibt keine Möglichkeit sie wiederherzustellen!</translation>
<source>Always visible</source>
<translation type="unfinished">Immer sichtbar</translation>
</message>
<message>
<location filename="../settings/MBehaviorPage.qml" line="132"/>
<source>Hide cursor after delay</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MBehaviorPage.qml" line="157"/>
<source>ms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MBehaviorPage.qml" line="176"/>
<source>Reset settings?</source>
Expand Down Expand Up @@ -786,32 +796,32 @@ niemand wird es wiederherstellen können!</translation>
<translation>Bestätige Konto Löschung</translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="76"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="78"/>
<source>Deleting your account is an irreversible action.&lt;br&gt;Once you delete your account, there is &lt;b&gt;no&lt;/b&gt; going back. Please be certain.</source>
<translation>Das Löschen deines Kontos ist eine endgültige Aktion.&lt;br&gt;Nachdem du dein Konto gelöscht hast, gibt es &lt;b&gt;keinen&lt;/b&gt; Weg zurück.</translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="88"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="90"/>
<source>Your Email</source>
<translation>Deine Email</translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="90"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="92"/>
<source>Confirm the deletion by entering your Account&apos;s email.</source>
<translation>Bestätige die Löschung deines Accounts indem du deine Email eingibst.</translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="109"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="111"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="125"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="127"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="135"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="137"/>
<source>Your email is wrong</source>
<translation>Deine Email ist falsch</translation>
</message>
Expand Down
44 changes: 27 additions & 17 deletions src/presentation/translations/librum_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -345,58 +345,58 @@ We hope you have a great time using it! Feel free to leave us a rating and some
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="246"/>
<location filename="../settings/MAppearancePage.qml" line="248"/>
<source>Reading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="256"/>
<location filename="../settings/MAppearancePage.qml" line="258"/>
<source>Page spacing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="283"/>
<location filename="../settings/MAppearancePage.qml" line="285"/>
<source>Display book title in titlebar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="308"/>
<location filename="../settings/MAppearancePage.qml" line="310"/>
<source>Default Zoom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="354"/>
<location filename="../settings/MAppearancePage.qml" line="356"/>
<source>Highlights</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="363"/>
<location filename="../settings/MAppearancePage.qml" line="365"/>
<source>Colors</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="482"/>
<location filename="../settings/MAppearancePage.qml" line="484"/>
<source>Opacity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="538"/>
<location filename="../settings/MAppearancePage.qml" line="540"/>
<source>Reset settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="539"/>
<location filename="../settings/MAppearancePage.qml" line="541"/>
<source>Resetting your settings is a permanent action, there
will be no way to restore them!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="540"/>
<location filename="../settings/MAppearancePage.qml" line="542"/>
<source>No, Keep</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MAppearancePage.qml" line="541"/>
<location filename="../settings/MAppearancePage.qml" line="543"/>
<source>Yes, Reset</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -438,6 +438,16 @@ We hope you have a great time using it! Feel free to leave us a rating and some
<source>Always visible</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MBehaviorPage.qml" line="132"/>
<source>Hide cursor after delay</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MBehaviorPage.qml" line="157"/>
<source>ms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/MBehaviorPage.qml" line="176"/>
<source>Reset settings?</source>
Expand Down Expand Up @@ -688,32 +698,32 @@ Either you are offline, or your storage is full.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="76"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="78"/>
<source>Deleting your account is an irreversible action.&lt;br&gt;Once you delete your account, there is &lt;b&gt;no&lt;/b&gt; going back. Please be certain.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="88"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="90"/>
<source>Your Email</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="90"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="92"/>
<source>Confirm the deletion by entering your Account&apos;s email.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="109"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="111"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="125"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="127"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="135"/>
<location filename="../modules/CustomComponents/MConfirmAccountDeletionPopup.qml" line="137"/>
<source>Your email is wrong</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading