diff --git a/.ackrc b/.ackrc new file mode 100644 index 0000000000000000000000000000000000000000..6268ded9935795646809491b7c3e665302b4db17 --- /dev/null +++ b/.ackrc @@ -0,0 +1 @@ +--ignore-dir=doc diff --git a/README.md b/README.md index c40af9f04c979c2c20cab3e591c35f0c5b06cb3d..ac22acbd7de728c767bd37269ea51563a409a3a8 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ You need to install Qt like this instead of using packages from say a Linux dist ###### Install additional packages: * Ubuntu: sudo apt-get install espeak libespeak-dev libudev-dev libsdl1.2-dev -* Fedora: sudo yum install espeak espeak-devel SDL-devel SDL-static systemd-devel +* Fedora: sudo dnf install espeak espeak-devel SDL-devel SDL-static systemd-devel * Arch Linux: pacman -Sy espeak * Windows: [USB Driver](http://www.pixhawk.org/firmware/downloads) to connect to Pixhawk/PX4Flow/3DR Radio * Android: [Qt Android Setup](http://doc.qt.io/qt-5/androidgs.html) diff --git a/qgroundcontrol.desktop b/qgroundcontrol.desktop old mode 100755 new mode 100644 diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index b8b83f0dfab1c9515941be96bdcc696f0c58eed2..8d72286c5e434a2a02e4f143dab4a22a4bcd09a4 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -18,7 +18,7 @@ # ------------------------------------------------- exists($${OUT_PWD}/qgroundcontrol.pro) { - error("You must use shadow build.") + error("You must use shadow build (e.g. mkdir build; cd build; qmake ../qgroundcontrol.pro).") } message(Qt version $$[QT_VERSION]) diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index dbd2f7142aefbbf033aa1be97337dec41e96ca8b..a4279015e5358e8b6df0cc43b1e30da3396a40b3 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -742,7 +742,7 @@ QGCView { width: sendSaveRow.width wrapMode: Text.WordWrap text: syncNeeded && !controller.autoSync ? - "You have unsaved changed to you mission. You should send to your vehicle, or save to a file:" : + "You have unsaved changes to you mission. You should send to your vehicle, or save to a file:" : "Sync:" }