diff --git a/README.rst b/README.rst index 6244b50a6..7c198e625 100644 --- a/README.rst +++ b/README.rst @@ -75,7 +75,7 @@ Compile the protobuf description file:: Create translations (optional):: sudo apt-get install python-requests gettext - ./contrib/make_locale + ./contrib/pull_locale diff --git a/contrib/build-linux/README.md b/contrib/build-linux/README.md index 22705a435..2bbe4c320 100644 --- a/contrib/build-linux/README.md +++ b/contrib/build-linux/README.md @@ -3,19 +3,13 @@ Source tarballs ✗ _This script does not produce reproducible output (yet!)._ -1. Build locale files - - ``` - contrib/make_locale - ``` - -2. Prepare python dependencies used by Electrum. +1. Prepare python dependencies used by Electrum. ``` contrib/make_packages ``` -3. Create source tarball. +2. Create source tarball. ``` contrib/make_tgz diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index d0c680603..145d9b35b 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -20,13 +20,12 @@ here="$(dirname "$(readlink -e "$0")")" pushd $WINEPREFIX/drive_c/electrum -# Load electrum-locale for this release -git submodule init -git submodule update - VERSION=`git describe --tags --dirty --always` info "Last commit: $VERSION" +# Load electrum-locale for this release +git submodule update --init + pushd ./contrib/deterministic-build/electrum-locale if ! which msgfmt > /dev/null 2>&1; then fail "Please install gettext" diff --git a/contrib/make_apk b/contrib/make_apk index 115b28ee9..d6d48d73e 100755 --- a/contrib/make_apk +++ b/contrib/make_apk @@ -8,7 +8,7 @@ PACKAGES="$ROOT_FOLDER"/packages/ LOCALE="$ROOT_FOLDER"/electrum/locale/ if [ ! -d "$LOCALE" ]; then - echo "Run make_locale first!" + echo "Run pull_locale first!" exit 1 fi diff --git a/contrib/make_tgz b/contrib/make_tgz index 9fcafbd59..4505d2c2e 100755 --- a/contrib/make_tgz +++ b/contrib/make_tgz @@ -25,6 +25,7 @@ git submodule update --init dir="$ROOT_FOLDER"/electrum/$i/LC_MESSAGES mkdir -p $dir msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true + cp $i/electrum.po "$ROOT_FOLDER"/electrum/$i/electrum.po done ) diff --git a/electrum/gui/kivy/Readme.md b/electrum/gui/kivy/Readme.md index f0b4b52cd..29c9678c5 100644 --- a/electrum/gui/kivy/Readme.md +++ b/electrum/gui/kivy/Readme.md @@ -30,7 +30,7 @@ folder. 3. Build locale files ``` - $ ./contrib/make_locale + $ ./contrib/pull_locale ``` 4. Prepare pure python dependencies