diff options
| -rw-r--r-- | core/checkcloudconnection.cpp | 2 | ||||
| -rw-r--r-- | mobile-widgets/qml/mobile-resources.qrc | 1 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 4 | ||||
| -rw-r--r-- | translations/subsurface_source.ts | 26 |
4 files changed, 18 insertions, 15 deletions
diff --git a/core/checkcloudconnection.cpp b/core/checkcloudconnection.cpp index cf588a88a..69f2b9a6d 100644 --- a/core/checkcloudconnection.cpp +++ b/core/checkcloudconnection.cpp @@ -55,7 +55,7 @@ bool CheckCloudConnection::checkServer() return true; } } else if (seconds < prefs.cloud_timeout) { - QString text = tr("Waiting for cloud connetion (%n second(s) passed)", "", seconds); + QString text = tr("Waiting for cloud connection (%n second(s) passed)", "", seconds); git_storage_update_progress(qPrintable(text)); } else { disconnect(reply, SIGNAL(finished()), &loop, SLOT(quit())); diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc index cc8914229..cd140f546 100644 --- a/mobile-widgets/qml/mobile-resources.qrc +++ b/mobile-widgets/qml/mobile-resources.qrc @@ -27,6 +27,7 @@ <file>qtquickcontrols2.conf</file> <file alias="icons/go-next.svg">kirigami/icons/go-next.svg</file> <file alias="icons/go-previous.svg">kirigami/icons/go-previous.svg</file> + <file alias="icons/go-up.svg">kirigami/icons/go-up.svg</file> <file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file> <file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file> <file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file> diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 2583c43a4..267b44515 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -32,7 +32,8 @@ if [ "$NOPULL" = "" ] ; then pushd kirigami git checkout master git pull origin master - git checkout v2.1.0 + # let's go back to building against master + # git checkout v2.1.0 popd fi if [ ! -d breeze-icons ] ; then @@ -59,6 +60,7 @@ cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons cp $BREEZE/icons/actions/24/document-save.svg $MC/icons cp $BREEZE/icons/actions/24/go-next.svg $MC/icons cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons +cp $BREEZE/icons/actions/24/go-up.svg $MC/icons cp $BREEZE/icons/actions/16/view-readermode.svg $MC/icons cp $BREEZE/icons/actions/24/application-menu.svg $MC/icons cp $BREEZE/icons/actions/22/gps.svg $MC/icons diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 39e799b09..5f130f759 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -310,7 +310,7 @@ <name>CheckCloudConnection</name> <message numerus="yes"> <location filename="../core/checkcloudconnection.cpp" line="58"/> - <source>Waiting for cloud connetion (%n second(s) passed)</source> + <source>Waiting for cloud connection (%n second(s) passed)</source> <translation type="unfinished"> <numerusform></numerusform> <numerusform></numerusform> @@ -3719,7 +3719,7 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> <translation type="unfinished"></translation> </message> @@ -6136,17 +6136,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/btdiscovery.cpp" line="144"/> <location filename="../core/btdiscovery.cpp" line="148"/> <location filename="../core/btdiscovery.cpp" line="149"/> - <location filename="../core/downloadfromdcthread.cpp" line="98"/> - <location filename="../core/downloadfromdcthread.cpp" line="253"/> - <location filename="../core/downloadfromdcthread.cpp" line="259"/> - <location filename="../core/downloadfromdcthread.cpp" line="276"/> - <location filename="../core/downloadfromdcthread.cpp" line="282"/> - <location filename="../core/downloadfromdcthread.cpp" line="300"/> - <location filename="../core/downloadfromdcthread.cpp" line="308"/> - <location filename="../core/downloadfromdcthread.cpp" line="328"/> - <location filename="../core/downloadfromdcthread.cpp" line="336"/> - <location filename="../core/downloadfromdcthread.cpp" line="356"/> - <location filename="../core/downloadfromdcthread.cpp" line="364"/> + <location filename="../core/downloadfromdcthread.cpp" line="128"/> + <location filename="../core/downloadfromdcthread.cpp" line="283"/> + <location filename="../core/downloadfromdcthread.cpp" line="289"/> + <location filename="../core/downloadfromdcthread.cpp" line="306"/> + <location filename="../core/downloadfromdcthread.cpp" line="312"/> + <location filename="../core/downloadfromdcthread.cpp" line="330"/> + <location filename="../core/downloadfromdcthread.cpp" line="338"/> + <location filename="../core/downloadfromdcthread.cpp" line="358"/> + <location filename="../core/downloadfromdcthread.cpp" line="366"/> + <location filename="../core/downloadfromdcthread.cpp" line="386"/> + <location filename="../core/downloadfromdcthread.cpp" line="394"/> <source>Paired Bluetooth Devices</source> <translation type="unfinished"></translation> </message> |