Clean out tabs and trailing space

Harmonize some spacing

32 files changed, 1193 insertions, 1202 deletions

diff --git a/app/src/main/java/se/lublin/mumla/channel/AccessTokenFragment.java b/app/src/main/java/se/lublin/mumla/channel/AccessTokenFragment.java
index e200160..11e43c5 100644
--- a/app/src/main/java/se/lublin/mumla/channel/AccessTokenFragment.java
+++ b/app/src/main/java/se/lublin/mumla/channel/AccessTokenFragment.java
@@ -49,17 +49,17 @@ public class AccessTokenFragment extends HumlaServiceFragment {
         public void onAccessTokenRemoved(long serverId, String token);
     }
 
-	private List<String> mTokens;
-	
-	private ListView mTokenList;
-	private TokenAdapter mTokenAdapter;
-	private EditText mTokenField;
+    private List<String> mTokens;
+
+    private ListView mTokenList;
+    private TokenAdapter mTokenAdapter;
+    private EditText mTokenField;
 
     private DatabaseProvider mProvider;
 
     @Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
 
         mTokens = new ArrayList<String>(getAccessTokens());
         mTokenAdapter = new TokenAdapter(activity, mTokens);
@@ -69,59 +69,59 @@ public class AccessTokenFragment extends HumlaServiceFragment {
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString() + " must implement DatabaseProvider");
         }
-	}
-	
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_tokens, container, false);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_tokens, container, false);
 
         mTokenList = (ListView) view.findViewById(R.id.tokenList);
         mTokenList.setAdapter(mTokenAdapter);
 
         mTokenField = (EditText) view.findViewById(R.id.tokenField);
         mTokenField.setOnEditorActionListener(new OnEditorActionListener() {
-			
-			@Override
-			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-				if(actionId == EditorInfo.IME_ACTION_SEND) {
-					addToken();
-					return true;
-				}
-				return false;
-			}
-		});
-		
-		ImageButton addButton = (ImageButton) view.findViewById(R.id.tokenAddButton);
-		addButton.setOnClickListener(new OnClickListener() {
-			
-			@Override
-			public void onClick(View v) {
-				addToken();
-			}
-		});
-		
-		return view;
-	}
-
-	private void addToken() {
-		String tokenText = mTokenField.getText().toString().trim();
-		
-		if(tokenText.equals(""))
-			return;
+
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if(actionId == EditorInfo.IME_ACTION_SEND) {
+                    addToken();
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        ImageButton addButton = (ImageButton) view.findViewById(R.id.tokenAddButton);
+        addButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                addToken();
+            }
+        });
+
+        return view;
+    }
+
+    private void addToken() {
+        String tokenText = mTokenField.getText().toString().trim();
+
+        if(tokenText.equals(""))
+            return;
 
         mTokenField.setText("");
-		
-		Log.i(Constants.TAG, "Adding token: " + tokenText);
-		
-		mTokens.add(tokenText);
-		mTokenAdapter.notifyDataSetChanged();
 
-		mTokenList.smoothScrollToPosition(mTokens.size() - 1);
+        Log.i(Constants.TAG, "Adding token: " + tokenText);
+
+        mTokens.add(tokenText);
+        mTokenAdapter.notifyDataSetChanged();
+
+        mTokenList.smoothScrollToPosition(mTokens.size() - 1);
         mProvider.getDatabase().addAccessToken(getServerId(), tokenText);
-		if (getService().isConnected()) {
-			getService().getSession().sendAccessTokens(mTokens);
-		}
+        if (getService().isConnected()) {
+            getService().getSession().sendAccessTokens(mTokens);
+        }
     }
 
     private long getServerId() {
@@ -131,43 +131,43 @@ public class AccessTokenFragment extends HumlaServiceFragment {
     private List<String> getAccessTokens() {
         return getArguments().getStringArrayList("access_tokens");
     }
-	
-	private class TokenAdapter extends ArrayAdapter<String> {
-
-		public TokenAdapter(Context context,
-				List<String> objects) {
-			super(context, android.R.layout.simple_list_item_1, objects);
-		}
-		
-		@Override
-		public View getView(final int position, View convertView, ViewGroup parent) {
-			View view = convertView;
-			if(convertView == null) {
-				view = getActivity().getLayoutInflater().inflate(R.layout.token_row, null, false);
-			}
-			
-			final String token = getItem(position);
-			
-			TextView title = (TextView) view.findViewById(R.id.tokenItemTitle);
-			title.setText(token);
-			
-			ImageButton deleteButton = (ImageButton) view.findViewById(R.id.tokenItemDelete);
-			deleteButton.setOnClickListener(new OnClickListener() {
-				
-				@Override
-				public void onClick(View v) {
+
+    private class TokenAdapter extends ArrayAdapter<String> {
+
+        public TokenAdapter(Context context,
+                List<String> objects) {
+            super(context, android.R.layout.simple_list_item_1, objects);
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            View view = convertView;
+            if(convertView == null) {
+                view = getActivity().getLayoutInflater().inflate(R.layout.token_row, null, false);
+            }
+
+            final String token = getItem(position);
+
+            TextView title = (TextView) view.findViewById(R.id.tokenItemTitle);
+            title.setText(token);
+
+            ImageButton deleteButton = (ImageButton) view.findViewById(R.id.tokenItemDelete);
+            deleteButton.setOnClickListener(new OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
                     mTokens.remove(position);
-					notifyDataSetChanged();
+                    notifyDataSetChanged();
                     mProvider.getDatabase().removeAccessToken(getServerId(), token);
-					if (getService().isConnected()) {
-						getService().getSession().sendAccessTokens(mTokens);
-					}
+                    if (getService().isConnected()) {
+                        getService().getSession().sendAccessTokens(mTokens);
+                    }
                 }
-			});
+            });
 
-			return view;
-		}
-		
-	}
+            return view;
+        }
+
+    }
 
 }
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java b/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
index 5493597..c647477 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
@@ -66,7 +66,7 @@ import se.lublin.mumla.util.MumbleImageGetter;
 public class ChannelChatFragment extends HumlaServiceFragment implements ChatTargetProvider.OnChatTargetSelectedListener {
     private static final Pattern LINK_PATTERN = Pattern.compile("(https?://\\S+)");
 
-	private IHumlaObserver mServiceObserver = new HumlaObserver() {
+    private IHumlaObserver mServiceObserver = new HumlaObserver() {
 
         @Override
         public void onMessageLogged(IMessage message) {
@@ -105,8 +105,8 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
 
     private ListView mChatList;
     private ChannelChatAdapter mChatAdapter;
-	private EditText mChatTextEdit;
-	private ImageButton mSendButton;
+    private EditText mChatTextEdit;
+    private ImageButton mSendButton;
     private ChatTargetProvider mTargetProvider;
 
     @Override
@@ -138,29 +138,29 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
     }
 
     @Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_chat, container, false);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_chat, container, false);
         mChatList = (ListView) view.findViewById(R.id.chat_list);
-		mChatTextEdit = (EditText) view.findViewById(R.id.chatTextEdit);
-		
-		mSendButton = (ImageButton) view.findViewById(R.id.chatTextSend);
-		mSendButton.setOnClickListener(new OnClickListener() {
+        mChatTextEdit = (EditText) view.findViewById(R.id.chatTextEdit);
+
+        mSendButton = (ImageButton) view.findViewById(R.id.chatTextSend);
+        mSendButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 sendMessage();
             }
         });
-		
-		mChatTextEdit.setOnEditorActionListener(new OnEditorActionListener() {
+
+        mChatTextEdit.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 sendMessage();
                 return true;
             }
         });
-		
-		mChatTextEdit.addTextChangedListener(new TextWatcher() {
+
+        mChatTextEdit.addTextChangedListener(new TextWatcher() {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -179,7 +179,7 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
 
         updateChatTargetText(mTargetProvider.getChatTarget());
         return view;
-	}
+    }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
@@ -202,7 +202,7 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
      * @param scroll Whether to scroll to the bottom after adding the message.
      */
     public void addChatMessage(IChatMessage message, boolean scroll) {
-		if(mChatAdapter == null) return;
+        if(mChatAdapter == null) return;
 
         mChatAdapter.add(message);
 
@@ -215,14 +215,14 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
                 }
             });
         }
-	}
+    }
 
     /**
      * Sends the message currently in {@link se.lublin.mumla.channel.ChannelChatFragment#mChatTextEdit}
      * to the remote server. Clears the message box if the message was sent successfully.
      * @throws HumlaDisconnectedException If the service is disconnected.
      */
-	private void sendMessage() throws HumlaDisconnectedException {
+    private void sendMessage() throws HumlaDisconnectedException {
         if(mChatTextEdit.length() == 0) return;
         String message = mChatTextEdit.getText().toString();
         String formattedMessage = markupOutgoingMessage(message);
@@ -237,7 +237,7 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
             responseMessage = session.sendChannelTextMessage(target.getChannel().getId(), formattedMessage, false);
         addChatMessage(new IChatMessage.TextMessage(responseMessage), true);
         mChatTextEdit.setText("");
-	}
+    }
 
     /**
      * Adds HTML markup to the message, replacing links and newlines.
@@ -251,16 +251,16 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
                 .replaceAll("\n", "<br>");
         return formattedBody;
     }
-	
-	public void clear() {
+
+    public void clear() {
         mChatAdapter.clear();
         getService().clearMessageLog();
     }
 
-	/**
-	 * Updates hint displaying chat target.
-	 */
-	public void updateChatTargetText(final ChatTargetProvider.ChatTarget target) {
+    /**
+     * Updates hint displaying chat target.
+     */
+    public void updateChatTargetText(final ChatTargetProvider.ChatTarget target) {
         if(getService() == null || !getService().isConnected()) return;
 
         IHumlaSession session = getService().getSession();
@@ -274,7 +274,7 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
         }
         mChatTextEdit.setHint(hint);
         mChatTextEdit.requestLayout(); // Needed to update bounds after hint change.
-	}
+    }
 
 
     @Override
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java b/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java
index 2bbb394..f040fb6 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java
@@ -58,7 +58,7 @@ import se.lublin.mumla.util.HumlaServiceFragment;
 
 public class ChannelListFragment extends HumlaServiceFragment implements OnChannelClickListener, OnUserClickListener, SharedPreferences.OnSharedPreferenceChangeListener {
 
-	private IHumlaObserver mServiceObserver = new HumlaObserver() {
+    private IHumlaObserver mServiceObserver = new HumlaObserver() {
         @Override
         public void onDisconnected(HumlaException e) {
             mChannelView.setAdapter(null);
@@ -75,16 +75,16 @@ public class ChannelListFragment extends HumlaServiceFragment implements OnChann
         }
 
         @Override
-		public void onChannelAdded(IChannel channel) {
+        public void onChannelAdded(IChannel channel) {
             mChannelListAdapter.updateChannels();
-			mChannelListAdapter.notifyDataSetChanged();
-		}
+            mChannelListAdapter.notifyDataSetChanged();
+        }
 
-		@Override
-		public void onChannelRemoved(IChannel channel) {
+        @Override
+        public void onChannelRemoved(IChannel channel) {
             mChannelListAdapter.updateChannels();
-			mChannelListAdapter.notifyDataSetChanged();
-		}
+            mChannelListAdapter.notifyDataSetChanged();
+        }
 
         @Override
         public void onChannelStateUpdated(IChannel channel) {
@@ -119,7 +119,7 @@ public class ChannelListFragment extends HumlaServiceFragment implements OnChann
         public void onUserTalkStateUpdated(IUser user) {
             mChannelListAdapter.animateUserStateUpdate(user, mChannelView);
         }
-	};
+    };
 
     private BroadcastReceiver mBluetoothReceiver = new BroadcastReceiver() {
         @Override
@@ -129,8 +129,8 @@ public class ChannelListFragment extends HumlaServiceFragment implements OnChann
         }
     };
 
-	private RecyclerView mChannelView;
-	private ChannelListAdapter mChannelListAdapter;
+    private RecyclerView mChannelView;
+    private ChannelListAdapter mChannelListAdapter;
     private ChatTargetProvider mTargetProvider;
     private DatabaseProvider mDatabaseProvider;
     private ActionMode mActionMode;
@@ -324,22 +324,22 @@ public class ChannelListFragment extends HumlaServiceFragment implements OnChann
         mChannelListAdapter.setOnUserClickListener(this);
         mChannelView.setAdapter(mChannelListAdapter);
         mChannelListAdapter.notifyDataSetChanged();
-	}
+    }
 
