From da0adbba8b7ce39f325f59f0feb6b724fe1a8ddb Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 2 Jul 2017 20:12:01 +0300 Subject: [PATCH] rename strings --- app/build.gradle | 2 +- .../activities/RecordingActivity.java | 17 +++++++---------- app/src/main/res/menu/menu_main.xml | 4 ++-- app/src/main/res/values-de/strings.xml | 11 ++++------- app/src/main/res/values-it/strings.xml | 11 ++++------- app/src/main/res/values-ja/strings.xml | 11 ++++------- app/src/main/res/values-pt-rBR/strings.xml | 11 ++++------- app/src/main/res/values-ru/strings.xml | 11 ++++------- app/src/main/res/values/strings.xml | 11 ++++------- 9 files changed, 34 insertions(+), 55 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ba16043..1db4fcf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,5 +43,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.github.axet:android-audio-library:1.0.11' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:1.0.12' // compile project(':android-audio-library') } diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index c2d1c04..9cede3e 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -40,7 +40,6 @@ import android.widget.Toast; import com.github.axet.androidlibrary.animations.MarginBottomAnimation; import com.github.axet.androidlibrary.sound.AudioTrack; import com.github.axet.audiolibrary.app.RawSamples; -import com.github.axet.audiolibrary.app.Recordings; import com.github.axet.audiolibrary.app.Sound; import com.github.axet.audiolibrary.encoders.Encoder; import com.github.axet.audiolibrary.encoders.EncoderInfo; @@ -59,8 +58,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; import java.nio.ShortBuffer; public class RecordingActivity extends AppCompatActivity { @@ -257,7 +254,7 @@ public class RecordingActivity extends AppCompatActivity { public void onClick(View v) { if (encoder != null) return; - stopRecording(getString(R.string.encoding)); + stopRecording(getString(R.string.recording_status_encoding)); try { encoding(new Runnable() { @Override @@ -275,7 +272,7 @@ public class RecordingActivity extends AppCompatActivity { if (a != null && a.equals(START_PAUSE)) { // pretend we already start it start = false; - stopRecording(getString(R.string.pause)); + stopRecording(getString(R.string.recording_status_pause)); } receiver = new RecordingReceiver(); @@ -333,7 +330,7 @@ public class RecordingActivity extends AppCompatActivity { void pauseButton() { if (thread != null) { - stopRecording(getString(R.string.pause)); + stopRecording(getString(R.string.recording_status_pause)); } else { editCut(); @@ -410,7 +407,7 @@ public class RecordingActivity extends AppCompatActivity { void edit(boolean show, boolean animate) { if (show) { - setState(getString(R.string.edit)); + setState(getString(R.string.recording_status_edit)); editPlay(false); View box = findViewById(R.id.recording_edit_box); @@ -445,7 +442,7 @@ public class RecordingActivity extends AppCompatActivity { }); } else { editSample = -1; - setState(getString(R.string.pause)); + setState(getString(R.string.recording_status_pause)); editPlay(false); pitch.edit(-1); pitch.stop(); @@ -549,7 +546,7 @@ public class RecordingActivity extends AppCompatActivity { void cancelDialog(final Runnable run, final Runnable cancel) { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.confirm_cancel); - builder.setMessage(R.string.are_you_sure_cancel); + builder.setMessage(R.string.are_you_sure); builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -607,7 +604,7 @@ public class RecordingActivity extends AppCompatActivity { edit(false, true); pitch.setOnTouchListener(null); - setState(getString(R.string.recording)); + setState(getString(R.string.recording_status_recording)); sound.silent(); diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 9987ca4..b2462ea 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a6519bc..8879227 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -21,16 +21,14 @@ Stereo - Einstellungen Nicht erlaubt Keine App zur Anzeige von Ordnern installiert pause (bei Anruf) - aufnehmen - encoding - pause - bearbeiten + aufnehmen + encoding + pause + bearbeiten Bestätige Abbruch - Willst du wirklich abbrechen? Encoding... Aufnahme Pause... @@ -38,7 +36,6 @@ Aufnahmeliste ist leer\n\nDrücke \'Aufnehmen\' um die Aufnahme zu starten Record Cut - Play Stop Cancel Pause diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 624dde5..dbe548f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -21,16 +21,14 @@ Stereo - Impostazioni Non permesso Nessuna app per la visione delle cartelle risulta installa pausa (per chiamata) - registrando - encoding - pausa - modifica + registrando + encoding + pausa + modifica Conferma annullamento - Sei sicuro di voler annullare la registrazione? Codifica in corso ... Pausa... Registrando @@ -38,7 +36,6 @@ La lista delle registrazioni è vuota\n\nClicca Registra per iniziare a registrare Record Cut - Play Stop Cancel Pause diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bf473b5..c9e69bd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -21,16 +21,14 @@ ステレオ - 設定 許可されていません フォルダーを表示するアプリケーションがインストールされていません 一時停止 (着信により保留) - 録音中 - エンコーディング - 一時停止 - 編集 + 録音中 + エンコーディング + 一時停止 + 編集 キャンセルの確認 - キャンセルしてもよろしいですか? エンコード中... 録音中 一時停止... @@ -38,7 +36,6 @@ 録音リストは空です\n\n録音をクリックすると録音を開始します Record Cut - Play Stop Cancel Pause diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 99cb84f..7c1070f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -21,16 +21,14 @@ Estéreo - Configurações Não permitido Não foi encontrado um aplicativo para explorar arquivos pausado (chamada atendida) - gravando - codificando - pausado - editando + gravando + codificando + pausado + editando Confirme o cancelamento - Tem certeza que deseja cancelar? Codificando... Gravando Pausado... @@ -38,7 +36,6 @@ A lista de gravações está vazia\n\nToque no ícone de microfone para começar a gravar Record Cut - Play Stop Cancel Pause diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 768a294..7a116ef 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -21,16 +21,14 @@ Стерео - Настройки Доступ запрещен Программа для просмотра папок не установлена пауза (звонок) - запись - кодировка - пауза - редактор + запись + кодировка + пауза + редактор Отменить запись - Вы уверены? Кодирование... Запись... Пауза... @@ -38,7 +36,6 @@ Список записей пуст.\n\nНажмите на \'Микрофон\' чтобы начать запись. Запись Отрезать - Играть Стоп Отмена Пауза diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 374dfa0..7070697 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -53,16 +53,14 @@ %I - Settings Not permitted No folder view application installed pause (hold by call) - recording - encoding - pause - edit + recording + encoding + pause + edit Confirm cancel - Are you sure you want to cancel? Encoding... Pause... Recording @@ -70,7 +68,6 @@ Recording List is Empty\n\nClick Record to Start Recording Record Cut - Play Stop Cancel Pause