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 @@
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:title="@string/action_settings"
+        android:title="@string/menu_settings"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_show_folder"
@@ -15,6 +15,6 @@
     <item
         android:id="@+id/action_about"
         android:orderInCategory="100"
-        android:title="@string/about"
+        android:title="@string/menu_about"
         app:showAsAction="never" />
 </menu>
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 @@
         <item>Stereo</item>
     </string-array>
 
-    <string name="action_settings">Einstellungen</string>
     <string name="not_permitted">Nicht erlaubt</string>
     <string name="no_folder_app">Keine App zur Anzeige von Ordnern installiert</string>
     <string name="hold_by_call">pause (bei Anruf)</string>
-    <string name="recording">aufnehmen</string>
-    <string name="encoding">encoding</string>
-    <string name="pause">pause</string>
-    <string name="edit">bearbeiten</string>
+    <string name="recording_status_recording">aufnehmen</string>
+    <string name="recording_status_encoding">encoding</string>
+    <string name="recording_status_pause">pause</string>
+    <string name="recording_status_edit">bearbeiten</string>
     <string name="confirm_cancel">Bestätige Abbruch</string>
-    <string name="are_you_sure_cancel">Willst du wirklich abbrechen?</string>
     <string name="encoding_title">Encoding...</string>
     <string name="recording_title">Aufnahme</string>
     <string name="pause_title">Pause...</string>
@@ -38,7 +36,6 @@
     <string name="recording_list_is_empty">Aufnahmeliste ist leer\n\nDrücke \'Aufnehmen\' um die Aufnahme zu starten</string>
     <string name="record_button">Record</string>
     <string name="cut_button">Cut</string>
-    <string name="play_button">Play</string>
     <string name="stop_button">Stop</string>
     <string name="cancel_button">Cancel</string>
     <string name="pause_button">Pause</string>
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 @@
         <item>Stereo</item>
     </string-array>
 
-    <string name="action_settings">Impostazioni</string>
     <string name="not_permitted">Non permesso</string>
     <string name="no_folder_app">Nessuna app per la visione delle cartelle risulta installa</string>
     <string name="hold_by_call">pausa (per chiamata)</string>
-    <string name="recording">registrando</string>
-    <string name="encoding">encoding</string>
-    <string name="pause">pausa</string>
-    <string name="edit">modifica</string>
+    <string name="recording_status_recording">registrando</string>
+    <string name="recording_status_encoding">encoding</string>
+    <string name="recording_status_pause">pausa</string>
+    <string name="recording_status_edit">modifica</string>
     <string name="confirm_cancel">Conferma annullamento</string>
-    <string name="are_you_sure_cancel">Sei sicuro di voler annullare la registrazione?</string>
     <string name="encoding_title">Codifica in corso ...</string>
     <string name="pause_title">Pausa...</string>
     <string name="recording_title">Registrando</string>
@@ -38,7 +36,6 @@
     <string name="recording_list_is_empty">La lista delle registrazioni è vuota\n\nClicca Registra per iniziare a registrare</string>
     <string name="record_button">Record</string>
     <string name="cut_button">Cut</string>
-    <string name="play_button">Play</string>
     <string name="stop_button">Stop</string>
     <string name="cancel_button">Cancel</string>
     <string name="pause_button">Pause</string>
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 @@
         <item>ステレオ</item>
     </string-array>
 
-    <string name="action_settings">設定</string>
     <string name="not_permitted">許可されていません</string>
     <string name="no_folder_app">フォルダーを表示するアプリケーションがインストールされていません</string>
     <string name="hold_by_call">一時停止 (着信により保留)</string>
-    <string name="recording">録音中</string>
-    <string name="encoding">エンコーディング</string>
-    <string name="pause">一時停止</string>
-    <string name="edit">編集</string>
+    <string name="recording_status_recording">録音中</string>
+    <string name="recording_status_encoding">エンコーディング</string>
+    <string name="recording_status_pause">一時停止</string>
+    <string name="recording_status_edit">編集</string>
     <string name="confirm_cancel">キャンセルの確認</string>
-    <string name="are_you_sure_cancel">キャンセルしてもよろしいですか?</string>
     <string name="encoding_title">エンコード中...</string>
     <string name="recording_title">録音中</string>
     <string name="pause_title">一時停止...</string>
@@ -38,7 +36,6 @@
     <string name="recording_list_is_empty">録音リストは空です\n\n録音をクリックすると録音を開始します</string>
     <string name="record_button">Record</string>
     <string name="cut_button">Cut</string>