-	/**
-	 * Scrolls to the passed channel.
-	 */
-	public void scrollToChannel(int channelId) {
-		int channelPosition = mChannelListAdapter.getChannelPosition(channelId);
+    /**
+     * Scrolls to the passed channel.
+     */
+    public void scrollToChannel(int channelId) {
+        int channelPosition = mChannelListAdapter.getChannelPosition(channelId);
         mChannelView.scrollToPosition(channelPosition);
     }
-	/**
-	 * Scrolls to the passed user.
-	 */
-	public void scrollToUser(int userId) {
-		int userPosition = mChannelListAdapter.getUserPosition(userId);
-		mChannelView.scrollToPosition(userPosition);
-	}
+    /**
+     * Scrolls to the passed user.
+     */
+    public void scrollToUser(int userId) {
+        int userPosition = mChannelListAdapter.getUserPosition(userId);
+        mChannelView.scrollToPosition(userPosition);
+    }
 
     private boolean isShowingPinnedChannels() {
         return getArguments().getBoolean("pinned");
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java b/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
index 3b2d170..444d457 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
@@ -42,60 +42,60 @@ import se.lublin.mumla.R;
 import se.lublin.mumla.service.MumlaService;
 
 public class ChannelSearchProvider extends ContentProvider {
-	
-	public static final String INTENT_DATA_CHANNEL = "channel";
-	public static final String INTENT_DATA_USER = "user";
+
+    public static final String INTENT_DATA_CHANNEL = "channel";
+    public static final String INTENT_DATA_USER = "user";
 
     private IHumlaService mService;
     private final Object mServiceLock = new Object();
 
-	private ServiceConnection mConn = new ServiceConnection() {
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
-			mService = ((MumlaService.MumlaBinder) service).getService();
+    private ServiceConnection mConn = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = ((MumlaService.MumlaBinder) service).getService();
             synchronized (mServiceLock) {
                 mServiceLock.notify();
             }
-		}
-
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
-			mService = null;
-		}
-	};
-	
-	@Override
-	public int delete(Uri uri, String selection, String[] selectionArgs) {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public String getType(Uri uri) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Uri insert(Uri uri, ContentValues values) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean onCreate() {
-		return true;
-	}
-	
-
-	@Override
-	public Cursor query(Uri uri, String[] projection, String selection,
-			String[] selectionArgs, String sortOrder) {	
-		
-		// Try to connect to the service. Wait for conn to establish.
-		if(mService == null) {
-			Intent serviceIntent = new Intent(getContext(), MumlaService.class);
-			getContext().bindService(serviceIntent, mConn, 0);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+        }
+    };
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+
+        // Try to connect to the service. Wait for conn to establish.
+        if(mService == null) {
+            Intent serviceIntent = new Intent(getContext(), MumlaService.class);
+            getContext().bindService(serviceIntent, mConn, 0);
 
             synchronized (mServiceLock) {
                 try {
@@ -109,23 +109,23 @@ public class ChannelSearchProvider extends ContentProvider {
                     return null;
                 }
             }
-		}
+        }
 
         if (!mService.isConnected())
             return null;
 
         IHumlaSession session = mService.getSession();
-		
-		String query = "";
-		for(int x=0;x<selectionArgs.length;x++) {
-			query += selectionArgs[x];
-			if(x != selectionArgs.length-1)
-				query += " ";
-		}
-		
-		query = query.toLowerCase(Locale.getDefault());
-		
-		MatrixCursor cursor = new MatrixCursor(new String[] { "_ID", SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA, SearchManager.SUGGEST_COLUMN_TEXT_1, SearchManager.SUGGEST_COLUMN_ICON_1, SearchManager.SUGGEST_COLUMN_TEXT_2, SearchManager.SUGGEST_COLUMN_INTENT_DATA });
+
+        String query = "";
+        for(int x=0;x<selectionArgs.length;x++) {
+            query += selectionArgs[x];
+            if(x != selectionArgs.length-1)
+                query += " ";
+        }
+
+        query = query.toLowerCase(Locale.getDefault());
+
+        MatrixCursor cursor = new MatrixCursor(new String[] { "_ID", SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA, SearchManager.SUGGEST_COLUMN_TEXT_1, SearchManager.SUGGEST_COLUMN_ICON_1, SearchManager.SUGGEST_COLUMN_TEXT_2, SearchManager.SUGGEST_COLUMN_INTENT_DATA });
 
         List<IChannel> channels = channelSearch(session.getRootChannel(), query);
         List<IUser> users = userSearch(session.getRootChannel(), query);
@@ -139,8 +139,8 @@ public class ChannelSearchProvider extends ContentProvider {
             IUser user = users.get(x);
             cursor.addRow(new Object[] { x, INTENT_DATA_USER, user.getName(), R.drawable.ic_action_user_dark, getContext().getString(R.string.user), user.getSession() });
         }
-		return cursor;
-	}
+        return cursor;
+    }
 
     /**
      * Recursively searches the channel tree for a user with a name containing the given string,
@@ -205,11 +205,11 @@ public class ChannelSearchProvider extends ContentProvider {
         }
     }
 
-	@Override
-	public int update(Uri uri, ContentValues values, String selection,
-			String[] selectionArgs) {
-		// TODO Auto-generated method stub
-		return 0;
-	}
+    @Override
+    public int update(Uri uri, ContentValues values, String selection,
+            String[] selectionArgs) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
 
 }
diff --git a/app/src/main/java/se/lublin/mumla/db/PublicServer.java b/app/src/main/java/se/lublin/mumla/db/PublicServer.java
index df6182a..725edd0 100644
--- a/app/src/main/java/se/lublin/mumla/db/PublicServer.java
+++ b/app/src/main/java/se/lublin/mumla/db/PublicServer.java
@@ -22,44 +22,44 @@ import se.lublin.humla.model.Server;
 
 public class PublicServer extends Server {
 
-	private String mCA;
-	private String mContinentCode;
-	private String mCountry;
-	private String mCountryCode;
-	private String mRegion;
-	private String mUrl;
-	
-	public PublicServer(String name, String ca, String continentCode, String country, String countryCode, String ip, Integer port, String region, String url) {
+    private String mCA;
+    private String mContinentCode;
+    private String mCountry;
+    private String mCountryCode;
+    private String mRegion;
+    private String mUrl;
+
+    public PublicServer(String name, String ca, String continentCode, String country, String countryCode, String ip, Integer port, String region, String url) {
         super(-1, name, ip, port, "", "");
-		mCA = ca;
-		mContinentCode = continentCode;
-		mCountry = country;
-		mCountryCode = countryCode;
-		mRegion = region;
-		mUrl = url;
-	}
-	
-	public String getCA() {
-		return mCA;
-	}
+        mCA = ca;
+        mContinentCode = continentCode;
+        mCountry = country;
+        mCountryCode = countryCode;
+        mRegion = region;
+        mUrl = url;
+    }
+
+    public String getCA() {
+        return mCA;
+    }
 
-	public String getContinentCode() {
-		return mContinentCode;
-	}
+    public String getContinentCode() {
+        return mContinentCode;
+    }
 
-	public String getCountry() {
-		return mCountry;
-	}
+    public String getCountry() {
+        return mCountry;
+    }
 
-	public String getCountryCode() {
-		return mCountryCode;
-	}
+    public String getCountryCode() {
+        return mCountryCode;
+    }
 
-	public String getRegion() {
-		return mRegion;
-	}
+    public String getRegion() {
+        return mRegion;
+    }
 
-	public String getUrl() {
-		return mUrl;
-	}
+    public String getUrl() {
+        return mUrl;
+    }
 }
diff --git a/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java b/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java
index 7b791b3..7afc13e 100644
--- a/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java
+++ b/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java
@@ -36,101 +36,101 @@ import android.widget.TextView;
 import se.lublin.mumla.R;
 
 public class KeySelectDialogPreference extends DialogPreference implements OnKeyListener {
-	
-	//private static final String ANDROID_NAMESPACE = "http://schemas.android.com/apk/res/android";
-
-	private TextView valueTextView;
-	private int keyCode;
-	
-	public KeySelectDialogPreference(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-	
-	@Override
-	protected void onPrepareDialogBuilder(Builder builder) {
-		super.onPrepareDialogBuilder(builder);
-		
-		builder.setOnKeyListener(this);
-		builder.setNeutralButton(R.string.reset_key, new OnClickListener() {
-			
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				keyCode = 0;
-				valueTextView.setText("No Key");
+
+    //private static final String ANDROID_NAMESPACE = "http://schemas.android.com/apk/res/android";
+
+    private TextView valueTextView;
+    private int keyCode;
+
+    public KeySelectDialogPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(Builder builder) {
+        super.onPrepareDialogBuilder(builder);
+
+        builder.setOnKeyListener(this);
+        builder.setNeutralButton(R.string.reset_key, new OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                keyCode = 0;
+                valueTextView.setText("No Key");
                 persistInt(keyCode); // Neutral is a 'negative' response to android, we save manually here.
-			}
-		});
-	}
-	
-	@Override
-	protected View onCreateDialogView() {
-		LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-		LinearLayout layout = new LinearLayout(getContext());
-	    layout.setOrientation(LinearLayout.VERTICAL);
-	    layout.setPadding(6,6,6,6);
-		
-		TextView promptTextView = new TextView(getContext());
-		promptTextView.setText(R.string.pressKey);
-	    promptTextView.setGravity(Gravity.CENTER_HORIZONTAL);
-		
-		valueTextView = new TextView(getContext());
-		valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
-	    valueTextView.setGravity(Gravity.CENTER_HORIZONTAL);
-	    valueTextView.setPadding(0, 12, 0, 12);
-		
-	    TextView alertTextView = new TextView(getContext());
-	    alertTextView.setText(R.string.pressKeyInfo);
-	    alertTextView.setGravity(Gravity.CENTER_HORIZONTAL);
-	    alertTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
-	    
-		layout.addView(promptTextView, params);
-		layout.addView(valueTextView, params);
-		layout.addView(alertTextView);
-		
-		return layout;
-	}
-	
-	@Override
-	protected void onSetInitialValue(boolean restorePersistedValue,
-			Object defaultValue) {
-		super.onSetInitialValue(restorePersistedValue, defaultValue);
-		if(restorePersistedValue)  {
-			keyCode = getPersistedInt(0);
-		} else {
-			keyCode = (Integer)defaultValue;
-		}
-	}
-	
-	@Override
-	protected void onDialogClosed(boolean positiveResult) {
-		if(positiveResult) {
-			persistInt(keyCode);
-		}
-		
-		super.onDialogClosed(positiveResult);
-	}
-	
-	@TargetApi(12)
-	@Override
-	protected void onBindDialogView(View view) {
-		super.onBindDialogView(view);
-		if(keyCode == 0) {
-			valueTextView.setText("No Key");
-		} else {
-			valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
-		}
-	}
-
-	@TargetApi(12)
-	@Override
-	public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-		if(keyCode != KeyEvent.KEYCODE_BACK) {
-			this.keyCode = keyCode;
-			valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
-		} else {
-			dialog.dismiss();
-		}
-		return true;
-	}
+            }
+        });
+    }
+
+    @Override
+    protected View onCreateDialogView() {
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        LinearLayout layout = new LinearLayout(getContext());
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(6,6,6,6);
+
+        TextView promptTextView = new TextView(getContext());
+        promptTextView.setText(R.string.pressKey);
+        promptTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+
+        valueTextView = new TextView(getContext());
+        valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
+        valueTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+        valueTextView.setPadding(0, 12, 0, 12);
+
+        TextView alertTextView = new TextView(getContext());
+        alertTextView.setText(R.string.pressKeyInfo);
+        alertTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+        alertTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
+
+        layout.addView(promptTextView, params);
+        layout.addView(valueTextView, params);
+        layout.addView(alertTextView);
+
+        return layout;
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restorePersistedValue,
+            Object defaultValue) {
+        super.onSetInitialValue(restorePersistedValue, defaultValue);
+        if(restorePersistedValue)  {
+            keyCode = getPersistedInt(0);
+        } else {
+            keyCode = (Integer)defaultValue;
+        }
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        if(positiveResult) {
+            persistInt(keyCode);
+        }
+
+        super.onDialogClosed(positiveResult);
+    }
+
+    @TargetApi(12)
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+        if(keyCode == 0) {
+            valueTextView.setText("No Key");
+        } else {
+            valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
+        }
+    }
+
+    @TargetApi(12)
+    @Override
+    public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+        if(keyCode != KeyEvent.KEYCODE_BACK) {
+            this.keyCode = keyCode;
+            valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
+        } else {
+            dialog.dismiss();
+        }
+        return true;
+    }
 
 }
diff --git a/app/src/main/java/se/lublin/mumla/preference/MumlaCertificateGenerateTask.java b/app/src/main/java/se/lublin/mumla/preference/MumlaCertificateGenerateTask.java
index af0bdab..5083586 100644
--- a/app/src/main/java/se/lublin/mumla/preference/MumlaCertificateGenerateTask.java
+++ b/app/src/main/java/se/lublin/mumla/preference/MumlaCertificateGenerateTask.java
@@ -34,51 +34,51 @@ import se.lublin.mumla.db.MumlaDatabase;
 import se.lublin.mumla.db.MumlaSQLiteDatabase;
 
 public class MumlaCertificateGenerateTask extends AsyncTask<Void, Void, DatabaseCertificate> {
-	private static final String DATE_FORMAT = "yyyy-MM-dd-HH-mm-ss";
+    private static final String DATE_FORMAT = "yyyy-MM-dd-HH-mm-ss";
 
-	private Context context;
-	private ProgressDialog loadingDialog;
-	
-	public MumlaCertificateGenerateTask(Context context) {
-		this.context = context;
-	}
-	
-	@Override
-	protected void onPreExecute() {
-		super.onPreExecute();
-		
-		loadingDialog = new ProgressDialog(context);
-		loadingDialog.setIndeterminate(true);
-		loadingDialog.setMessage(context.getString(R.string.generateCertProgress));
-		loadingDialog.setCancelable(false);
-		loadingDialog.show();
-	}
-	@Override
-	protected DatabaseCertificate doInBackground(Void... params) {
-		try {
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			HumlaCertificateGenerator.generateCertificate(baos);
+    private Context context;
+    private ProgressDialog loadingDialog;
 
-			SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT, Locale.getDefault());
-			String fileName = context.getString(R.string.certificate_export_format, dateFormat.format(new Date()));
+    public MumlaCertificateGenerateTask(Context context) {
+        this.context = context;
+    }
 
-			MumlaDatabase database = new MumlaSQLiteDatabase(context);
-			DatabaseCertificate dc = database.addCertificate(fileName, baos.toByteArray());
-			database.close();
-			return dc;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-	
-	@Override
-	protected void onPostExecute(DatabaseCertificate result) {
-		super.onPostExecute(result);
-		if(result == null) {
-			Toast.makeText(context, R.string.generateCertFailure, Toast.LENGTH_SHORT).show();
-		}
-		
-		loadingDialog.dismiss();
-	}
+    @Override
+    protected void onPreExecute() {
+        super.onPreExecute();
+
+        loadingDialog = new ProgressDialog(context);
+        loadingDialog.setIndeterminate(true);
+        loadingDialog.setMessage(context.getString(R.string.generateCertProgress));
+        loadingDialog.setCancelable(false);
+        loadingDialog.show();
+    }
+    @Override
+    protected DatabaseCertificate doInBackground(Void... params) {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            HumlaCertificateGenerator.generateCertificate(baos);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT, Locale.getDefault());
+            String fileName = context.getString(R.string.certificate_export_format, dateFormat.format(new Date()));
+
+            MumlaDatabase database = new MumlaSQLiteDatabase(context);
+            DatabaseCertificate dc = database.addCertificate(fileName, baos.toByteArray());
+            database.close();
+            return dc;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    protected void onPostExecute(DatabaseCertificate result) {
+        super.onPostExecute(result);
+        if(result == null) {
+            Toast.makeText(context, R.string.generateCertFailure, Toast.LENGTH_SHORT).show();
+        }
+
+        loadingDialog.dismiss();
+    }
 }
diff --git a/app/src/main/java/se/lublin/mumla/preference/SeekBarDialogPreference.java b/app/src/main/java/se/lublin/mumla/preference/SeekBarDialogPreference.java
index 99aacab..2373ae6 100644
--- a/app/src/main/java/se/lublin/mumla/preference/SeekBarDialogPreference.java
+++ b/app/src/main/java/se/lublin/mumla/preference/SeekBarDialogPreference.java
@@ -17,10 +17,10 @@
 
 /* The following code was written by Matthew Wiggins
  * and is released under the Apache 2.0 license
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * I added some extra functionality like a multiplier + better persistence. 
+ *
+ * I added some extra functionality like a multiplier + better persistence.
  * - Andrew Comminos
  */
 package se.lublin.mumla.preference;
@@ -125,4 +125,4 @@ public class SeekBarDialogPreference extends DialogPreference implements SeekBar
             persistInt(mMultiplier * (mMin + mSeekBar.getProgress()));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java b/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
index 8052c70..f6d49d0 100644
--- a/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
@@ -72,25 +72,25 @@ import se.lublin.mumla.db.PublicServer;
  *
  */
 public class PublicServerListFragment extends Fragment implements OnItemClickListener, PublicServerAdapter.PublicServerAdapterMenuListener {
-    
+
     private FavouriteServerListFragment.ServerConnectHandler mConnectHandler;
     private DatabaseProvider mDatabaseProvider;
     private List<PublicServer> mServers;
     private GridView mServerGrid;
     private ProgressBar mServerProgress;
     private PublicServerAdapter mServerAdapter;
-    
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
+
         setHasOptionsMenu(true);
     }
-    
+
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        
+
         try {
             mConnectHandler = (FavouriteServerListFragment.ServerConnectHandler)activity;
             mDatabaseProvider = (DatabaseProvider) activity;
@@ -129,7 +129,7 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.fragment_public_server_list, menu);
     }
-    
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (isFilled()) {
@@ -171,14 +171,14 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
         adb.setNegativeButton(android.R.string.cancel, null);
         adb.show();
     }
-    
+
     public void setServers(List<PublicServer> servers) {
         mServers = servers;
         mServerProgress.setVisibility(View.GONE);
         mServerAdapter = new PublicServerAdapter(getActivity(), servers, this);
         mServerGrid.setAdapter(mServerAdapter);
     }
-    
+
     public boolean isFilled() {
         return mServerAdapter != null;
     }
@@ -208,12 +208,12 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
         alertBuilder.setItems(new String[] { getString(R.string.name), getString(R.string.country)}, new SortClickListener());
         alertBuilder.show();
     }
-    
+
     private void showFilterDialog() {
         View dialogView = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.dialog_server_search, null);
         final EditText nameText = (EditText) dialogView.findViewById(R.id.server_search_name);
         final EditText countryText = (EditText) dialogView.findViewById(R.id.server_search_country);
-                
+
         final AlertDialog dlg = new AlertDialog.Builder(getActivity()).
             setTitle(R.string.search).
             setView(dialogView).
@@ -226,7 +226,7 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
                     dialog.dismiss();
                 }
             }).create();
-        
+
         nameText.setImeOptions(EditorInfo.IME_ACTION_SEARCH);
         nameText.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
@@ -239,7 +239,7 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
                 return true;
             }
         });
-        
+
         countryText.setImeOptions(EditorInfo.IME_ACTION_SEARCH);
         countryText.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
@@ -252,7 +252,7 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
                 return true;
             }
         });
-        
+
         // Show keyboard automatically
         nameText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
@@ -262,7 +262,7 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
                 }
             }
         });
-        
+
         dlg.show();
     }
 
@@ -292,7 +292,7 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
 
         private static final int SORT_NAME = 0;
         private static final int SORT_COUNTRY = 1;
-        
+
         private Comparator<PublicServer> nameComparator = new Comparator<PublicServer>() {
             @Override
             public int compare(PublicServer lhs, PublicServer rhs) {
@@ -308,8 +308,8 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
                 return lhs.getCountry().compareTo(rhs.getCountry());
             }
         };
