diff --git a/config_5.4.3 b/config_5.4.3 index 497179f..7c4384a 100644 --- a/config_5.4.3 +++ b/config_5.4.3 @@ -2,6 +2,6 @@ HACKNAME=loc_cz HACKLANG=cs DEVICE=paperwhite2 VERSION=5.4.3 -RELEASE=r6 +RELEASE=r7 INSTALLKUG=yes README=cti-me diff --git a/config_5.4.4 b/config_5.4.4 index 8e6792e..216f17a 100644 --- a/config_5.4.4 +++ b/config_5.4.4 @@ -2,6 +2,6 @@ HACKNAME=loc_cz HACKLANG=cs DEVICE=paperwhite VERSION=5.4.4 -RELEASE=r3 +RELEASE=r4 INSTALLKUG=yes README=cti-me diff --git a/kindle_loc.sqlite b/kindle_loc.sqlite index 3173adc..158c397 100644 Binary files a/kindle_loc.sqlite and b/kindle_loc.sqlite differ diff --git a/signing/sign.sh b/signing/sign.sh old mode 100644 new mode 100755 index deb5a81..0f0990e --- a/signing/sign.sh +++ b/signing/sign.sh @@ -1,2 +1,4 @@ +#!/bin/bash -java -jar widgetsigner.jar -w "$1" -s 0 -k author.p12 -a 'HomebrewActiveContentExtensions' -p '' +BASE=$(dirname "$(readlink -f "$0")") +java -jar $BASE/widgetsigner.jar -w "$1" -s 0 -k $BASE/author.p12 -a 'HomebrewActiveContentExtensions' -p '' diff --git a/translate_acx b/translate_acx index e1069bc..635dca1 100755 --- a/translate_acx +++ b/translate_acx @@ -42,12 +42,12 @@ do while read src tran do tran=$(sed 's|&|\\&|g' <<<"$tran") - [ -n "$tran" ] && sed -i "s|'$src'|'$tran'|g; s|"'"'"$src"'"'"|"'"'"$tran"'"'"|g;" "$jsfile.native" + [ -n "$tran" ] && sed -i "s|:[[:space:]]*'$src'|: '$tran'|g; s|:[[:space:]]*"'"'"$src"'"'"|: "'"'"$tran"'"'"|g;" "$jsfile.native" done < <(sqlite3 -separator " " $root/../kindle_loc.sqlite "select src,tran from trans where file='""$jsfile""' and ver='""$VER""' ;") IFS=$OLDIFS native2ascii "$jsfile.native" "$jsfile" rm -f "$jsfile.native" -done < <(find $orig -path '*/locales/en-gb/*.js' -exec bash -c 'js={}; mv -f {} {}.ee; js-beautify -o {} {}.ee; rm -f {}.ee' \; -print) +done < <(find $orig \( -path '*/locales/en-gb/*.js' -or -path '*/endactions.acx/Strings.js' \) -exec bash -c 'js={}; mv -f {} {}.ee; js-beautify -o {} {}.ee; rm -f {}.ee' \; -print) cd $root/../build/acx while read xml do @@ -57,7 +57,12 @@ do while read src tran do tran=$(sed 's|&|&|g' <<<"$tran") - [ -n "$tran" ] && sed -i "s|\"en-gb\">$src|\"en-gb\">$tran|g;" "$xml" + if [ "$VER" == "5.3.7" ] + then + [ -n "$tran" ] && sed -i "s|>$src|>$tran|g;s|$src|$tran|g;" "$xml" + else + [ -n "$tran" ] && sed -i "s|\"en-gb\">$src|\"en-gb\">$tran|g;" "$xml" + fi done < <(sqlite3 -separator " " $root/../kindle_loc.sqlite "select src,tran from trans where file='""$xml""' and ver='""$VER""' ;") IFS=$OLDIFS done < <(find $orig -path '*/config.xml' -print)