Merge branch 'charlesmchen/l10nScriptVsSSK'

Signal/translations/bin/auto-genstrings

@@ -6,21 +6,7 @@ BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 REPO_ROOT=$BIN_DIR/../../..
 cd $REPO_ROOT
 
-SSK_DIR="../SignalServiceKit/src"
+SSK_DIR="./SignalServiceKit/src"
-
-pushd $SSK_DIR
-CURRENT_SSK_BRANCH=$(git status|awk 'NR==1{print $3}')
-if [ $CURRENT_SSK_BRANCH != "master" ]
-then
-  if [[ $* == *--non-master* ]]
-  then
-    echo "[!] Note - generating from non-master SSK."
-  else
-    echo "[!] Error - SSK must be on master to be sure we're generating up-to-date strings, or use '--non-master'."
-    exit 1
-  fi
-fi
-popd
 
 TARGETS="Signal/src ${SSK_DIR}"
 TMP="$(mktemp -d)"