diff --git a/.gitignore b/.gitignore index c0b4e402..b8e4555b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ .DS_Store /build /captures -release/GuitarDB/ diff --git a/app/src/main/java/igrek/songbook/logic/app/App.java b/app/src/main/java/igrek/songbook/logic/app/App.java index d376ca44..8a9ac9bd 100644 --- a/app/src/main/java/igrek/songbook/logic/app/App.java +++ b/app/src/main/java/igrek/songbook/logic/app/App.java @@ -213,7 +213,6 @@ private void restoreScrollPosition(String path) { private void showUIHelp() { AlertDialog.Builder dlgAlert = new AlertDialog.Builder(activity); - //TODO tłumaczenie na angielski dlgAlert.setMessage(userInfo.resString(R.string.ui_help_content)); dlgAlert.setTitle(userInfo.resString(R.string.ui_help)); dlgAlert.setPositiveButton(userInfo.resString(R.string.action_info_ok), new DialogInterface.OnClickListener() { diff --git a/git-merge-lang.py b/git-merge-lang.py deleted file mode 100644 index f74443e2..00000000 --- a/git-merge-lang.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -import sys -from subprocess import call, check_output - -def shellExec(cmd): - errCode = call(cmd, shell=True) - if errCode != 0: - fatalError('failed executing: ' + cmd) - -def fatalError(message): - print '[ERROR] ' + message - sys.exit() - -shellExec('git checkout pl-lang') -shellExec('git merge master') -shellExec('git checkout master') - -print 'done' \ No newline at end of file diff --git a/make-release.py b/make-release.py index a41cf40e..ee5f8d74 100644 --- a/make-release.py +++ b/make-release.py @@ -64,8 +64,7 @@ def readline(self): # aktualizacja zmian z bazy źródłowej print 'updating ' + guitarDBDir + '...' os.chdir(guitarDBDir) -shellExec('git pull origin master') -shellExec('git merge master') +shellExec('git pull origin release-en') os.chdir('..') shellExec('cp ' + apkSrc + ' ' + apkOutputFile) diff --git a/release/guitarDB b/release/guitarDB index a21a99bf..26c70130 160000 --- a/release/guitarDB +++ b/release/guitarDB @@ -1 +1 @@ -Subproject commit a21a99bfc733406e7d3874e5b45151e9069c010b +Subproject commit 26c70130c98688aebd64ae550993402cb3afcb9f