-        
-        
+
+
         @Override
         public void onClick(DialogInterface dialog, int which) {
             ArrayAdapter<PublicServer> arrayAdapter = mServerAdapter;
diff --git a/app/src/main/java/se/lublin/mumla/servers/ServerInfoResponse.java b/app/src/main/java/se/lublin/mumla/servers/ServerInfoResponse.java
index c35e5c0..218589b 100644
--- a/app/src/main/java/se/lublin/mumla/servers/ServerInfoResponse.java
+++ b/app/src/main/java/se/lublin/mumla/servers/ServerInfoResponse.java
@@ -28,66 +28,66 @@ import se.lublin.humla.model.Server;
  */
 public class ServerInfoResponse {
 
-	private long mIdentifier;
-	private int mVersion;
-	private int mCurrentUsers;
-	private int mMaximumUsers;
-	private int mAllowedBandwidth;
-	private int mLatency;
+    private long mIdentifier;
+    private int mVersion;
+    private int mCurrentUsers;
+    private int mMaximumUsers;
+    private int mAllowedBandwidth;
+    private int mLatency;
     private Server mServer;
 
-	/**
-	 * Whether or not this server info response represents a failure to retrieve a response. Used to efficiently denote failed responses.
-	 */
-	private boolean mDummy = false;
-		
-	/**
-	 * Creates a ServerInfoResponse object with the bytes obtained from the server.
-	 * @param response The response to the UDP pings sent by the server.
-	 * @see http://mumble.sourceforge.net/Protocol
-	 */
-	public ServerInfoResponse(Server server, byte[] response, int latency) {
-		ByteBuffer buffer = ByteBuffer.wrap(response);
-		mVersion = buffer.getInt();
-		mIdentifier = buffer.getLong();
-		mCurrentUsers = buffer.getInt();
-		mMaximumUsers = buffer.getInt();
-		mAllowedBandwidth = buffer.getInt();
+    /**
+     * Whether or not this server info response represents a failure to retrieve a response. Used to efficiently denote failed responses.
+     */
+    private boolean mDummy = false;
+
+    /**
+     * Creates a ServerInfoResponse object with the bytes obtained from the server.
+     * @param response The response to the UDP pings sent by the server.
+     * @see http://mumble.sourceforge.net/Protocol
+     */
+    public ServerInfoResponse(Server server, byte[] response, int latency) {
+        ByteBuffer buffer = ByteBuffer.wrap(response);
+        mVersion = buffer.getInt();
+        mIdentifier = buffer.getLong();
+        mCurrentUsers = buffer.getInt();
+        mMaximumUsers = buffer.getInt();
+        mAllowedBandwidth = buffer.getInt();
         mLatency = latency;
         mServer = server;
-	}
-
-	/**
-	 * Instantiating a ServerInfoResponse with no data will cause it to be considered a 'dummy' response by its handler.
-	 */
-	public ServerInfoResponse() {
-		this.mDummy = true;
-	}
-	
-	public long getIdentifier() {
-		return mIdentifier;
-	}
-
-	public int getVersion() {
-		return mVersion;
-	}
-	
-	public String getVersionString() {
-		byte[] versionBytes = ByteBuffer.allocate(4).putInt(mVersion).array();
-		return String.format("%d.%d.%d", (int)versionBytes[1], (int)versionBytes[2], (int)versionBytes[3]);
-	}
-
-	public int getCurrentUsers() {
-		return mCurrentUsers;
-	}
-
-	public int getMaximumUsers() {
-		return mMaximumUsers;
-	}
-
-	public int getAllowedBandwidth() {
-		return mAllowedBandwidth;
-	}
+    }
+
+    /**
+     * Instantiating a ServerInfoResponse with no data will cause it to be considered a 'dummy' response by its handler.
+     */
+    public ServerInfoResponse() {
+        this.mDummy = true;
+    }
+
+    public long getIdentifier() {
+        return mIdentifier;
+    }
+
+    public int getVersion() {
+        return mVersion;
+    }
+
+    public String getVersionString() {
+        byte[] versionBytes = ByteBuffer.allocate(4).putInt(mVersion).array();
+        return String.format("%d.%d.%d", (int)versionBytes[1], (int)versionBytes[2], (int)versionBytes[3]);
+    }
+
+    public int getCurrentUsers() {
+        return mCurrentUsers;
+    }
+
+    public int getMaximumUsers() {
+        return mMaximumUsers;
+    }
+
+    public int getAllowedBandwidth() {
+        return mAllowedBandwidth;
+    }
 
     public int getLatency() {
         return mLatency;
@@ -98,6 +98,6 @@ public class ServerInfoResponse {
     }
 
     public boolean isDummy() {
-		return mDummy;
-	}
+        return mDummy;
+    }
 }
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
index 6120925..2549328 100644
--- a/app/src/main/res/anim/fade_in.xml
+++ b/app/src/main/res/anim/fade_in.xml
@@ -19,10 +19,10 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:fillAfter="true"
     android:fillEnabled="true">
-    <alpha android:fromAlpha="0.0" 
-        android:toAlpha="1.0" 
+    <alpha android:fromAlpha="0.0"
+        android:toAlpha="1.0"
         android:interpolator="@android:anim/accelerate_interpolator"
         android:duration="300"
         />
 
-</set>
\ No newline at end of file
+</set>
diff --git a/app/src/main/res/layout/fragment_channel_list.xml b/app/src/main/res/layout/fragment_channel_list.xml
index 305f1e1..b9fcb59 100644
--- a/app/src/main/res/layout/fragment_channel_list.xml
+++ b/app/src/main/res/layout/fragment_channel_list.xml
@@ -22,13 +22,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-	<androidx.recyclerview.widget.RecyclerView
-	    android:id="@+id/channelUsers"
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/channelUsers"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:divider="@android:color/transparent"
         android:dividerHeight="0dp"
-	    android:fastScrollEnabled="true"
+        android:fastScrollEnabled="true"
         android:choiceMode="singleChoice"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml
index 8fadbeb..ce6613b 100644
--- a/app/src/main/res/layout/fragment_chat.xml
+++ b/app/src/main/res/layout/fragment_chat.xml
@@ -17,13 +17,13 @@
   -->
 
 <LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-	android:orientation="vertical"
-	android:layout_height="fill_parent"
-	android:layout_width="fill_parent"
-    tools:ignore="NewApi" 
+    android:orientation="vertical"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
+    tools:ignore="NewApi"
     android:divider="?attr/dividerVertical"
     android:showDividers="middle" >
 
@@ -48,35 +48,35 @@
         android:padding="4dp"/>
     -->
 
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-    	android:divider="?attr/dividerHorizontal"
-    	android:showDividers="middle">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:divider="?attr/dividerHorizontal"
+        android:showDividers="middle">
 
-		<EditText
-		    android:id="@+id/chatTextEdit"
-		    android:layout_width="0dp"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="1"
+        <EditText
+            android:id="@+id/chatTextEdit"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:minHeight="48dp"
-		    android:hint="@string/send_message"
+            android:hint="@string/send_message"
             android:maxLines="4"
-		    android:inputType="textAutoCorrect|textMultiLine"
-		    android:imeOptions="actionSend"
-	    	android:layout_marginLeft="10dp"
-	    	android:layout_marginRight="10dp" >
-		</EditText>
+            android:inputType="textAutoCorrect|textMultiLine"
+            android:imeOptions="actionSend"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp" >
+        </EditText>
 
-		<ImageButton
-		    android:id="@+id/chatTextSend"
-		    android:layout_width="48dp"
-		    android:layout_height="match_parent"
-		    app:srcCompat="@drawable/ic_action_send"
+        <ImageButton
+            android:id="@+id/chatTextSend"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            app:srcCompat="@drawable/ic_action_send"
             android:tint="?android:attr/textColorPrimary"
-		    android:enabled="false"
+            android:enabled="false"
             android:layout_gravity="bottom"
             android:background="?attr/selectableItemBackground"/>
 
-	</LinearLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_public_server_list.xml b/app/src/main/res/layout/fragment_public_server_list.xml
index 496b41b..6335a25 100644
--- a/app/src/main/res/layout/fragment_public_server_list.xml
+++ b/app/src/main/res/layout/fragment_public_server_list.xml
@@ -17,31 +17,31 @@
   -->
 
 <RelativeLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
-	<GridView
-		android:id="@+id/server_list_grid"
-		android:layout_height="fill_parent"
-		android:layout_width="fill_parent"
-		android:gravity="center"
-		android:columnWidth="320dp"
-		android:numColumns="auto_fit"
-		android:verticalSpacing="10dp"
-		android:horizontalSpacing="10dp"
-		android:padding="10dp"
-		android:stretchMode="columnWidth"
+    <GridView
+        android:id="@+id/server_list_grid"
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent"
+        android:gravity="center"
+        android:columnWidth="320dp"
+        android:numColumns="auto_fit"
+        android:verticalSpacing="10dp"
+        android:horizontalSpacing="10dp"
+        android:padding="10dp"
+        android:stretchMode="columnWidth"
         android:clipToPadding="false"
-		android:fastScrollEnabled="true"
+        android:fastScrollEnabled="true"
         android:listSelector="@android:color/transparent"/>
-	
-	<ProgressBar 
-	    android:id="@+id/serverProgress"
-	    android:layout_width="50dp"
-	    android:layout_height="50dp"
-	    android:layout_centerInParent="true"
-	    android:indeterminate="true"
-	    android:visibility="gone"/>
+
+    <ProgressBar
+        android:id="@+id/serverProgress"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_centerInParent="true"
+        android:indeterminate="true"
+        android:visibility="gone"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_server_list.xml b/app/src/main/res/layout/fragment_server_list.xml
index 91a0a0a..e6ed117 100644
--- a/app/src/main/res/layout/fragment_server_list.xml
+++ b/app/src/main/res/layout/fragment_server_list.xml
@@ -17,24 +17,24 @@
   -->
 
 <RelativeLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
-	<GridView
-		android:id="@+id/server_list_grid"
-		android:layout_height="fill_parent"
-		android:layout_width="fill_parent"
-		android:gravity="center"
-		android:columnWidth="320dp"
-		android:numColumns="auto_fit"
-		android:verticalSpacing="10dp"
-		android:horizontalSpacing="10dp"
-		android:padding="10dp"
-		android:stretchMode="columnWidth"
+    <GridView
+        android:id="@+id/server_list_grid"
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent"
+        android:gravity="center"
+        android:columnWidth="320dp"
+        android:numColumns="auto_fit"
+        android:verticalSpacing="10dp"
+        android:horizontalSpacing="10dp"
+        android:padding="10dp"
+        android:stretchMode="columnWidth"
         android:clipToPadding="false"
-		android:fastScrollEnabled="true"
+        android:fastScrollEnabled="true"
         android:listSelector="@android:color/transparent" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_tokens.xml b/app/src/main/res/layout/fragment_tokens.xml
index 6f7a6a1..9917d37 100644
--- a/app/src/main/res/layout/fragment_tokens.xml
+++ b/app/src/main/res/layout/fragment_tokens.xml
@@ -20,7 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" 
+    android:orientation="vertical"
     android:divider="?attr/dividerVertical"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="NewApi"
@@ -57,4 +57,4 @@
                 android:background="?attr/selectableItemBackground"/>
         </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/nested_dropdown_item.xml b/app/src/main/res/layout/nested_dropdown_item.xml
index 5486345..b28f8b8 100644
--- a/app/src/main/res/layout/nested_dropdown_item.xml
+++ b/app/src/main/res/layout/nested_dropdown_item.xml
@@ -37,9 +37,9 @@
         android:text="@string/app_name"
         android:textColor="#FFFFFF"
         android:lines="2"
-    	android:ellipsize="marquee"
-    	android:layout_weight="1"/>
-    
+        android:ellipsize="marquee"
+        android:layout_weight="1"/>
+
     <TextView
         android:id="@+id/channel_count"
         android:layout_width="wrap_content"
@@ -50,4 +50,4 @@
         android:gravity="center|right"
         android:layout_gravity="right"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/token_row.xml b/app/src/main/res/layout/token_row.xml
index 73b6517..1f2e40b 100644
--- a/app/src/main/res/layout/token_row.xml
+++ b/app/src/main/res/layout/token_row.xml
@@ -22,7 +22,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal">
 
-    <TextView 
+    <TextView
         android:id="@+id/tokenItemTitle"
         android:layout_width="0dp"
         android:layout_height="48dp"
@@ -40,4 +40,4 @@
         android:tint="?android:attr/textColorPrimary"
         android:background="?attr/selectableItemBackground"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/menu/activity_server_info.xml b/app/src/main/res/menu/activity_server_info.xml
index 5c76e03..bd5e3f0 100644
--- a/app/src/main/res/menu/activity_server_info.xml
+++ b/app/src/main/res/menu/activity_server_info.xml
@@ -20,6 +20,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/menu_save_button" android:title="@string/save" android:icon="@drawable/ic_action_save" app:showAsAction="ifRoom"></item>
     <item android:id="@+id/menu_delete_button" android:title="@string/delete" android:icon="@drawable/ic_action_delete_dark" app:showAsAction="ifRoom"></item>
-    
-
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/channel_list_context.xml b/app/src/main/res/menu/channel_list_context.xml
index 44edbab..90b9eae 100644
--- a/app/src/main/res/menu/channel_list_context.xml
+++ b/app/src/main/res/menu/channel_list_context.xml
@@ -18,6 +18,4 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/menu_local_mute_item" android:title="@string/togglelocalmute"></item>
-    
-
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/channel_list_menu.xml b/app/src/main/res/menu/channel_list_menu.xml
index 5f85160..34c5129 100644
--- a/app/src/main/res/menu/channel_list_menu.xml
+++ b/app/src/main/res/menu/channel_list_menu.xml
@@ -20,7 +20,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/menu_chat_item" android:title="@string/chat" app:showAsAction="always|withText"></item>
     <item android:id="@+id/menu_disconnect_item" android:title="@string/disconnect"></item>
-    
-    
-
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/popup_favourite_server.xml b/app/src/main/res/menu/popup_favourite_server.xml
index 4813d31..258a2bc 100644
--- a/app/src/main/res/menu/popup_favourite_server.xml
+++ b/app/src/main/res/menu/popup_favourite_server.xml
@@ -20,6 +20,4 @@
     <item android:id="@+id/menu_server_edit" android:title="@string/edit"></item>
     <item android:id="@+id/menu_server_share" android:title="@string/share"></item>
     <item android:id="@+id/menu_server_delete" android:title="@string/delete"></item>
-    
-
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/values-de/preference.xml b/app/src/main/res/values-de/preference.xml
index 3bc5e33..7be78da 100644
--- a/app/src/main/res/values-de/preference.xml
+++ b/app/src/main/res/values-de/preference.xml
@@ -1,100 +1,100 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="inputMethodVoice">Sprachaktivierung</string>
-  <string name="inputMethodPtt">Push-To-Talk</string>
-  <string name="inputMethodContinuous">Kontinuierlich</string>
-  <!--Theme names-->
-  <string name="theme_light">Hell</string>
-  <string name="theme_dark">Dunkel</string>
-  <string name="theme_solarized_light">Solarized Light</string>
-  <string name="theme_solarized_dark">Solarized Dark</string>
-  <!--Call modes-->
-  <string name="call_mode_speakerphone">Lautsprecher</string>
-  <string name="call_mode_voice_call">Telefongespräch</string>
-  <!--Hot corner-->
-  <string name="hot_corner_none">Keine</string>
-  <string name="hot_corner_top_left">Oben links</string>
-  <string name="hot_corner_bottom_left">Unten links</string>
-  <string name="hot_corner_top_right">Oben rechts</string>
-  <string name="hot_corner_bottom_right">Unten rechts</string>
-  <!--About-->
-  <string name="about">Über</string>
-  <string name="aboutSum">Rechtliches und Danksagungen</string>
-  <string name="acknowledgements">Danksagungen</string>
-  <string name="acknowledgementsSum">Ansehen, wer zu Mumla beigetragen hat</string>
-  <string name="licenses">Lizenzen</string>
-  <string name="authentication">Authentifizierung</string>
-  <string name="authenticationSum">Zertifikate verwalten und erstellen</string>
-  <string name="audioInput">Audioeingabe</string>
-  <string name="audioInputMethodSum">Wie Ton zum Server übertragen werden soll.</string>
-  <string name="audioInputMethod">Eingabemethode</string>
-  <string name="audioInputVolume">Aufnahmelautstärke</string>
-  <string name="audioInputVolumeSum">Aufnahmelautstärke erhöhen um den Ton künstlich zu regeln.</string>
-  <string name="callMode">Gesprächsmodus</string>
-  <string name="callModeSum">Der Gesprächsmodus von Mumla: Entweder wie bei einem Telefonanruf oder bei Freisprechen verhalten.</string>
-  <string name="detectionThreshold">Signalwerterkennung</string>
-  <string name="detectionThresholdSum">Der minimal benötigte Ausschlag, um als Sprache erkannt zu werden (nur bei Sprachaktivierung).</string>
-  <string name="pttKey">Push-To-Talk Taste</string>
-  <string name="pttKeySum">Eine Hardwaretaste für Push-To-Talk.</string>
-  <string name="hotCorner">Bildschirmecke als Push-To-Talk Taste</string>
-  <string name="hotCornerSum">Eine Bildschirmecke festlegen, welche App-Übergreifend als Push-To-Talk Taste verwendet werden kann.</string>
-  <string name="general">Allgemein</string>
-  <string name="generalSum">Allgemeine Einstellungen anpassen</string>
-  <string name="appearance">Aussehen</string>
-  <string name="appearanceSum">Das Aussehen der App anpassen</string>
-  <string name="themeSum">Das Erscheinungsbild der App anpassen.</string>
-  <string name="theme">Erscheinungsbild</string>
-  <string name="advancedAudio">Erweiterte Audioeinstellungen</string>
-  <string name="forceTcp">Erzwinge TCP</string>
-  <string name="forceTcpSum">Ausschließlich TCP benutzten (und UDP ausschalten).</string>
-  <string name="audio">Audio</string>
-  <string name="audioSum">Audioeingabe und Audioausgabe anpassen</string>
-  <string name="audioSampleRate">Samplerate der Eingabe</string>
-  <string name="audioSampleRateSum">Die bevorzugte Audio Samplerate. Nicht alle Raten werden von allen Geräten unterstützt.</string>
-  <string name="noCert">Kein Zertifikat</string>
-  <string name="chatNotifications">Chat Benachrichtigung</string>
-  <string name="chatNotificationsSum">Bei eingehenden Nachrichten eine Benachrichtigung anzeigen.</string>
-  <string name="defaultUsername">Standard Benutzername</string>
-  <string name="defaultUsernameSum">Der voreingestellte Benutzername, welcher beim Verbinden zu Servern verwendet wird.</string>
-  <string name="defaultUsernameDefault">Mumla_Benutzer</string>
-  <string name="certificateGenerate">Zertifikat erzeugen</string>
-  <string name="certificateGenerateSum">Erzeugt ein neues, selbst signiertes Mumla-Zertifikat. Für unerfahrene Benutzer empfohlen.</string>
-  <string name="pttSettings">Push-To-Talk Einstellungen</string>
-  <string name="pttSettingsSum">Konfigurieren von Push-To-Talk, sofern eingeschaltet.</string>
-  <string name="voiceActivitySettings">Sprachaktivierungs-Einstellungen</string>
-  <string name="voiceActivitySettingsSum">Konfiguration der Sprachaktivierung, sofern eingeschaltet.</string>
-  <string name="audioOutput">Audioausgabe</string>
-  <string name="disableOpus">Opus Codec deaktivieren</string>
-  <string name="disableOpusSum">Opus Unterstützung für Mumble 1.2.4 Server deaktivieren.</string>
-  <string name="hidePtt">Verstecke die Push-To-Talk Taste</string>
-  <string name="hidePttSum">Versteckt die Push-To-Talk Taste bei aktiviertem Push-To-Talk Modus. Nützlich bei Verwendung von Bildschirmecken oder Hardwaretasten.</string>
-  <string name="useTts">Text-Zu-Sprache</string>
-  <string name="useTtsSum">Aktiviert Text-Zu-Sprache für eingehende Nachrichten.</string>
-  <string name="togglePtt">Push-To-Talk Taste feststellen</string>
-  <string name="togglePttSum">Die Sprachübertragung wird beim Drücken der Push-To-Talk Taste dauerhaft aktiviert/deaktiviert.</string>
-  <string name="autoReconnect">Automatisch Wiederverbinden</string>
-  <string name="autoReconnectSum">Nach einem Verbindungsbbruch automatisch wiederzuverbinden.</string>
-  <string name="useTor">Über Tor verbinden</string>
-  <string name="useTorSum">Benötigt die Orbot App</string>
-  <string name="inputQuality">Eingabequalität</string>
-  <string name="inputQualitySum">Die zu erzielende Eingabequalität in bps.</string>
-  <string name="pressKey">Drücken Sie eine Hardwaretaste, um dieser Push-To-Talk zuzuweisen.</string>
-  <string name="pressKeyInfo">Hinweis: Aufgrund der Limitierungen in Android muss die App geöffnet sein, um eine Hardwareteste für Push-To-Talk zu nutzen.</string>
-  <string name="loadImagesSum">Sollen externe Bilder im Chat geladen werden?</string>
-  <string name="loadImages">Externe Bilder laden</string>
-  <string name="clearServerCertificates">Entferne Serverzertifikate</string>
-  <string name="clearServerCertificatesSum">Entferne alle erlaubten Serverzertifikate aus der Vertrauensdatenbank von Mumla.</string>
-  <string name="version">Version</string>
-  <string name="halfDuplex">Halbduplexmodus</string>
-  <string name="halfDuplexSum">Deaktiviert den Gerätesound bei Verwendung von Push-To-Talk, um eine Rückkopplung zu den Benutzern im Kanal zu verhindern.</string>
-  <string name="handsetMode">Ohrhörer-Modus</string>
-  <string name="handsetModeSum">Verwendet die Lautsprecher des Ohrhörers und den Näherungssensor, um einen normalen Telefonanruf zu simulieren.</string>
-  <string name="pttSound">Push-To-Talk Sound</string>
-  <string name="pttSoundSum">Spiele einen Sound ab, wenn der Push-To-Talk Knopf gedrückt wird.</string>
-  <string name="preprocessor_enabled">Aktiviere Eingabe-Präprozessor</string>
-  <string name="preprocessor_enabled_sum">Aktiviere den Speex-Präprozessor für Umgebungs- und Rasch-Unterdrückung und Lautstärkennormalisieriung.</string>
-  <string name="audio_per_packet">Audio pro Paket</string>
-  <string name="audio_per_packet_sum">Die Länge des Audios pro Sprachpaket.</string>
-  <string name="stay_awake">Wach beleiben</string>
-  <string name="stay_awake_sum">Wenn Mumla auf ist, wird der Bildschirm nicht ausgeschaltet.</string>
+    <string name="inputMethodVoice">Sprachaktivierung</string>
+    <string name="inputMethodPtt">Push-To-Talk</string>
+    <string name="inputMethodContinuous">Kontinuierlich</string>
+    <!--Theme names-->
+    <string name="theme_light">Hell</string>
+    <string name="theme_dark">Dunkel</string>
+    <string name="theme_solarized_light">Solarized Light</string>
+    <string name="theme_solarized_dark">Solarized Dark</string>
+    <!--Call modes-->
+    <string name="call_mode_speakerphone">Lautsprecher</string>
+    <string name="call_mode_voice_call">Telefongespräch</string>
+    <!--Hot corner-->
+    <string name="hot_corner_none">Keine</string>
+    <string name="hot_corner_top_left">Oben links</string>
+    <string name="hot_corner_bottom_left">Unten links</string>
+    <string name="hot_corner_top_right">Oben rechts</string>
+    <string name="hot_corner_bottom_right">Unten rechts</string>
+    <!--About-->
+    <string name="about">Über</string>
+    <string name="aboutSum">Rechtliches und Danksagungen</string>
+    <string name="acknowledgements">Danksagungen</string>
+    <string name="acknowledgementsSum">Ansehen, wer zu Mumla beigetragen hat</string>
+    <string name="licenses">Lizenzen</string>
+    <string name="authentication">Authentifizierung</string>
+    <string name="authenticationSum">Zertifikate verwalten und erstellen</string>
+    <string name="audioInput">Audioeingabe</string>
+    <string name="audioInputMethodSum">Wie Ton zum Server übertragen werden soll.</string>
+    <string name="audioInputMethod">Eingabemethode</string>
+    <string name="audioInputVolume">Aufnahmelautstärke</string>
+    <string name="audioInputVolumeSum">Aufnahmelautstärke erhöhen um den Ton künstlich zu regeln.</string>
+    <string name="callMode">Gesprächsmodus</string>
+    <string name="callModeSum">Der Gesprächsmodus von Mumla: Entweder wie bei einem Telefonanruf oder bei Freisprechen verhalten.</string>
+    <string name="detectionThreshold">Signalwerterkennung</string>
+    <string name="detectionThresholdSum">Der minimal benötigte Ausschlag, um als Sprache erkannt zu werden (nur bei Sprachaktivierung).</string>
+    <string name="pttKey">Push-To-Talk Taste</string>
+    <string name="pttKeySum">Eine Hardwaretaste für Push-To-Talk.</string>
+    <string name="hotCorner">Bildschirmecke als Push-To-Talk Taste</string>
+    <string name="hotCornerSum">Eine Bildschirmecke festlegen, welche App-Übergreifend als Push-To-Talk Taste verwendet werden kann.</string>
+    <string name="general">Allgemein</string>
+    <string name="generalSum">Allgemeine Einstellungen anpassen</string>
+    <string name="appearance">Aussehen</string>
+    <string name="appearanceSum">Das Aussehen der App anpassen</string>
+    <string name="themeSum">Das Erscheinungsbild der App anpassen.</string>
+    <string name="theme">Erscheinungsbild</string>
+    <string name="advancedAudio">Erweiterte Audioeinstellungen</string>
+    <string name="forceTcp">Erzwinge TCP</string>
+    <string name="forceTcpSum">Ausschließlich TCP benutzten (und UDP ausschalten).</string>
+    <string name="audio">Audio</string>
+    <string name="audioSum">Audioeingabe und Audioausgabe anpassen</string>
+    <string name="audioSampleRate">Samplerate der Eingabe</string>
+    <string name="audioSampleRateSum">Die bevorzugte Audio Samplerate. Nicht alle Raten werden von allen Geräten unterstützt.</string>
+    <string name="noCert">Kein Zertifikat</string>
+    <string name="chatNotifications">Chat Benachrichtigung</string>
+    <string name="chatNotificationsSum">Bei eingehenden Nachrichten eine Benachrichtigung anzeigen.</string>
+    <string name="defaultUsername">Standard Benutzername</string>
+    <string name="defaultUsernameSum">Der voreingestellte Benutzername, welcher beim Verbinden zu Servern verwendet wird.</string>
+    <string name="defaultUsernameDefault">Mumla_Benutzer</string>
+    <string name="certificateGenerate">Zertifikat erzeugen</string>
+    <string name="certificateGenerateSum">Erzeugt ein neues, selbst signiertes Mumla-Zertifikat. Für unerfahrene Benutzer empfohlen.</string>
+    <string name="pttSettings">Push-To-Talk Einstellungen</string>
+    <string name="pttSettingsSum">Konfigurieren von Push-To-Talk, sofern eingeschaltet.</string>
+    <string name="voiceActivitySettings">Sprachaktivierungs-Einstellungen</string>
+    <string name="voiceActivitySettingsSum">Konfiguration der Sprachaktivierung, sofern eingeschaltet.</string>
+    <string name="audioOutput">Audioausgabe</string>
+    <string name="disableOpus">Opus Codec deaktivieren</string>
+    <string name="disableOpusSum">Opus Unterstützung für Mumble 1.2.4 Server deaktivieren.</string>
+    <string name="hidePtt">Verstecke die Push-To-Talk Taste</string>
+    <string name="hidePttSum">Versteckt die Push-To-Talk Taste bei aktiviertem Push-To-Talk Modus. Nützlich bei Verwendung von Bildschirmecken oder Hardwaretasten.</string>
+    <string name="useTts">Text-Zu-Sprache</string>
+    <string name="useTtsSum">Aktiviert Text-Zu-Sprache für eingehende Nachrichten.</string>
+    <string name="togglePtt">Push-To-Talk Taste feststellen</string>
+    <string name="togglePttSum">Die Sprachübertragung wird beim Drücken der Push-To-Talk Taste dauerhaft aktiviert/deaktiviert.</string>
+    <string name="autoReconnect">Automatisch Wiederverbinden</string>
+    <string name="autoReconnectSum">Nach einem Verbindungsbbruch automatisch wiederzuverbinden.</string>
+    <string name="useTor">Über Tor verbinden</string>
+    <string name="useTorSum">Benötigt die Orbot App</string>
+    <string name="inputQuality">Eingabequalität</string>
+    <string name="inputQualitySum">Die zu erzielende Eingabequalität in bps.</string>
+    <string name="pressKey">Drücken Sie eine Hardwaretaste, um dieser Push-To-Talk zuzuweisen.</string>
+    <string name="pressKeyInfo">Hinweis: Aufgrund der Limitierungen in Android muss die App geöffnet sein, um eine Hardwareteste für Push-To-Talk zu nutzen.</string>
+    <string name="loadImagesSum">Sollen externe Bilder im Chat geladen werden?</string>
+    <string name="loadImages">Externe Bilder laden</string>
+    <string name="clearServerCertificates">Entferne Serverzertifikate</string>
+    <string name="clearServerCertificatesSum">Entferne alle erlaubten Serverzertifikate aus der Vertrauensdatenbank von Mumla.</string>
+    <string name="version">Version</string>
+    <string name="halfDuplex">Halbduplexmodus</string>
+    <string name="halfDuplexSum">Deaktiviert den Gerätesound bei Verwendung von Push-To-Talk, um eine Rückkopplung zu den Benutzern im Kanal zu verhindern.</string>
+    <string name="handsetMode">Ohrhörer-Modus</string>
+    <string name="handsetModeSum">Verwendet die Lautsprecher des Ohrhörers und den Näherungssensor, um einen normalen Telefonanruf zu simulieren.</string>
+    <string name="pttSound">Push-To-Talk Sound</string>
+    <string name="pttSoundSum">Spiele einen Sound ab, wenn der Push-To-Talk Knopf gedrückt wird.</string>
+    <string name="preprocessor_enabled">Aktiviere Eingabe-Präprozessor</string>
+    <string name="preprocessor_enabled_sum">Aktiviere den Speex-Präprozessor für Umgebungs- und Rasch-Unterdrückung und Lautstärkennormalisieriung.</string>
+    <string name="audio_per_packet">Audio pro Paket</string>
+    <string name="audio_per_packet_sum">Die Länge des Audios pro Sprachpaket.</string>
+    <string name="stay_awake">Wach beleiben</string>
+    <string name="stay_awake_sum">Wenn Mumla auf ist, wird der Bildschirm nicht ausgeschaltet.</string>
 </resources>
diff --git a/app/src/main/res/values-es/preference.xml b/app/src/main/res/values-es/preference.xml
index 61e2050..94e3ddb 100644
--- a/app/src/main/res/values-es/preference.xml
+++ b/app/src/main/res/values-es/preference.xml
@@ -1,100 +1,100 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="inputMethodVoice">Actividad de voz</string>
-  <string name="inputMethodPtt">Presionar-para-hablar</string>
-  <string name="inputMethodContinuous">Contínuo </string>
-  <!--Theme names-->
-  <string name="theme_light">Claro</string>
-  <string name="theme_dark">Oscuro</string>
-  <string name="theme_solarized_light">Claro solarizado</string>
-  <string name="theme_solarized_dark">Oscuro solarizado</string>
-  <!--Call modes-->
-  <string name="call_mode_speakerphone">Altavoz</string>
-  <string name="call_mode_voice_call">Llamada de voz</string>
-  <!--Hot corner-->
-  <string name="hot_corner_none">Ninguno</string>
-  <string name="hot_corner_top_left">Superior izquierda</string>
-  <string name="hot_corner_bottom_left">Inferior izquierda</string>
-  <string name="hot_corner_top_right">Superior derecha</string>
-  <string name="hot_corner_bottom_right">Inferior derecha</string>
-  <!--About-->
-  <string name="about">Acerca de</string>
-  <string name="aboutSum">Legal y agradecimientos</string>
-  <string name="acknowledgements">Agradecimientos</string>
-  <string name="acknowledgementsSum">Mira quién ha contribuido a Mumla</string>
-  <string name="licenses">Licencias</string>
-  <string name="authentication">Autenticación</string>
-  <string name="authenticationSum">Gestiona y crea certificados</string>
-  <string name="audioInput">Entrada de audio</string>
-  <string name="audioInputMethodSum">El método de entrada de audio</string>
-  <string name="audioInputMethod">Modo de transmisión</string>
-  <string name="audioInputVolume">Volumen del micrófono</string>
-  <string name="audioInputVolumeSum">Multiplicador del volumen del micrófono utilizado para normalizar el audio artificialmente.</string>
-  <string name="callMode">Modo de llamada</string>
-  <string name="callModeSum">El modo de llamada del Mumla, se comportará como una llamada de voz o  un altavoz.</string>
-  <string name="detectionThreshold">Umbral de detección</string>
-  <string name="detectionThresholdSum">La amplitud mínima requerida para que la voz sea detectada( solo aplicable para el modo de transmisión por actividad de voz )</string>
-  <string name="pttKey">Tecla de Presionar-para-hablar</string>
-  <string name="pttKeySum">Una tecla física para asignarla a Presionar-para-hablar</string>
-  <string name="hotCorner">Esquina de Presionar-para-hablar</string>
-  <string name="hotCornerSum">Una esquina de la pantalla asignada a Presionar-para-hablar que puede ser presionada en cualquier momento.</string>
-  <string name="general">General</string>
-  <string name="generalSum">Ajuste las opciones generales</string>
-  <string name="appearance">Apariencia</string>
-  <string name="appearanceSum">Modifique la apariencia de la aplicación</string>
-  <string name="themeSum">El tema visual de la aplicación</string>
-  <string name="theme">Tema</string>
-  <string name="advancedAudio">Avanzado</string>
-  <string name="forceTcp">Forzar TCP</string>
-  <string name="forceTcpSum">Al activarse se forzará el uso de la comunicación vía TCP (UDP desactivado)</string>
-  <string name="audio">Audio</string>
-  <string name="audioSum">Ajuste la entrada y salida del audio</string>
-  <string name="audioSampleRate">Frecuencia de muestreo de la entrada</string>
-  <string name="audioSampleRateSum">La frecuencia de muestreo del audio preferida. No todas las frecuencias son funcionales en todos los dispositivos.</string>
-  <string name="noCert">Sin certificado</string>
-  <string name="chatNotifications">Notificaciones del chat</string>
-  <string name="chatNotificationsSum">Mostrar notificaciones cuando un usuario escriba en el chat</string>
-  <string name="defaultUsername">Nombre de usuario predeterminado</string>
-  <string name="defaultUsernameSum">El nombre de usuario predeterminado que se usará al conectar a los servidores.</string>
-  <string name="defaultUsernameDefault">Mumla_User</string>
-  <string name="certificateGenerate">Generar certificado</string>
-  <string name="certificateGenerateSum">Genera un nuevo certificado de Mumla auto-firmado. Recomendado para principiantes.</string>
-  <string name="pttSettings">Opciones de Presionar-para-hablar</string>
-  <string name="pttSettingsSum">Configúrelo si Presionar-para-hablar está habilitado.</string>
-  <string name="voiceActivitySettings">Opciones de actividad de voz</string>
-  <string name="voiceActivitySettingsSum">Configúrelo si ha seleccionado transmisión por actividad de voz</string>
-  <string name="audioOutput">Salida de audio</string>
-  <string name="disableOpus">Inhabilitar códec Opus</string>
-  <string name="disableOpusSum">Inhabilitar soporte de Opus para los servidores de Mumble versión 1.2.4</string>
-  <string name="hidePtt">Ocultar botón de Presionar-para-hablar</string>
-  <string name="hidePttSum">Oculta el botón de Presionar-para-hablar en el modo Presionar-para-hablar. Útil si utilizas las esquinas de la pantalla o una tecla física.</string>
-  <string name="useTts">Texto a voz</string>
-  <string name="useTtsSum">Habilita el texto a voz para los mensajes entrantes</string>
-  <string name="togglePtt">Alternar Presionar-para-hablar</string>
-  <string name="togglePttSum">Alterna entre apagada y encendida la función Presionar-para-hablar</string>
-  <string name="autoReconnect">Reconectar automáticamente</string>
-  <string name="autoReconnectSum">Intenta restablecer automáticamente la conexión con el servidor cuando ésta se pierde</string>
-  <string name="useTor">Conectar via Tor</string>
-  <string name="useTorSum">Requiere la aplicación Orbot</string>
-  <string name="inputQuality">Calidad de entrada</string>
-  <string name="inputQualitySum">La calidad de entrada tope en bps.</string>
-  <string name="pressKey">Pulsa una tecla física para asignarla a Presionar-para-hablar</string>
-  <string name="pressKeyInfo">Nota: debido a limitaciones de Android, la aplicación debe de estar abierta para usar la tecla física.</string>
-  <string name="loadImagesSum">Elegir si cargar imágenes externas en el chat o no.</string>
-  <string name="loadImages">Cargar imágenes externas</string>
-  <string name="clearServerCertificates">Eliminar certificados de servidores</string>
-  <string name="clearServerCertificatesSum">Eliminar los certificados de todos los servidores permitidos de la base de datos de confianza de Mumla.</string>
-  <string name="version">Versión</string>
-  <string name="halfDuplex">Modo Semi-dúplex</string>
-  <string name="halfDuplexSum">Silencia el audio del dispositivo cuando se activa Presionar-para-hablar, evitando que se produzca eco para los otros usuarios.</string>
-  <string name="handsetMode">Modo teléfono</string>
-  <string name="handsetModeSum">Utiliza el altavoz frontal y el sensor de proximidad para simular una llamada de teléfono.</string>
-  <string name="pttSound">Sonido al Presionar-para-hablar</string>
-  <string name="pttSoundSum">Reproducir un sonido cuando el botón de Presionar-para-hablar es pulsado.</string>
-  <string name="preprocessor_enabled">Activar el preprocesador de la entrada</string>
-  <string name="preprocessor_enabled_sum">Activar el preprocesador Speex para la supresión del ruido de ambiente y la normalización del volumen.</string>
-  <string name="audio_per_packet">Audio por paquete</string>
-  <string name="audio_per_packet_sum">La cantidad de audio por paquete de voz.</string>
-  <string name="stay_awake">Mantener pantalla encendida</string>
-  <string name="stay_awake_sum">La pantalla no se apagará mientras Mumla esté abierto.</string>
+    <string name="inputMethodVoice">Actividad de voz</string>
+    <string name="inputMethodPtt">Presionar-para-hablar</string>
+    <string name="inputMethodContinuous">Contínuo </string>
+    <!--Theme names-->
+    <string name="theme_light">Claro</string>
+    <string name="theme_dark">Oscuro</string>
+    <string name="theme_solarized_light">Claro solarizado</string>
+    <string name="theme_solarized_dark">Oscuro solarizado</string>
+    <!--Call modes-->
+    <string name="call_mode_speakerphone">Altavoz</string>
+    <string name="call_mode_voice_call">Llamada de voz</string>
+    <!--Hot corner-->
+    <string name="hot_corner_none">Ninguno</string>
+    <string name="hot_corner_top_left">Superior izquierda</string>
+    <string name="hot_corner_bottom_left">Inferior izquierda</string>
+    <string name="hot_corner_top_right">Superior derecha</string>
+    <string name="hot_corner_bottom_right">Inferior derecha</string>
+    <!--About-->
+    <string name="about">Acerca de</string>
+    <string name="aboutSum">Legal y agradecimientos</string>
+    <string name="acknowledgements">Agradecimientos</string>
+    <string name="acknowledgementsSum">Mira quién ha contribuido a Mumla</string>
+    <string name="licenses">Licencias</string>
+    <string name="authentication">Autenticación</string>
+    <string name="authenticationSum">Gestiona y crea certificados</string>
+    <string name="audioInput">Entrada de audio</string>
+    <string name="audioInputMethodSum">El método de entrada de audio</string>
+    <string name="audioInputMethod">Modo de transmisión</string>
+    <string name="audioInputVolume">Volumen del micrófono</string>
+    <string name="audioInputVolumeSum">Multiplicador del volumen del micrófono utilizado para normalizar el audio artificialmente.</string>
+    <string name="callMode">Modo de llamada</string>
+    <string name="callModeSum">El modo de llamada del Mumla, se comportará como una llamada de voz o  un altavoz.</string>
+    <string name="detectionThreshold">Umbral de detección</string>
+    <string name="detectionThresholdSum">La amplitud mínima requerida para que la voz sea detectada( solo aplicable para el modo de transmisión por actividad de voz )</string>
+    <string name="pttKey">Tecla de Presionar-para-hablar</string>
+    <string name="pttKeySum">Una tecla física para asignarla a Presionar-para-hablar</string>
+    <string name="hotCorner">Esquina de Presionar-para-hablar</string>
+    <string name="hotCornerSum">Una esquina de la pantalla asignada a Presionar-para-hablar que puede ser presionada en cualquier momento.</string>
+    <string name="general">General</string>
+    <string name="generalSum">Ajuste las opciones generales</string>
+    <string name="appearance">Apariencia</string>
+    <string name="appearanceSum">Modifique la apariencia de la aplicación</string>
+    <string name="themeSum">El tema visual de la aplicación</string>
+    <string name="theme">Tema</string>
+    <string name="advancedAudio">Avanzado</string>
+    <string name="forceTcp">Forzar TCP</string>
+    <string name="forceTcpSum">Al activarse se forzará el uso de la comunicación vía TCP (UDP desactivado)</string>
+    <string name="audio">Audio</string>
+    <string name="audioSum">Ajuste la entrada y salida del audio</string>
+    <string name="audioSampleRate">Frecuencia de muestreo de la entrada</string>
+    <string name="audioSampleRateSum">La frecuencia de muestreo del audio preferida. No todas las frecuencias son funcionales en todos los dispositivos.</string>
+    <string name="noCert">Sin certificado</string>
+    <string name="chatNotifications">Notificaciones del chat</string>
+    <string name="chatNotificationsSum">Mostrar notificaciones cuando un usuario escriba en el chat</string>
+    <string name="defaultUsername">Nombre de usuario predeterminado</string>
+    <string name="defaultUsernameSum">El nombre de usuario predeterminado que se usará al conectar a los servidores.</string>
+    <string name="defaultUsernameDefault">Mumla_User</string>
+    <string name="certificateGenerate">Generar certificado</string>
+    <string name="certificateGenerateSum">Genera un nuevo certificado de Mumla auto-firmado. Recomendado para principiantes.</string>
+    <string name="pttSettings">Opciones de Presionar-para-hablar</string>
+    <string name="pttSettingsSum">Configúrelo si Presionar-para-hablar está habilitado.</string>
+    <string name="voiceActivitySettings">Opciones de actividad de voz</string>
+    <string name="voiceActivitySettingsSum">Configúrelo si ha seleccionado transmisión por actividad de voz</string>
+    <string name="audioOutput">Salida de audio</string>
+    <string name="disableOpus">Inhabilitar códec Opus</string>
+    <string name="disableOpusSum">Inhabilitar soporte de Opus para los servidores de Mumble versión 1.2.4</string>
+    <string name="hidePtt">Ocultar botón de Presionar-para-hablar</string>
+    <string name="hidePttSum">Oculta el botón de Presionar-para-hablar en el modo Presionar-para-hablar. Útil si utilizas las esquinas de la pantalla o una tecla física.</string>
+    <string name="useTts">Texto a voz</string>
+    <string name="useTtsSum">Habilita el texto a voz para los mensajes entrantes</string>
+    <string name="togglePtt">Alternar Presionar-para-hablar</string>
+    <string name="togglePttSum">Alterna entre apagada y encendida la función Presionar-para-hablar</string>
+    <string name="autoReconnect">Reconectar automáticamente</string>
+    <string name="autoReconnectSum">Intenta restablecer automáticamente la conexión con el servidor cuando ésta se pierde</string>
+    <string name="useTor">Conectar via Tor</string>
+    <string name="useTorSum">Requiere la aplicación Orbot</string>
+    <string name="inputQuality">Calidad de entrada</string>
+    <string name="inputQualitySum">La calidad de entrada tope en bps.</string>
+    <string name="pressKey">Pulsa una tecla física para asignarla a Presionar-para-hablar</string>
+    <string name="pressKeyInfo">Nota: debido a limitaciones de Android, la aplicación debe de estar abierta para usar la tecla física.</string>
+    <string name="loadImagesSum">Elegir si cargar imágenes externas en el chat o no.</string>
+    <string name="loadImages">Cargar imágenes externas</string>
+    <string name="clearServerCertificates">Eliminar certificados de servidores</string>
+    <string name="clearServerCertificatesSum">Eliminar los certificados de todos los servidores permitidos de la base de datos de confianza de Mumla.</string>
+    <string name="version">Versión</string>
+    <string name="halfDuplex">Modo Semi-dúplex</string>
+    <string name="halfDuplexSum">Silencia el audio del dispositivo cuando se activa Presionar-para-hablar, evitando que se produzca eco para los otros usuarios.</string>
+    <string name="handsetMode">Modo teléfono</string>
+    <string name="handsetModeSum">Utiliza el altavoz frontal y el sensor de proximidad para simular una llamada de teléfono.</string>
+    <string name="pttSound">Sonido al Presionar-para-hablar</string>
+    <string name="pttSoundSum">Reproducir un sonido cuando el botón de Presionar-para-hablar es pulsado.</string>
+    <string name="preprocessor_enabled">Activar el preprocesador de la entrada</string>
+    <string name="preprocessor_enabled_sum">Activar el preprocesador Speex para la supresión del ruido de ambiente y la normalización del volumen.</string>
+    <string name="audio_per_packet">Audio por paquete</string>
+    <string name="audio_per_packet_sum">La cantidad de audio por paquete de voz.</string>
+    <string name="stay_awake">Mantener pantalla encendida</string>
+    <string name="stay_awake_sum">La pantalla no se apagará mientras Mumla esté abierto.</string>
 </resources>
diff --git a/app/src/main/res/values-fr/preference.xml b/app/src/main/res/values-fr/preference.xml
index 3baee8a..161cca2 100644
--- a/app/src/main/res/values-fr/preference.xml
+++ b/app/src/main/res/values-fr/preference.xml
@@ -1,100 +1,100 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="inputMethodVoice">Activité vocale</string>
-  <string name="inputMethodPtt">Appuyer pour parler</string>
-  <string name="inputMethodContinuous">Continu</string>
-  <!--Theme names-->
-  <string name="theme_light">Clair</string>
-  <string name="theme_dark">Sombre</string>
-  <string name="theme_solarized_light">Solaire</string>
-  <string name="theme_solarized_dark">Lunaire</string>
-  <!--Call modes-->
-  <string name="call_mode_speakerphone">Haut-parleur</string>
-  <string name="call_mode_voice_call">Appel vocal</string>
-  <!--Hot corner-->
-  <string name="hot_corner_none">Aucun</string>
-  <string name="hot_corner_top_left">En haut à gauche</string>
-  <string name="hot_corner_bottom_left">En bas à gauche</string>
-  <string name="hot_corner_top_right">En haut à droite</string>
-  <string name="hot_corner_bottom_right">En bas à droite</string>
-  <!--About-->
-  <string name="about">À propos</string>
-  <string name="aboutSum">Mentions et remerciements</string>
-  <string name="acknowledgements">Remerciements</string>
-  <string name="acknowledgementsSum">Découvrez qui a contribué à Mumla</string>
-  <string name="licenses">Licences</string>
-  <string name="authentication">Authentification</string>
-  <string name="authenticationSum">Gérer et créer des certificats</string>
-  <string name="audioInput">Entrée audio</string>
-  <string name="audioInputMethodSum">La méthode d\'entrée audio.</string>
-  <string name="audioInputMethod">Mode de transmition</string>
-  <string name="audioInputVolume">Volume du microphone</string>
-  <string name="audioInputVolumeSum">Volume du microphone pour normalisation audio artificielle</string>
-  <string name="callMode">Mode d\'appel</string>
-  <string name="callModeSum">Le mode d\'appel de Mumla, s\'il faut agir comme un appel vocal ou un haut-parleur.</string>
-  <string name="detectionThreshold">Seuil de détection</string>
-  <string name="detectionThresholdSum">L\'amplitude minimum nécessaire pour que la voix soit détectée (uniquement applicable pour les activités vocales).</string>
-  <string name="pttKey">Touche pour \"appuyer pour parler\"</string>
-  <string name="pttKeySum">Une touche à lier à \"appuyer pour parler\".</string>
-  <string name="hotCorner">Coin d\'activation pour \"appuyer pour parler\"</string>
-  <string name="hotCornerSum">Un coin spécifique de l\'écran qui, lorsqu\'appuyé, déclenchera \"appuyer pour parler\" dans Android.</string>
-  <string name="general">Général</string>
-  <string name="generalSum">Régler les paramètres généraux</string>
-  <string name="appearance">Apparence</string>
-  <string name="appearanceSum">Modifier l\'apparence de l\'application</string>
-  <string name="themeSum">Le theme de toute l\'application.</string>
-  <string name="theme">Thème</string>
-  <string name="advancedAudio">Avancé</string>
-  <string name="forceTcp">Forcer TCP</string>
-  <string name="forceTcpSum">S\'il faut forcer les communications TCP (désactive UDP).</string>
-  <string name="audio">Audio</string>
-  <string name="audioSum">Ajuster les entrées et sorties audio</string>
-  <string name="audioSampleRate">Taux d\'échantillonnage en entrée</string>
-  <string name="audioSampleRateSum">La fréquence d\'échantillonnage préférée. Tous les échantillonnages ne sont pas supportés par tous les appareils.</string>
-  <string name="noCert">Pas de certificat</string>
-  <string name="chatNotifications">Notifications du chat</string>
-  <string name="chatNotificationsSum">Afficher une notification lorsqu\'un utilisateur poste dans le chat.</string>
-  <string name="defaultUsername">Nom d\'utilisateur par défaut</string>
-  <string name="defaultUsernameSum">Le nom d\'utilisateur par défaut pour la connexion à des serveurs.</string>
-  <string name="defaultUsernameDefault">Utilisateur_Mumla</string>
-  <string name="certificateGenerate">Générer un certificat</string>
-  <string name="certificateGenerateSum">Générer un nouveau certificat Mumla auto-signé. Recommendé pour les débutants.</string>
-  <string name="pttSettings">Paramètres de \"appuyer pour parler\"</string>
-  <string name="pttSettingsSum">Configurer \"appuyer pour parler\" s\'il est activé.</string>
-  <string name="voiceActivitySettings">Paramètres d\'activité vocale</string>
-  <string name="voiceActivitySettingsSum">Configurer l\'activité vocale lorsqu\'activée</string>
-  <string name="audioOutput">Sortie audio</string>
-  <string name="disableOpus">Désactiver le codec Opus</string>
-  <string name="disableOpusSum">Désactiver le support de Opus pour les serveurs Mumble 1.2.4.</string>
-  <string name="hidePtt">Masquer le bouton \"Appuyer pour parler\"</string>
-  <string name="hidePttSum">Cache le bouton \"Appuyer pour parler\" en mode \"Appuyer pour parler\". Utile si vous utilisez les hot corners ou exclusivement une touche physique.</string>
-  <string name="useTts">Synthèse vocale</string>
-  <string name="useTtsSum">Activer la synthèse vocal pour les messages entrants.</string>
-  <string name="togglePtt">Activer le mode \"Appuyer pour Parler\"</string>
-  <string name="togglePttSum">Active/désactive \"Appuyer pour parler\" quand sélectionné.</string>
-  <string name="autoReconnect">Reconnexion automatique</string>
-  <string name="autoReconnectSum">Essayer automatiquement de rétablir une connexion quand la connexion au serveur est perdu.</string>
-  <string name="useTor">Se connecter via Tor</string>
-  <string name="useTorSum">Nécessite l\'app Orbot</string>
-  <string name="inputQuality">Qualité d\'entrée</string>
-  <string name="inputQualitySum">La qualité d\'entrée en bps.</string>
-  <string name="pressKey">Appuyer sur une touche physique à lier à \"Appuyer pour parler\"</string>
-  <string name="pressKeyInfo">Note : à cause de limitations d\'Android, l\'app doit être ouverte pour utiliser la touche pour \"Appuyer pour parler\"</string>
-  <string name="loadImagesSum">S\'il faut charger les images externes dans le chat.</string>
-  <string name="loadImages">Charger des images externes</string>
-  <string name="clearServerCertificates">Supprimer les certificats de serveur</string>
-  <string name="clearServerCertificatesSum">Supprimer tous les certificats de serveur acceptés de la base de données de confiance de Mumla.</string>
-  <string name="version">Version</string>
-  <string name="halfDuplex">Mode half-duplex</string>
-  <string name="halfDuplexSum">Coupe les sons de l\'appareil en mode \"appuyer pour parler\", supprime le retour audio des canaux.</string>
-  <string name="handsetMode">Mode combiné</string>
-  <string name="handsetModeSum">Utilise le haut-parleur frontal et le capteur de proximité pour simuler un appel.</string>
-  <string name="pttSound">Son \'Appuyer pour parler\'</string>
-  <string name="pttSoundSum">Joue un son quand le bouton \'Appuyer pour parler\' est appuyé.</string>
-  <string name="preprocessor_enabled">Activer le préprocesseur d\'entrée</string>
-  <string name="preprocessor_enabled_sum">Active le codec Speex pour la suppression de bruit ambiante et la normalisation du volume.</string>
-  <string name="audio_per_packet"> Trames audio par paquet</string>
-  <string name="audio_per_packet_sum">Durée de la trame audio par paquet.</string>
-  <string name="stay_awake">Rester activé</string>
-  <string name="stay_awake_sum">L\'écran ne s\'éteindra pas tant que Mumla sera ouvert</string>
+    <string name="inputMethodVoice">Activité vocale</string>
+    <string name="inputMethodPtt">Appuyer pour parler</string>
+    <string name="inputMethodContinuous">Continu</string>
+    <!--Theme names-->
+    <string name="theme_light">Clair</string>
+    <string name="theme_dark">Sombre</string>
+    <string name="theme_solarized_light">Solaire</string>
+    <string name="theme_solarized_dark">Lunaire</string>
+    <!--Call modes-->
+    <string name="call_mode_speakerphone">Haut-parleur</string>
+    <string name="call_mode_voice_call">Appel vocal</string>
+    <!--Hot corner-->
+    <string name="hot_corner_none">Aucun</string>
+    <string name="hot_corner_top_left">En haut à gauche</string>
+    <string name="hot_corner_bottom_left">En bas à gauche</string>
+    <string name="hot_corner_top_right">En haut à droite</string>
+    <string name="hot_corner_bottom_right">En bas à droite</string>
+    <!--About-->
+    <string name="about">À propos</string>
+    <string name="aboutSum">Mentions et remerciements</string>
+    <string name="acknowledgements">Remerciements</string>
+    <string name="acknowledgementsSum">Découvrez qui a contribué à Mumla</string>
+    <string name="licenses">Licences</string>
+    <string name="authentication">Authentification</string>
+    <string name="authenticationSum">Gérer et créer des certificats</string>
+    <string name="audioInput">Entrée audio</string>
+    <string name="audioInputMethodSum">La méthode d\'entrée audio.</string>
+    <string name="audioInputMethod">Mode de transmition</string>
+    <string name="audioInputVolume">Volume du microphone</string>
+    <string name="audioInputVolumeSum">Volume du microphone pour normalisation audio artificielle</string>
+    <string name="callMode">Mode d\'appel</string>
+    <string name="callModeSum">Le mode d\'appel de Mumla, s\'il faut agir comme un appel vocal ou un haut-parleur.</string>
+    <string name="detectionThreshold">Seuil de détection</string>
+    <string name="detectionThresholdSum">L\'amplitude minimum nécessaire pour que la voix soit détectée (uniquement applicable pour les activités vocales).</string>
+    <string name="pttKey">Touche pour \"appuyer pour parler\"</string>
+    <string name="pttKeySum">Une touche à lier à \"appuyer pour parler\".</string>
+    <string name="hotCorner">Coin d\'activation pour \"appuyer pour parler\"</string>
+    <string name="hotCornerSum">Un coin spécifique de l\'écran qui, lorsqu\'appuyé, déclenchera \"appuyer pour parler\" dans Android.</string>
+    <string name="general">Général</string>
+    <string name="generalSum">Régler les paramètres généraux</string>
+    <string name="appearance">Apparence</string>
+    <string name="appearanceSum">Modifier l\'apparence de l\'application</string>
+    <string name="themeSum">Le theme de toute l\'application.</string>
+    <string name="theme">Thème</string>
+    <string name="advancedAudio">Avancé</string>
+    <string name="forceTcp">Forcer TCP</string>
+    <string name="forceTcpSum">S\'il faut forcer les communications TCP (désactive UDP).</string>
+    <string name="audio">Audio</string>
+    <string name="audioSum">Ajuster les entrées et sorties audio</string>
+    <string name="audioSampleRate">Taux d\'échantillonnage en entrée</string>
+    <string name="audioSampleRateSum">La fréquence d\'échantillonnage préférée. Tous les échantillonnages ne sont pas supportés par tous les appareils.</string>
+    <string name="noCert">Pas de certificat</string>
+    <string name="chatNotifications">Notifications du chat</string>
+    <string name="chatNotificationsSum">Afficher une notification lorsqu\'un utilisateur poste dans le chat.</string>
+    <string name="defaultUsername">Nom d\'utilisateur par défaut</string>
+    <string name="defaultUsernameSum">Le nom d\'utilisateur par défaut pour la connexion à des serveurs.</string>
+    <string name="defaultUsernameDefault">Utilisateur_Mumla</string>
+    <string name="certificateGenerate">Générer un certificat</string>
+    <string name="certificateGenerateSum">Générer un nouveau certificat Mumla auto-signé. Recommendé pour les débutants.</string>
+    <string name="pttSettings">Paramètres de \"appuyer pour parler\"</string>
+    <string name="pttSettingsSum">Configurer \"appuyer pour parler\" s\'il est activé.</string>
+    <string name="voiceActivitySettings">Paramètres d\'activité vocale</string>
+    <string name="voiceActivitySettingsSum">Configurer l\'activité vocale lorsqu\'activée</string>
+    <string name="audioOutput">Sortie audio</string>
+    <string name="disableOpus">Désactiver le codec Opus</string>
+    <string name="disableOpusSum">Désactiver le support de Opus pour les serveurs Mumble 1.2.4.</string>
+    <string name="hidePtt">Masquer le bouton \"Appuyer pour parler\"</string>
+    <string name="hidePttSum">Cache le bouton \"Appuyer pour parler\" en mode \"Appuyer pour parler\". Utile si vous utilisez les hot corners ou exclusivement une touche physique.</string>
+    <string name="useTts">Synthèse vocale</string>
+    <string name="useTtsSum">Activer la synthèse vocal pour les messages entrants.</string>
+    <string name="togglePtt">Activer le mode \"Appuyer pour Parler\"</string>
+    <string name="togglePttSum">Active/désactive \"Appuyer pour parler\" quand sélectionné.</string>
+    <string name="autoReconnect">Reconnexion automatique</string>
+    <string name="autoReconnectSum">Essayer automatiquement de rétablir une connexion quand la connexion au serveur est perdu.</string>
+    <string name="useTor">Se connecter via Tor</string>
+    <string name="useTorSum">Nécessite l\'app Orbot</string>
+    <string name="inputQuality">Qualité d\'entrée</string>
+    <string name="inputQualitySum">La qualité d\'entrée en bps.</string>
+    <string name="pressKey">Appuyer sur une touche physique à lier à \"Appuyer pour parler\"</string>
+    <string name="pressKeyInfo">Note : à cause de limitations d\'Android, l\'app doit être ouverte pour utiliser la touche pour \"Appuyer pour parler\"</string>
+    <string name="loadImagesSum">S\'il faut charger les images externes dans le chat.</string>
+    <string name="loadImages">Charger des images externes</string>
+    <string name="clearServerCertificates">Supprimer les certificats de serveur</string>
+    <string name="clearServerCertificatesSum">Supprimer tous les certificats de serveur acceptés de la base de données de confiance de Mumla.</string>
+    <string name="version">Version</string>
+    <string name="halfDuplex">Mode half-duplex</string>
+    <string name="halfDuplexSum">Coupe les sons de l\'appareil en mode \"appuyer pour parler\", supprime le retour audio des canaux.</string>
+    <string name="handsetMode">Mode combiné</string>
+    <string name="handsetModeSum">Utilise le haut-parleur frontal et le capteur de proximité pour simuler un appel.</string>
+    <string name="pttSound">Son \'Appuyer pour parler\'</string>
+    <string name="pttSoundSum">Joue un son quand le bouton \'Appuyer pour parler\' est appuyé.</string>
+    <string name="preprocessor_enabled">Activer le préprocesseur d\'entrée</string>
+    <string name="preprocessor_enabled_sum">Active le codec Speex pour la suppression de bruit ambiante et la normalisation du volume.</string>
+    <string name="audio_per_packet"> Trames audio par paquet</string>
+    <string name="audio_per_packet_sum">Durée de la trame audio par paquet.</string>
+    <string name="stay_awake">Rester activé</string>
+    <string name="stay_awake_sum">L\'écran ne s\'éteindra pas tant que Mumla sera ouvert</string>
 </resources>
diff --git a/app/src/main/res/values-it/preference.xml b/app/src/main/res/values-it/preference.xml
index f2b5913..aa9c4bf 100644
--- a/app/src/main/res/values-it/preference.xml
+++ b/app/src/main/res/values-it/preference.xml
@@ -1,31 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <!--Theme names-->
-  <!--Call modes-->
-  <!--Hot corner-->
-  <!--About-->
-  <string name="about">Info su</string>
-  <string name="acknowledgementsSum">Guarda chi ha contribuito a Mumla</string>
-  <string name="licenses">Licenze</string>
-  <string name="authentication">Autenticazione</string>
-  <string name="authenticationSum">Gestisci e crea certificati</string>
-  <string name="audioInput">Input audio</string>
-  <string name="audioInputVolume">Volume microfono</string>
-  <string name="general">Generale</string>
-  <string name="theme">Tema</string>
-  <string name="advancedAudio">Avanzato</string>
-  <string name="forceTcp">Forza TCP</string>
-  <string name="audio">Audio</string>
-  <string name="audioSum">Regola input e output audio</string>
-  <string name="noCert">Nessun certificato</string>
-  <string name="chatNotifications">Notifiche chat</string>
-  <string name="certificateGenerate">Genera certificato</string>
-  <string name="audioOutput">Output audio</string>
-  <string name="disableOpus">Disabilita codec Opus</string>
-  <string name="useTts">Text-to-Speech</string>
-  <string name="autoReconnect">Riconnessione automatica</string>
-  <string name="useTor">Connetti tramite Tor</string>
-  <string name="inputQuality">Qualità Input</string>
-  <string name="loadImages">Carica immagini esterne</string>
-  <string name="clearServerCertificates">Pulisci certificati server</string>
+    <!--Theme names-->
+    <!--Call modes-->
+    <!--Hot corner-->
+    <!--About-->
+    <string name="about">Info su</string>
+    <string name="acknowledgementsSum">Guarda chi ha contribuito a Mumla</string>
+    <string name="licenses">Licenze</string>
+    <string name="authentication">Autenticazione</string>
+    <string name="authenticationSum">Gestisci e crea certificati</string>
+    <string name="audioInput">Input audio</string>
+    <string name="audioInputVolume">Volume microfono</string>
+    <string name="general">Generale</string>
+    <string name="theme">Tema</string>
+    <string name="advancedAudio">Avanzato</string>
+    <string name="forceTcp">Forza TCP</string>
+    <string name="audio">Audio</string>
+    <string name="audioSum">Regola input e output audio</string>
+    <string name="noCert">Nessun certificato</string>
+    <string name="chatNotifications">Notifiche chat</string>
+    <string name="certificateGenerate">Genera certificato</string>
+    <string name="audioOutput">Output audio</string>
+    <string name="disableOpus">Disabilita codec Opus</string>
+    <string name="useTts">Text-to-Speech</string>
+    <string name="autoReconnect">Riconnessione automatica</string>
+    <string name="useTor">Connetti tramite Tor</string>
+    <string name="inputQuality">Qualità Input</string>
+    <string name="loadImages">Carica immagini esterne</string>
+    <string name="clearServerCertificates">Pulisci certificati server</string>
 </resources>
diff --git a/app/src/main/res/values-ja/preference.xml b/app/src/main/res/values-ja/preference.xml
index 900fd49..54a2e7b 100644
--- a/app/src/main/res/values-ja/preference.xml
+++ b/app/src/main/res/values-ja/preference.xml
@@ -1,100 +1,100 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="inputMethodVoice">音声機能</string>
-  <string name="inputMethodPtt">プッシュ トゥ トーク</string>
-  <string name="inputMethodContinuous">連続</string>
-  <!--Theme names-->
-  <string name="theme_light">ライト</string>
-  <string name="theme_dark">ダーク</string>
-  <string name="theme_solarized_light">ソラライズ ライト</string>
-  <string name="theme_solarized_dark">ソラライズ ダーク</string>
-  <!--Call modes-->
-  <string name="call_mode_speakerphone">スピーカーフォン</string>
-  <string name="call_mode_voice_call">音声通話</string>
-  <!--Hot corner-->
-  <string name="hot_corner_none">なし</string>
-  <string name="hot_corner_top_left">左上</string>
-  <string name="hot_corner_bottom_left">左下</string>
-  <string name="hot_corner_top_right">右上</string>
-  <string name="hot_corner_bottom_right">右下</string>
-  <!--About-->
-  <string name="about">アプリについて</string>
-  <string name="aboutSum">法律と謝辞</string>
-  <string name="acknowledgements">謝辞</string>
-  <string name="acknowledgementsSum">Mumla の貢献者を参照</string>
-  <string name="licenses">ライセンス</string>
-  <string name="authentication">認証</string>
-  <string name="authenticationSum">証明書の管理と作成</string>
-  <string name="audioInput">音声入力</string>
-  <string name="audioInputMethodSum">音声入力の方法。</string>
-  <string name="audioInputMethod">送信モード</string>
-  <string name="audioInputVolume">マイクボリューム</string>
-  <string name="audioInputVolumeSum">音声を標準化するために使用する、マイクボリュームの乗数。</string>
-  <string name="callMode">通話モード</string>
-  <string name="callModeSum">Mumla の通話モード、音声通話またはスピーカーフォンのどちらかの機能。</string>
-  <string name="detectionThreshold">検出閾値</string>
-  <string name="detectionThresholdSum">音声の検出に必要な最小振幅 (音声機能にのみ適用可能)。</string>
-  <string name="pttKey">プッシュツートーク キー</string>
-  <string name="pttKeySum">プッシュツートークに紐付けるハードウェアキー。</string>
-  <string name="hotCorner">プッシュツートーク ホットコーナー</string>
-  <string name="hotCornerSum">指定された画面のコーナーが押された時に、Android を通してプッシュツートークします。</string>
-  <string name="general">全般</string>
-  <string name="generalSum">全般の設定を調整します</string>
-  <string name="appearance">外観</string>
-  <string name="appearanceSum">アプリの外観を微調整します</string>
-  <string name="themeSum">アプリ全体のテーマ。</string>
-  <string name="theme">テーマ</string>
-  <string name="advancedAudio">高度な設定</string>
-  <string name="forceTcp">TCP を強制</string>
-  <string name="forceTcpSum">TCP 通信を強制する (UDPを無効にする) かどうか。</string>
-  <string name="audio">音声</string>
-  <string name="audioSum">音声入力および出力を超セします</string>
-  <string name="audioSampleRate">入力サンプルレート</string>
-  <string name="audioSampleRateSum">お好みのオーディオ サンプルレート。すべてのデバイスですべてのレートがサポートされているわけではありません。</string>
-  <string name="noCert">証明書がありません</string>
-  <string name="chatNotifications">チャット通知</string>
-  <string name="chatNotificationsSum">ユーザーがチャットに投稿した時に、通知を表示します。</string>
-  <string name="defaultUsername">デフォルトのユーザー名</string>
-  <string name="defaultUsernameSum">サーバへ接続する時に使用するデフォルトのユーザー名。</string>
-  <string name="defaultUsernameDefault">Mumla_User</string>
-  <string name="certificateGenerate">証明書を生成</string>
-  <string name="certificateGenerateSum">新しい自己署名の Mumla 証明書を生成します。初心者におすすめです。</string>
-  <string name="pttSettings">プッシュツートーク設定</string>
-  <string name="pttSettingsSum">有効な場合、プッシュツートークを設定します。</string>
-  <string name="voiceActivitySettings">音声機能設定</string>
-  <string name="voiceActivitySettingsSum">有効な場合、音声機能を設定します。</string>
-  <string name="audioOutput">音声出力</string>
-  <string name="disableOpus">Opus Codec を無効にする</string>
-  <string name="disableOpusSum">Mumble 1.2.4 サーバーで、Opus サポートを無効にします。</string>
-  <string name="hidePtt">プッシュツートークボタンを非表示</string>
-  <string name="hidePttSum">プッシュツートーク モードの時にプッシュツートークボタンを非表示にします。排他的にホットコーナーやハードウェアキーを使用する場合に便利です。</string>
-  <string name="useTts">テキスト読み上げ</string>
-  <string name="useTtsSum">受信メッセージのテキスト読み上げを有効にします。</string>
-  <string name="togglePtt">プッシュツートークを切り替え</string>
-  <string name="togglePttSum">押されたときに、プッシュツートークをオンとオフで切り替えます。</string>
-  <string name="autoReconnect">自動再接続</string>
-  <string name="autoReconnectSum">サーバの接続が失われた時に、自動的に接続の再確立を試みます。</string>
-  <string name="useTor">Tor 経由で接続</string>
-  <string name="useTorSum">Orbot アプリが必要です</string>
-  <string name="inputQuality">入力品質</string>
-  <string name="inputQualitySum">目標の入力品質を bps で指定します。</string>
-  <string name="pressKey">プッシュツートークに紐付けするハードウェアキーを押してください。</string>
-  <string name="pressKeyInfo">注意: Android の制限により、ハードウェアキーを使用してプッシュツートークを行うには、アプリが開かれている必要があります。</string>
-  <string name="loadImagesSum">チャットで外部の画像をロードするかどうか。</string>
-  <string name="loadImages">外部の画像をロード</string>
-  <string name="clearServerCertificates">サーバー証明書をクリア</string>
-  <string name="clearServerCertificatesSum">Mumla トラストデータベースから、許可されたサーバ証明書をすべてクリアします。</string>
-  <string name="version">バージョン</string>
-  <string name="halfDuplex">半二重モード</string>
-  <string name="halfDuplexSum">プッシュツートークを使用する時に、デバイスのサウンドをミュートします。チャンネルのユーザーに対して音声フィードバックを除去します。</string>
-  <string name="handsetMode">ハンドセット モード</string>
-  <string name="handsetModeSum">従来の電話の呼び出しをシミュレートするために、フロントスピーカーと近接センサーを使用します。</string>
-  <string name="pttSound">プッシュツートーク サウンド</string>
-  <string name="pttSoundSum">プッシュツートーク ボタンが押されたときに効果音を再生します。</string>
-  <string name="preprocessor_enabled">入力プリプロセッサを有効にする</string>
-  <string name="preprocessor_enabled_sum">周囲のノイズ抑制やボリューム標準化のために、Speex プリプロセッサを有効にします。</string>
-  <string name="audio_per_packet">パケット当たりの音声</string>
-  <string name="audio_per_packet_sum">音声パケットあたりの音声の長さ。</string>
-  <string name="stay_awake">画面をオフにしない</string>
-  <string name="stay_awake_sum">Mumla が開かれているときは、画面をオフにしません。</string>
+    <string name="inputMethodVoice">音声機能</string>
+    <string name="inputMethodPtt">プッシュ トゥ トーク</string>
+    <string name="inputMethodContinuous">連続</string>
+    <!--Theme names-->
+    <string name="theme_light">ライト</string>
+    <string name="theme_dark">ダーク</string>
+    <string name="theme_solarized_light">ソラライズ ライト</string>
+    <string name="theme_solarized_dark">ソラライズ ダーク</string>
+    <!--Call modes-->
+    <string name="call_mode_speakerphone">スピーカーフォン</string>
+    <string name="call_mode_voice_call">音声通話</string>
+    <!--Hot corner-->
+    <string name="hot_corner_none">なし</string>
+    <string name="hot_corner_top_left">左上</string>
+    <string name="hot_corner_bottom_left">左下</string>
+    <string name="hot_corner_top_right">右上</string>
+    <string name="hot_corner_bottom_right">右下</string>
+    <!--About-->
+    <string name="about">アプリについて</string>
+    <string name="aboutSum">法律と謝辞</string>
+    <string name="acknowledgements">謝辞</string>
+    <string name="acknowledgementsSum">Mumla の貢献者を参照</string>
+    <string name="licenses">ライセンス</string>
+    <string name="authentication">認証</string>
+    <string name="authenticationSum">証明書の管理と作成</string>
+    <string name="audioInput">音声入力</string>
+    <string name="audioInputMethodSum">音声入力の方法。</string>
+    <string name="audioInputMethod">送信モード</string>
+    <string name="audioInputVolume">マイクボリューム</string>
+    <string name="audioInputVolumeSum">音声を標準化するために使用する、マイクボリュームの乗数。</string>
+    <string name="callMode">通話モード</string>
+    <string name="callModeSum">Mumla の通話モード、音声通話またはスピーカーフォンのどちらかの機能。</string>
+    <string name="detectionThreshold">検出閾値</string>
+    <string name="detectionThresholdSum">音声の検出に必要な最小振幅 (音声機能にのみ適用可能)。</string>
+    <string name="pttKey">プッシュツートーク キー</string>
+    <string name="pttKeySum">プッシュツートークに紐付けるハードウェアキー。</string>
+    <string name="hotCorner">プッシュツートーク ホットコーナー</string>
+    <string name="hotCornerSum">指定された画面のコーナーが押された時に、Android を通してプッシュツートークします。</string>
+    <string name="general">全般</string>
+    <string name="generalSum">全般の設定を調整します</string>
+    <string name="appearance">外観</string>
+    <string name="appearanceSum">アプリの外観を微調整します</string>
+    <string name="themeSum">アプリ全体のテーマ。</string>
+    <string name="theme">テーマ</string>
+    <string name="advancedAudio">高度な設定</string>
+    <string name="forceTcp">TCP を強制</string>
+    <string name="forceTcpSum">TCP 通信を強制する (UDPを無効にする) かどうか。</string>
+    <string name="audio">音声</string>
+    <string name="audioSum">音声入力および出力を超セします</string>
+    <string name="audioSampleRate">入力サンプルレート</string>
+    <string name="audioSampleRateSum">お好みのオーディオ サンプルレート。すべてのデバイスですべてのレートがサポートされているわけではありません。</string>
+    <string name="noCert">証明書がありません</string>
+    <string name="chatNotifications">チャット通知</string>
+    <string name="chatNotificationsSum">ユーザーがチャットに投稿した時に、通知を表示します。</string>
+    <string name="defaultUsername">デフォルトのユーザー名</string>
+    <string name="defaultUsernameSum">サーバへ接続する時に使用するデフォルトのユーザー名。</string>
+    <string name="defaultUsernameDefault">Mumla_User</string>
+    <string name="certificateGenerate">証明書を生成</string>
+    <string name="certificateGenerateSum">新しい自己署名の Mumla 証明書を生成します。初心者におすすめです。</string>
+    <string name="pttSettings">プッシュツートーク設定</string>
+    <string name="pttSettingsSum">有効な場合、プッシュツートークを設定します。</string>
+    <string name="voiceActivitySettings">音声機能設定</string>
+    <string name="voiceActivitySettingsSum">有効な場合、音声機能を設定します。</string>
+    <string name="audioOutput">音声出力</string>
+    <string name="disableOpus">Opus Codec を無効にする</string>
+    <string name="disableOpusSum">Mumble 1.2.4 サーバーで、Opus サポートを無効にします。</string>
+    <string name="hidePtt">プッシュツートークボタンを非表示</string>
+    <string name="hidePttSum">プッシュツートーク モードの時にプッシュツートークボタンを非表示にします。排他的にホットコーナーやハードウェアキーを使用する場合に便利です。</string>
+    <string name="useTts">テキスト読み上げ</string>
+    <string name="useTtsSum">受信メッセージのテキスト読み上げを有効にします。</string>
+    <string name="togglePtt">プッシュツートークを切り替え</string>
+    <string name="togglePttSum">押されたときに、プッシュツートークをオンとオフで切り替えます。</string>
+    <string name="autoReconnect">自動再接続</string>
+    <string name="autoReconnectSum">サーバの接続が失われた時に、自動的に接続の再確立を試みます。</string>
+    <string name="useTor">Tor 経由で接続</string>
+    <string name="useTorSum">Orbot アプリが必要です</string>
+    <string name="inputQuality">入力品質</string>
+    <string name="inputQualitySum">目標の入力品質を bps で指定します。</string>
+    <string name="pressKey">プッシュツートークに紐付けするハードウェアキーを押してください。</string>
+    <string name="pressKeyInfo">注意: Android の制限により、ハードウェアキーを使用してプッシュツートークを行うには、アプリが開かれている必要があります。</string>
+    <string name="loadImagesSum">チャットで外部の画像をロードするかどうか。</string>
+    <string name="loadImages">外部の画像をロード</string>
+    <string name="clearServerCertificates">サーバー証明書をクリア</string>
+    <string name="clearServerCertificatesSum">Mumla トラストデータベースから、許可されたサーバ証明書をすべてクリアします。</string>
+    <string name="version">バージョン</string>
+    <string name="halfDuplex">半二重モード</string>
+    <string name="halfDuplexSum">プッシュツートークを使用する時に、デバイスのサウンドをミュートします。チャンネルのユーザーに対して音声フィードバックを除去します。</string>
+    <string name="handsetMode">ハンドセット モード</string>
+    <string name="handsetModeSum">従来の電話の呼び出しをシミュレートするために、フロントスピーカーと近接センサーを使用します。</string>
+    <string name="pttSound">プッシュツートーク サウンド</string>
+    <string name="pttSoundSum">プッシュツートーク ボタンが押されたときに効果音を再生します。</string>
+    <string name="preprocessor_enabled">入力プリプロセッサを有効にする</string>
+    <string name="preprocessor_enabled_sum">周囲のノイズ抑制やボリューム標準化のために、Speex プリプロセッサを有効にします。</string>
+    <string name="audio_per_packet">パケット当たりの音声</string>
+    <string name="audio_per_packet_sum">音声パケットあたりの音声の長さ。</string>
+    <string name="stay_awake">画面をオフにしない</string>
+    <string name="stay_awake_sum">Mumla が開かれているときは、画面をオフにしません。</string>
 </resources>
diff --git a/app/src/main/res/values-nl/preference.xml b/app/src/main/res/values-nl/preference.xml
index e1a58f8..6374133 100644
--- a/app/src/main/res/values-nl/preference.xml
+++ b/app/src/main/res/values-nl/preference.xml
@@ -1,98 +1,98 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="inputMethodVoice">Stem Activiteit</string>
-  <string name="inputMethodPtt">Push to Talk</string>
-  <string name="inputMethodContinuous">Doorlopend</string>
-  <!--Theme names-->
-  <string name="theme_light">Licht</string>
-  <string name="theme_dark">Donker</string>
-  <string name="theme_solarized_light">Solarized Licht</string>
-  <string name="theme_solarized_dark">Solarized Donker</string>
-  <!--Call modes-->
-  <string name="call_mode_speakerphone">Luidspreker</string>
-  <string name="call_mode_voice_call">Stem Oproep</string>
-  <!--Hot corner-->
-  <string name="hot_corner_none">Geen</string>
-  <string name="hot_corner_top_left">Top Links</string>
-  <string name="hot_corner_bottom_left">Bodem Links</string>
-  <string name="hot_corner_top_right">Top Rechts</string>
-  <string name="hot_corner_bottom_right">Bodem Rechts</string>
-  <!--About-->
-  <string name="about">Over</string>
-  <string name="aboutSum">Legaal en dankbetuigingen</string>
-  <string name="acknowledgements">Dankbetuigingen</string>
-  <string name="acknowledgementsSum">Bekijk wie tot Mumla heeft bijgedragen</string>
-  <string name="licenses">Licenties</string>
-  <string name="authentication">Authenticatie</string>
-  <string name="authenticationSum">Beheer en creeer certificaten</string>
-  <string name="audioInput">Audio Invoer</string>
-  <string name="audioInputMethodSum">De methode van audio invoer.</string>
-  <string name="audioInputMethod">Doorstuur Methode</string>
-  <string name="audioInputVolume">Microfoon Volume</string>
-  <string name="audioInputVolumeSum">Microfoon volume vermeerdering om audio kunstmatig te normaliseren.</string>
-  <string name="callMode">Oproep Modus</string>
-  <string name="callModeSum">De oproep modus van Mumla, zijnde luidspreker of gewone oproep.</string>
-  <string name="detectionThreshold">Detectie Drempelwaarde</string>
-  <string name="detectionThresholdSum">De minimum geluidsnorm vereist om stemdetectie te starten.</string>
-  <string name="pttKey">Push to Talk Knop</string>
-  <string name="pttKeySum">Een hardware knop om Push to Talk aan te binden.</string>
-  <string name="hotCorner">Push to Talk Scherm Hoek</string>
-  <string name="hotCornerSum">Een specifieke hoek van het scherm dat, wanneer ingedrukt, Push to Talk activeert.</string>
-  <string name="general">Algemeen</string>
-  <string name="generalSum">Algemene instellingen aanpassen</string>
-  <string name="appearance">Uiterlijk</string>
-  <string name="appearanceSum">Verander applicatie uiterlijk</string>
-  <string name="themeSum">Het applicatie thema.</string>
-  <string name="theme">Thema</string>
-  <string name="advancedAudio">Geavanceerd</string>
-  <string name="forceTcp">Forceer TCP</string>
-  <string name="forceTcpSum">TCP communicatie forceren (UPD uitschakelen).</string>
-  <string name="audio">Audio</string>
-  <string name="audioSum">Audio in- en uitvoer aanpassen</string>
-  <string name="audioSampleRate">Invoer Sample Rate</string>
-  <string name="audioSampleRateSum">De voorkeur audio sample rate. Niet alle rates worden door alle toestellen ondersteund.</string>
-  <string name="noCert">Geen Certificaat</string>
-  <string name="chatNotifications">Chat Notificaties</string>
-  <string name="chatNotificationsSum">Toon notificatie wanneer een gebruiker in chat post.</string>
-  <string name="defaultUsername">Standaard Gebruikersnaam</string>
-  <string name="defaultUsernameSum">De standaard gebruikersnaam te gebruiken bij verbinding met servers.</string>
-  <string name="defaultUsernameDefault">Mumla_Gebruiker</string>
-  <string name="certificateGenerate">Genereer Certificaat</string>
-  <string name="certificateGenerateSum">Genereert een nieuw self-signed Mumla certificaat. Annbevolen voor beginners.</string>
-  <string name="pttSettings">Push to Talk Instellingen</string>
-  <string name="pttSettingsSum">Configureer Push to Talk als dit ingeschakeld is.</string>
-  <string name="voiceActivitySettings">Stem Activatie Instellingen</string>
-  <string name="voiceActivitySettingsSum">Configureer Stem Activatie als dit is ingeschakeld.</string>
-  <string name="audioOutput">Audio Uitvoer</string>
-  <string name="disableOpus">Schakel Opus Codec uit</string>
-  <string name="disableOpusSum">Schakel Opus Codec uit voor Mumble 1.2.4 servers.</string>
-  <string name="hidePtt">Verberg Push to Talk Knop</string>
-  <string name="hidePttSum">Verbergt Push to Talk knop wanneer in Push to Talk modus. Nuttig indien u uitsluitend schermhoeken of hardware knop gebruikt.</string>
-  <string name="useTts">Text-to-Speech</string>
-  <string name="useTtsSum">Schakel Text-to-Speech in voor inkomende berichten.</string>
-  <string name="togglePtt">Push to Talk aan/uit</string>
-  <string name="togglePttSum">Schakelt Push to Talk aan/uit wanneer ingedrukt.</string>
-  <string name="autoReconnect">Automatisch Herverbinden</string>
-  <string name="autoReconnectSum">Automatisch proberen herverbinden wanneer de verbinding met de server wegvalt.</string>
-  <string name="useTor">Verbind via Tor</string>
-  <string name="useTorSum">Vereist Orbot applicatie</string>
-  <string name="inputQuality">Invoer Kwaliteit</string>
-  <string name="inputQualitySum">De beoogde invoer kwaiteit in bps.</string>
-  <string name="pressKey">Druk op een hardware knop om aan push-to-talk te binden.</string>
-  <string name="pressKeyInfo">Nota: vanwege Android beperkingen moet de applicatie geopend zijn om de hardware push to talk knop te gebruiken.</string>
-  <string name="loadImagesSum">Al dan niet externe afbeeldingen laden in chat.</string>
-  <string name="loadImages">Externe Afbeeldingen Laden</string>
-  <string name="clearServerCertificates">Wis Server Certificaten</string>
-  <string name="clearServerCertificatesSum">Wis alle toegestane certificaten uit de Mumla database.</string>
-  <string name="version">Versie</string>
-  <string name="halfDuplex">Half Duplex Modus</string>
-  <string name="halfDuplexSum">Dempt het geluid van het toestel bij push to talk om feedback te voorkomen.</string>
-  <string name="handsetMode">Telefoon Modus</string>
-  <string name="handsetModeSum">Gebruikt frontale luidspreker en nabijheidssensor om een normaal telefoongesprek na te bootsen.</string>
-  <string name="pttSound">Push to Talk Geluid</string>
-  <string name="pttSoundSum">Speelt geluidseffect wanneer Push to Talk knop ingedrukt wordt.</string>
-  <string name="preprocessor_enabled">Activeer Invoer Preprocessor</string>
-  <string name="preprocessor_enabled_sum">Activeer de Speex preprocessor om omgevingsgeluid te dempen en volume te normaliseren.</string>
-  <string name="audio_per_packet">Audio per packet</string>
-  <string name="audio_per_packet_sum">De lengte van audio per voice packet.</string>
+    <string name="inputMethodVoice">Stem Activiteit</string>
+    <string name="inputMethodPtt">Push to Talk</string>
+    <string name="inputMethodContinuous">Doorlopend</string>
+    <!--Theme names-->
+    <string name="theme_light">Licht</string>
+    <string name="theme_dark">Donker</string>
+    <string name="theme_solarized_light">Solarized Licht</string>
+    <string name="theme_solarized_dark">Solarized Donker</string>
+    <!--Call modes-->
+    <string name="call_mode_speakerphone">Luidspreker</string>
+    <string name="call_mode_voice_call">Stem Oproep</string>
+    <!--Hot corner-->
+    <string name="hot_corner_none">Geen</string>
+    <string name="hot_corner_top_left">Top Links</string>
+    <string name="hot_corner_bottom_left">Bodem Links</string>
+    <string name="hot_corner_top_right">Top Rechts</string>
+    <string name="hot_corner_bottom_right">Bodem Rechts</string>
+    <!--About-->
+    <string name="about">Over</string>
+    <string name="aboutSum">Legaal en dankbetuigingen</string>
+    <string name="acknowledgements">Dankbetuigingen</string>
+    <string name="acknowledgementsSum">Bekijk wie tot Mumla heeft bijgedragen</string>
+    <string name="licenses">Licenties</string>
+    <string name="authentication">Authenticatie</string>
+    <string name="authenticationSum">Beheer en creeer certificaten</string>
+    <string name="audioInput">Audio Invoer</string>
+    <string name="audioInputMethodSum">De methode van audio invoer.</string>
+    <string name="audioInputMethod">Doorstuur Methode</string>
+    <string name="audioInputVolume">Microfoon Volume</string>
+    <string name="audioInputVolumeSum">Microfoon volume vermeerdering om audio kunstmatig te normaliseren.</string>
+    <string name="callMode">Oproep Modus</string>
+    <string name="callModeSum">De oproep modus van Mumla, zijnde luidspreker of gewone oproep.</string>
+    <string name="detectionThreshold">Detectie Drempelwaarde</string>
+    <string name="detectionThresholdSum">De minimum geluidsnorm vereist om stemdetectie te starten.</string>
+    <string name="pttKey">Push to Talk Knop</string>
+    <string name="pttKeySum">Een hardware knop om Push to Talk aan te binden.</string>
+    <string name="hotCorner">Push to Talk Scherm Hoek</string>
+    <string name="hotCornerSum">Een specifieke hoek van het scherm dat, wanneer ingedrukt, Push to Talk activeert.</string>
+    <string name="general">Algemeen</string>
+    <string name="generalSum">Algemene instellingen aanpassen</string>
+    <string name="appearance">Uiterlijk</string>
+    <string name="appearanceSum">Verander applicatie uiterlijk</string>
+    <string name="themeSum">Het applicatie thema.</string>
+    <string name="theme">Thema</string>
+    <string name="advancedAudio">Geavanceerd</string>
+    <string name="forceTcp">Forceer TCP</string>
+    <string name="forceTcpSum">TCP communicatie forceren (UPD uitschakelen).</string>
+    <string name="audio">Audio</string>
+    <string name="audioSum">Audio in- en uitvoer aanpassen</string>
+    <string name="audioSampleRate">Invoer Sample Rate</string>
+    <string name="audioSampleRateSum">De voorkeur audio sample rate. Niet alle rates worden door alle toestellen ondersteund.</string>
+    <string name="noCert">Geen Certificaat</string>
+    <string name="chatNotifications">Chat Notificaties</string>
+    <string name="chatNotificationsSum">Toon notificatie wanneer een gebruiker in chat post.</string>
+    <string name="defaultUsername">Standaard Gebruikersnaam</string>
+    <string name="defaultUsernameSum">De standaard gebruikersnaam te gebruiken bij verbinding met servers.</string>
+    <string name="defaultUsernameDefault">Mumla_Gebruiker</string>
+    <string name="certificateGenerate">Genereer Certificaat</string>
+    <string name="certificateGenerateSum">Genereert een nieuw self-signed Mumla certificaat. Annbevolen voor beginners.</string>
+    <string name="pttSettings">Push to Talk Instellingen</string>
+    <string name="pttSettingsSum">Configureer Push to Talk als dit ingeschakeld is.</string>
+    <string name="voiceActivitySettings">Stem Activatie Instellingen</string>
+    <string name="voiceActivitySettingsSum">Configureer Stem Activatie als dit is ingeschakeld.</string>
+    <string name="audioOutput">Audio Uitvoer</string>
+    <string name="disableOpus">Schakel Opus Codec uit</string>
+    <string name="disableOpusSum">Schakel Opus Codec uit voor Mumble 1.2.4 servers.</string>
+    <string name="hidePtt">Verberg Push to Talk Knop</string>
+    <string name="hidePttSum">Verbergt Push to Talk knop wanneer in Push to Talk modus. Nuttig indien u uitsluitend schermhoeken of hardware knop gebruikt.</string>
+    <string name="useTts">Text-to-Speech</string>
+    <string name="useTtsSum">Schakel Text-to-Speech in voor inkomende berichten.</string>
+    <string name="togglePtt">Push to Talk aan/uit</string>
+    <string name="togglePttSum">Schakelt Push to Talk aan/uit wanneer ingedrukt.</string>
+    <string name="autoReconnect">Automatisch Herverbinden</string>
+    <string name="autoReconnectSum">Automatisch proberen herverbinden wanneer de verbinding met de server wegvalt.</string>
+    <string name="useTor">Verbind via Tor</string>
+    <string name="useTorSum">Vereist Orbot applicatie</string>
+    <string name="inputQuality">Invoer Kwaliteit</string>
+    <string name="inputQualitySum">De beoogde invoer kwaiteit in bps.</string>
+    <string name="pressKey">Druk op een hardware knop om aan push-to-talk te binden.</string>
+    <string name="pressKeyInfo">Nota: vanwege Android beperkingen moet de applicatie geopend zijn om de hardware push to talk knop te gebruiken.</string>
+    <string name="loadImagesSum">Al dan niet externe afbeeldingen laden in chat.</string>
+    <string name="loadImages">Externe Afbeeldingen Laden</string>
+    <string name="clearServerCertificates">Wis Server Certificaten</string>
+    <string name="clearServerCertificatesSum">Wis alle toegestane certificaten uit de Mumla database.</string>
+    <string name="version">Versie</string>
+    <string name="halfDuplex">Half Duplex Modus</string>
+    <string name="halfDuplexSum">Dempt het geluid van het toestel bij push to talk om feedback te voorkomen.</string>
+    <string name="handsetMode">Telefoon Modus</string>
+    <string name="handsetModeSum">Gebruikt frontale luidspreker en nabijheidssensor om een normaal telefoongesprek na te bootsen.</string>
+    <string name="pttSound">Push to Talk Geluid</string>
+    <string name="pttSoundSum">Speelt geluidseffect wanneer Push to Talk knop ingedrukt wordt.</string>
+    <string name="preprocessor_enabled">Activeer Invoer Preprocessor</string>
+    <string name="preprocessor_enabled_sum">Activeer de Speex preprocessor om omgevingsgeluid te dempen en volume te normaliseren.</string>
+    <string name="audio_per_packet">Audio per packet</string>
+    <string name="audio_per_packet_sum">De lengte van audio per voice packet.</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6824362..09602e2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,7 +24,7 @@
 
     <color name="popup_menu_item_background">#555555</color>
     <color name="popup_menu_item_disabled_mask">#66000000</color>
-    
+
     <!-- A light Holo shade of blue -->
     <color name="holo_blue_light">#ff33b5e5</color>
     <!-- A light Holo shade of green -->
@@ -63,4 +63,4 @@
     <color name="ripple_talk_state_suppressed">@color/holo_green_dark</color>
     <color name="ripple_talk_state_server_muted">@color/holo_blue_dark</color>
     <color name="ripple_talk_state_server_deafened">@color/holo_blue_dark</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c874710..30652cd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,130 +1,130 @@
-<!--

-  ~ Copyright (C) 2014 Andrew Comminos

-  ~

-  ~ This program is free software: you can redistribute it and/or modify

-  ~ it under the terms of the GNU General Public License as published by

-  ~ the Free Software Foundation, either version 3 of the License, or

-  ~ (at your option) any later version.

-  ~

-  ~ This program is distributed in the hope that it will be useful,

-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-  ~ GNU General Public License for more details.

-  ~

-  ~ You should have received a copy of the GNU General Public License

-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.

-  -->

-

-<resources xmlns:tools="http://schemas.android.com/tools"

-    xmlns:android="http://schemas.android.com/apk/res/android"

-    tools:ignore="NewApi">

-    

-    <style name="Theme.Mumla" parent="@style/Theme.AppCompat.Light.DarkActionBar">

-        <item name="android:textColorPrimary">#000</item>

-        <item name="android:textColorSecondary">#666</item>

-        <item name="android:textColorPrimaryInverse">#FFF</item>

-        <item name="android:textColorSecondaryInverse">#AAA</item>

-

-        <item name="actionBarStyle">@style/MumlaDarkActionBar</item>

-

-        <item name="colorPrimary">#454D5E</item>

-        <item name="colorPrimaryDark">#2F3440</item>

-        <item name="colorAccent">#454D5E</item>

-

-        <item name="cardStyle">@style/Theme.Mumla.CardView</item>

-    </style>

-

-    <style name="Theme.Mumla.CardView" parent="CardView">

-    </style>

-

-    <style name="Theme.Mumla.Dark" parent="@style/Theme.AppCompat">

-        <item name="android:textColorPrimary">#FFF</item>

-        <item name="android:textColorSecondary">#DDD</item>

-        <item name="android:textColorPrimaryInverse">#FFF</item>

-        <item name="android:textColorSecondaryInverse">#AAA</item>

-

-        <item name="actionBarStyle">@style/MumlaDarkActionBar</item>

-

-        <item name="cardStyle">@style/Theme.Mumla.Dark.CardView</item>

-    </style>

-

-    <style name="MumlaDarkActionBar" parent="@style/Widget.AppCompat.ActionBar.Solid">

-        <item name="titleTextStyle">@style/MumlaDarkActionBarText</item>

-    </style>

-

-    <style name="MumlaDarkActionBarText" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">

-        <item name="android:textColor">#FFFFFF</item>

-    </style>

-

-    <style name="Theme.Mumla.Dark.CardView" parent="CardView">

-        <item name="cardBackgroundColor">#333</item>

-    </style>

-

-    <!-- Solarized theme sets based off of Ethan Schoonover's work: http://ethanschoonover.com/solarized -->

-

-    <style name="Theme.Mumla.Solarized.Light" parent="@style/Theme.AppCompat.Light">

-        <item name="android:textColor">?android:textColorPrimary</item>

-        <item name="android:textColorPrimary">@color/solarized_base00</item>

-        <item name="android:textColorSecondary">@color/solarized_base01</item>

-        <item name="android:textColorPrimaryInverse">?android:textColorPrimary</item>

-        <item name="android:textColorSecondaryInverse">?android:textColorSecondary</item>

-        <item name="android:textColorLink">@color/solarized_base02</item>

-

-        <item name="android:windowBackground">@color/solarized_base3</item>

-        <item name="android:colorBackground">@color/solarized_base3</item>

-

-        <item name="actionBarStyle">@style/SolarizedLightActionBar</item>

-

-        <item name="colorPrimary">@color/solarized_base2</item>

-        <item name="colorPrimaryDark">@color/solarized_base3</item>

-        <item name="colorAccent">@color/solarized_base2</item>

-

-        <item name="cardStyle">@style/Theme.Mumla.Solarized.Light.CardView</item>

-    </style>

-

-    <style name="SolarizedLightActionBar" parent="@style/Widget.AppCompat.ActionBar">

-        <item name="background">@color/solarized_base2</item>

-        <item name="titleTextStyle">@style/SolarizedLightActionBarText</item>

-    </style>

-

-    <style name="SolarizedLightActionBarText" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">

-        <item name="android:textColor">@color/solarized_base00</item>

-    </style>

-

-    <style name="Theme.Mumla.Solarized.Light.CardView" parent="CardView">

-        <item name="cardBackgroundColor">@color/solarized_base2</item>

-    </style>

-

-    <style name="Theme.Mumla.Solarized.Dark" parent="@style/Theme.AppCompat">

-        <item name="android:textColor">?android:textColorPrimary</item>

-        <item name="android:textColorPrimary">@color/solarized_base0</item>

-        <item name="android:textColorSecondary">@color/solarized_base1</item>

-        <item name="android:textColorPrimaryInverse">?android:textColorPrimary</item>

-        <item name="android:textColorSecondaryInverse">?android:textColorSecondary</item>

-        <item name="android:textColorLink">@color/solarized_base2</item>

-

-        <item name="android:windowBackground">@color/solarized_base03</item>

-        <item name="android:colorBackground">@color/solarized_base03</item>

-

-        <item name="actionBarStyle">@style/SolarizedDarkActionBar</item>

-

-        <item name="colorPrimary">@color/solarized_base02</item>

-        <item name="colorPrimaryDark">@color/solarized_base03</item>

-        <item name="colorAccent">@color/solarized_base02</item>

-

-        <item name="cardStyle">@style/Theme.Mumla.Solarized.Dark.CardView</item>

-    </style>

-

-    <style name="SolarizedDarkActionBar" parent="@style/Widget.AppCompat.ActionBar">

-        <item name="background">@color/solarized_base02</item>

-        <item name="titleTextStyle">@style/SolarizedDarkActionBarText</item>

-    </style>

-

-    <style name="SolarizedDarkActionBarText" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">

-        <item name="android:textColor">@color/solarized_base0</item>

-    </style>

-

-    <style name="Theme.Mumla.Solarized.Dark.CardView" parent="CardView">

-        <item name="cardBackgroundColor">@color/solarized_base02</item>

-    </style>

-</resources>

+<!--
+  ~ Copyright (C) 2014 Andrew Comminos
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="NewApi">
+
+    <style name="Theme.Mumla" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:textColorPrimary">#000</item>
+        <item name="android:textColorSecondary">#666</item>
+        <item name="android:textColorPrimaryInverse">#FFF</item>
+        <item name="android:textColorSecondaryInverse">#AAA</item>
+
+        <item name="actionBarStyle">@style/MumlaDarkActionBar</item>
+
+        <item name="colorPrimary">#454D5E</item>
+        <item name="colorPrimaryDark">#2F3440</item>
+        <item name="colorAccent">#454D5E</item>
+
+        <item name="cardStyle">@style/Theme.Mumla.CardView</item>
+    </style>
+
+    <style name="Theme.Mumla.CardView" parent="CardView">
+    </style>
+
+    <style name="Theme.Mumla.Dark" parent="@style/Theme.AppCompat">
+        <item name="android:textColorPrimary">#FFF</item>
+        <item name="android:textColorSecondary">#DDD</item>
+        <item name="android:textColorPrimaryInverse">#FFF</item>
+        <item name="android:textColorSecondaryInverse">#AAA</item>
+
+        <item name="actionBarStyle">@style/MumlaDarkActionBar</item>
+
+        <item name="cardStyle">@style/Theme.Mumla.Dark.CardView</item>
+    </style>
+
+    <style name="MumlaDarkActionBar" parent="@style/Widget.AppCompat.ActionBar.Solid">
+        <item name="titleTextStyle">@style/MumlaDarkActionBarText</item>
+    </style>
+
+    <style name="MumlaDarkActionBarText" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">#FFFFFF</item>
+    </style>
+
+    <style name="Theme.Mumla.Dark.CardView" parent="CardView">
+        <item name="cardBackgroundColor">#333</item>
+    </style>
+
+    <!-- Solarized theme sets based off of Ethan Schoonover's work: http://ethanschoonover.com/solarized -->
+
+    <style name="Theme.Mumla.Solarized.Light" parent="@style/Theme.AppCompat.Light">
+        <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:textColorPrimary">@color/solarized_base00</item>
+        <item name="android:textColorSecondary">@color/solarized_base01</item>
+        <item name="android:textColorPrimaryInverse">?android:textColorPrimary</item>
+        <item name="android:textColorSecondaryInverse">?android:textColorSecondary</item>
+        <item name="android:textColorLink">@color/solarized_base02</item>
+
+        <item name="android:windowBackground">@color/solarized_base3</item>
+        <item name="android:colorBackground">@color/solarized_base3</item>
+
+        <item name="actionBarStyle">@style/SolarizedLightActionBar</item>
+
+        <item name="colorPrimary">@color/solarized_base2</item>
+        <item name="colorPrimaryDark">@color/solarized_base3</item>
+        <item name="colorAccent">@color/solarized_base2</item>
+
+        <item name="cardStyle">@style/Theme.Mumla.Solarized.Light.CardView</item>
+    </style>
+
+    <style name="SolarizedLightActionBar" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="background">@color/solarized_base2</item>
+        <item name="titleTextStyle">@style/SolarizedLightActionBarText</item>
+    </style>
+
+    <style name="SolarizedLightActionBarText" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">@color/solarized_base00</item>
+    </style>
+
+    <style name="Theme.Mumla.Solarized.Light.CardView" parent="CardView">
+        <item name="cardBackgroundColor">@color/solarized_base2</item>
+    </style>
+
+    <style name="Theme.Mumla.Solarized.Dark" parent="@style/Theme.AppCompat">
+        <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:textColorPrimary">@color/solarized_base0</item>
+        <item name="android:textColorSecondary">@color/solarized_base1</item>
+        <item name="android:textColorPrimaryInverse">?android:textColorPrimary</item>
+        <item name="android:textColorSecondaryInverse">?android:textColorSecondary</item>
+        <item name="android:textColorLink">@color/solarized_base2</item>
+
+        <item name="android:windowBackground">@color/solarized_base03</item>
+        <item name="android:colorBackground">@color/solarized_base03</item>
+
+        <item name="actionBarStyle">@style/SolarizedDarkActionBar</item>
+
+        <item name="colorPrimary">@color/solarized_base02</item>
+        <item name="colorPrimaryDark">@color/solarized_base03</item>
+        <item name="colorAccent">@color/solarized_base02</item>
+
+        <item name="cardStyle">@style/Theme.Mumla.Solarized.Dark.CardView</item>
+    </style>
+
+    <style name="SolarizedDarkActionBar" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="background">@color/solarized_base02</item>
+        <item name="titleTextStyle">@style/SolarizedDarkActionBarText</item>
+    </style>
+
+    <style name="SolarizedDarkActionBarText" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">@color/solarized_base0</item>
+    </style>
+
+    <style name="Theme.Mumla.Solarized.Dark.CardView" parent="CardView">
+        <item name="cardBackgroundColor">@color/solarized_base02</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/xml/settings_appearance.xml b/app/src/main/res/xml/settings_appearance.xml
index 6ce82c3..91f3054 100644
--- a/app/src/main/res/xml/settings_appearance.xml
+++ b/app/src/main/res/xml/settings_appearance.xml
@@ -32,15 +32,15 @@
         android:title="@string/pref_show_user_count"
         android:summary="@string/pref_show_user_count_summary" />
 
-	<se.lublin.mumla.preference.SeekBarDialogPreference
-		android:key="pttButtonHeight"
-		android:title="@string/pttButtonHeight"
-		android:summary="@string/pttButtonHeightSum"
-		multiplier="10"
-		max="100"
-		min="15"
-		android:defaultValue="15"
-		android:text=" dp"/>
+    <se.lublin.mumla.preference.SeekBarDialogPreference
+        android:key="pttButtonHeight"
+        android:title="@string/pttButtonHeight"
+        android:summary="@string/pttButtonHeightSum"
+        multiplier="10"
+        max="100"
+        min="15"
+        android:defaultValue="15"
+        android:text=" dp"/>
 
     <!--
     <ListPreference
diff --git a/libraries/humla b/libraries/humla
-Subproject 8ea414ed175dcb0062604a22364e7284b92eb4d
+Subproject 74b0d4d36d9e03c3df09a817a10e1686f8914a2