-    <string name="play_button">Play</string>
     <string name="stop_button">Stop</string>
     <string name="cancel_button">Cancel</string>
     <string name="pause_button">Pause</string>
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 @@
         <item>Estéreo</item>
     </string-array>
 
-    <string name="action_settings">Configurações</string>
     <string name="not_permitted">Não permitido</string>
     <string name="no_folder_app">Não foi encontrado um aplicativo para explorar arquivos</string>
     <string name="hold_by_call">pausado (chamada atendida)</string>
-    <string name="recording">gravando</string>
-    <string name="encoding">codificando</string>
-    <string name="pause">pausado</string>
-    <string name="edit">editando</string>
+    <string name="recording_status_recording">gravando</string>
+    <string name="recording_status_encoding">codificando</string>
+    <string name="recording_status_pause">pausado</string>
+    <string name="recording_status_edit">editando</string>
     <string name="confirm_cancel">Confirme o cancelamento</string>
-    <string name="are_you_sure_cancel">Tem certeza que deseja cancelar?</string>
     <string name="encoding_title">Codificando...</string>
     <string name="recording_title">Gravando</string>
     <string name="pause_title">Pausado...</string>
@@ -38,7 +36,6 @@
     <string name="recording_list_is_empty">A lista de gravações está vazia\n\nToque no ícone de microfone para começar a gravar</string>
     <string name="record_button">Record</string>
     <string name="cut_button">Cut</string>
-    <string name="play_button">Play</string>
     <string name="stop_button">Stop</string>
     <string name="cancel_button">Cancel</string>
     <string name="pause_button">Pause</string>
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 @@
         <item>Стерео</item>
     </string-array>
 
-    <string name="action_settings">Настройки</string>
     <string name="not_permitted">Доступ запрещен</string>
     <string name="no_folder_app">Программа для просмотра папок не установлена</string>
     <string name="hold_by_call">пауза (звонок)</string>
-    <string name="recording">запись</string>
-    <string name="encoding">кодировка</string>
-    <string name="pause">пауза</string>
-    <string name="edit">редактор</string>
+    <string name="recording_status_recording">запись</string>
+    <string name="recording_status_encoding">кодировка</string>
+    <string name="recording_status_pause">пауза</string>
+    <string name="recording_status_edit">редактор</string>
     <string name="confirm_cancel">Отменить запись</string>
-    <string name="are_you_sure_cancel">Вы уверены?</string>
     <string name="encoding_title">Кодирование...</string>
     <string name="recording_title">Запись...</string>
     <string name="pause_title">Пауза...</string>
@@ -38,7 +36,6 @@
     <string name="recording_list_is_empty">Список записей пуст.\n\nНажмите на \'Микрофон\' чтобы начать запись.</string>
     <string name="record_button">Запись</string>
     <string name="cut_button">Отрезать</string>
-    <string name="play_button">Играть</string>
     <string name="stop_button">Стоп</string>
     <string name="cancel_button">Отмена</string>
     <string name="pause_button">Пауза</string>
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 @@
         <item>%I</item>
     </string-array>
 
-    <string name="action_settings">Settings</string>
     <string name="not_permitted">Not permitted</string>
     <string name="no_folder_app">No folder view application installed</string>
     <string name="hold_by_call">pause (hold by call)</string>
-    <string name="recording">recording</string>
-    <string name="encoding">encoding</string>
-    <string name="pause">pause</string>
-    <string name="edit">edit</string>
+    <string name="recording_status_recording">recording</string>
+    <string name="recording_status_encoding">encoding</string>
+    <string name="recording_status_pause">pause</string>
+    <string name="recording_status_edit">edit</string>
     <string name="confirm_cancel">Confirm cancel</string>
-    <string name="are_you_sure_cancel">Are you sure you want to cancel?</string>
     <string name="encoding_title">Encoding...</string>
     <string name="pause_title">Pause...</string>
     <string name="recording_title">Recording</string>
@@ -70,7 +68,6 @@
     <string name="recording_list_is_empty">Recording List is Empty\n\nClick Record to Start Recording</string>
     <string name="record_button">Record</string>
     <string name="cut_button">Cut</string>
-    <string name="play_button">Play</string>
     <string name="stop_button">Stop</string>
     <string name="cancel_button">Cancel</string>
     <string name="pause_button">Pause</string>