diff --git a/app/build.gradle b/app/build.gradle
index 65fb3002b..8451e3f07 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    buildToolsVersion = '28.0.3'
 
     defaultConfig {
         applicationId "net.osmtracker"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 61c1864aa..8f37f19e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.osmtracker"
-	android:versionName="0.7" android:versionCode="42" android:installLocation="auto">
+	android:versionName="0.7.1" android:versionCode="43" android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/app/src/main/java/net/osmtracker/OSMTracker.java b/app/src/main/java/net/osmtracker/OSMTracker.java
index 5a667ae7a..94c8441db 100644
--- a/app/src/main/java/net/osmtracker/OSMTracker.java
+++ b/app/src/main/java/net/osmtracker/OSMTracker.java
@@ -22,6 +22,7 @@ public static final class Preferences {
 		public final static String KEY_GPS_CHECKSTARTUP = "gps.checkstartup";
 		public final static String KEY_GPS_IGNORE_CLOCK = "gps.ignoreclock";
 		public final static String KEY_GPS_LOGGING_INTERVAL = "gps.logging.interval";
+		public final static String KEY_GPS_LOGGING_MIN_DISTANCE = "gps.logging.min_distance";
 		public final static String KEY_OUTPUT_FILENAME = "gpx.filename";
 		public final static String KEY_OUTPUT_ACCURACY = "gpx.accuracy";
 		public final static String KEY_OUTPUT_GPX_HDOP_APPROXIMATION = "gpx.hdop.approximation";
@@ -53,6 +54,7 @@ public static final class Preferences {
 		public final static boolean VAL_GPS_CHECKSTARTUP = true;
 		public final static boolean VAL_GPS_IGNORE_CLOCK = false;
 		public final static String VAL_GPS_LOGGING_INTERVAL = "0";
+		public final static String VAL_GPS_LOGGING_MIN_DISTANCE = "0";
 		
 		public final static String VAL_OUTPUT_FILENAME_NAME = "name";
 		public final static String VAL_OUTPUT_FILENAME_NAME_DATE = "name_date";
diff --git a/app/src/main/java/net/osmtracker/activity/Preferences.java b/app/src/main/java/net/osmtracker/activity/Preferences.java
index e21966f82..a4fa3fcc2 100644
--- a/app/src/main/java/net/osmtracker/activity/Preferences.java
+++ b/app/src/main/java/net/osmtracker/activity/Preferences.java
@@ -7,6 +7,7 @@
 import net.osmtracker.R;
 
 import android.Manifest;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -22,6 +23,10 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.widget.Button;
+import android.widget.EditText;
 
 
 /**
@@ -110,6 +115,53 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 			}
 		});
 
+		// Update GPS min. distance summary to the current value
+		pref = findPreference(OSMTracker.Preferences.KEY_GPS_LOGGING_MIN_DISTANCE);
+		pref.setSummary(
+				prefs.getString(OSMTracker.Preferences.KEY_GPS_LOGGING_MIN_DISTANCE, OSMTracker.Preferences.VAL_GPS_LOGGING_MIN_DISTANCE)
+						+ " " + getResources().getString(R.string.prefs_gps_logging_min_distance_meters)
+						+ ". " + getResources().getString(R.string.prefs_gps_logging_min_distance_summary));
+		pref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+			@Override
+			public boolean onPreferenceChange(Preference preference, Object newValue) {
+				// Set summary with the interval and "seconds"
+				preference.setSummary(newValue
+						+ " " + getResources().getString(R.string.prefs_gps_logging_min_distance_meters)
+						+ ". " + getResources().getString(R.string.prefs_gps_logging_min_distance_summary));
+				return true;
+			}
+		});
+
+		// don't allow the logging_min_distance to be empty
+		final EditText et = ((EditTextPreference)pref).getEditText();
+		final EditTextPreference etp = (EditTextPreference)pref;
+		et.addTextChangedListener(
+				new TextWatcher() {
+					@Override
+					public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+					}
+
+					@Override
+					public void onTextChanged(CharSequence s, int start, int before, int count) {
+						if (s.length() >= 0) {
+							try {
+								Button bt_ok = ((AlertDialog) etp.getDialog()).getButton(AlertDialog.BUTTON_POSITIVE);
+								if (s.length() == 0) {
+									bt_ok.setEnabled(false);
+								} else {
+									((AlertDialog) etp.getDialog()).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+								}
+							} catch (Exception ex) {
+							}
+						}
+					}
+
+					@Override
+					public void afterTextChanged(Editable s) {
+					}
+				}
+		);
+
 		pref = findPreference(OSMTracker.Preferences.KEY_GPS_OSSETTINGS);
 		pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 			@Override
diff --git a/app/src/main/java/net/osmtracker/activity/TrackLogger.java b/app/src/main/java/net/osmtracker/activity/TrackLogger.java
index 930986824..b96daf052 100644
--- a/app/src/main/java/net/osmtracker/activity/TrackLogger.java
+++ b/app/src/main/java/net/osmtracker/activity/TrackLogger.java
@@ -214,7 +214,24 @@ protected void onCreate(Bundle savedInstanceState) {
 	 * Also, the default layout is excluded and the 'osmtracker' tag is added by default.
 	 */
 	private void saveTagsForTrack(){
+		//obtain the current track id and initialize the values variable
+		Uri trackUri = ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, currentTrackId);
+		ContentValues values = new ContentValues();
+
+		//Checking for previously saved tags
+		Cursor cursor = getContentResolver().query( trackUri, null, null, null, null);
+		StringBuilder previouslySavedTags = new StringBuilder();
+		int index = cursor.getColumnIndex(TrackContentProvider.Schema.COL_TAGS);
+
+		while (cursor.moveToNext()) {
+			if(cursor.getString(index) != null)
+				previouslySavedTags.append(cursor.getString(index) + ",");
+		}
+		
 		StringBuilder tags = new StringBuilder();
+
+		tags.append(previouslySavedTags);
+
 		ArrayList<String> fixedTags = new ArrayList<String>();
 
 		//covert the file name to simple layout name
@@ -232,9 +249,6 @@ private void saveTagsForTrack(){
 			tags.append(simpleName).append(",");
 		}
 
-		//obtain the current track id and initialize the values variable
-		Uri trackUri = ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, currentTrackId);
-		ContentValues values = new ContentValues();
 
 		//set the values tag and update the table
 		values.put(TrackContentProvider.Schema.COL_TAGS, tags.toString());
diff --git a/app/src/main/java/net/osmtracker/activity/TrackManager.java b/app/src/main/java/net/osmtracker/activity/TrackManager.java
index 10d822e8d..11a3e7e29 100644
--- a/app/src/main/java/net/osmtracker/activity/TrackManager.java
+++ b/app/src/main/java/net/osmtracker/activity/TrackManager.java
@@ -35,6 +35,7 @@
 import android.view.View;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.CursorAdapter;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -69,15 +70,28 @@ public class TrackManager extends ListActivity {
 	/** Track Identifier to export after request for write permission **/
 	private long trackId = -1;
 
+	private ImageButton btnNewTrack;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.trackmanager);	
+		setContentView(R.layout.trackmanager);
 		getListView().setEmptyView(findViewById(R.id.trackmgr_empty));
 		registerForContextMenu(getListView());
 		if (savedInstanceState != null) {
 			prevItemVisible = savedInstanceState.getInt(PREV_VISIBLE, -1);
 		}
+		//initialize the bottom start track
+		btnNewTrack = (ImageButton) findViewById(R.id.trackmgr_hint_icon);
+		//set a listener that makes the same functionality of (+) button in the main menu of this screen
+		btnNewTrack.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				startTrackLogger();
+				//makes the button invisible when is an active track
+				btnNewTrack.setVisibility(View.INVISIBLE);
+			}
+		});
 	}
 
 	@Override
@@ -109,6 +123,8 @@ protected void onResume() {
 				}
 			}
 		} else {
+			//set the button to start a new track visible when there isn't an active track
+			btnNewTrack.setVisibility(View.VISIBLE);
 			((TextView) findViewById(R.id.trackmgr_hint)).setText(R.string.trackmgr_newtrack_hint);
 
 			// Scroll to the previous listview position,
@@ -188,19 +204,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case R.id.trackmgr_menu_newtrack:
-			// Start track logger activity
-			try {
-				Intent i = new Intent(this, TrackLogger.class);
-				// New track
-				currentTrackId = createNewTrack();
-				i.putExtra(TrackContentProvider.Schema.COL_TRACK_ID, currentTrackId);
-				startActivity(i);
-			} catch (CreateTrackException cte) {
-				Toast.makeText(this,
-						getResources().getString(R.string.trackmgr_newtrack_error).replace("{0}", cte.getMessage()),
-						Toast.LENGTH_LONG)
-						.show();
-			}
+			startTrackLogger();
 			break;
 		case R.id.trackmgr_menu_continuetrack:
 			Intent i = new Intent(this, TrackLogger.class);
@@ -265,6 +269,25 @@ public void onClick(DialogInterface dialog, int which) {
 		return super.onOptionsItemSelected(item);
 	}
 
+	/**
+	 * This method prepare the new track and set an id, then start a new TrackLogger with the new track id
+	 */
+	private void startTrackLogger(){
+		// Start track logger activity
+		try {
+			Intent i = new Intent(this, TrackLogger.class);
+			// New track
+			currentTrackId = createNewTrack();
+			i.putExtra(TrackContentProvider.Schema.COL_TRACK_ID, currentTrackId);
+			startActivity(i);
+		} catch (CreateTrackException cte) {
+			Toast.makeText(this,
+					getResources().getString(R.string.trackmgr_newtrack_error).replace("{0}", cte.getMessage()),
+					Toast.LENGTH_LONG)
+					.show();
+		}
+	}
+
 
 	private void requestPermissionAndExport(int typeCode){
 		if (ContextCompat.checkSelfPermission(this,
diff --git a/app/src/main/java/net/osmtracker/db/TracklistAdapter.java b/app/src/main/java/net/osmtracker/db/TracklistAdapter.java
index b3b0f3d13..98ac7b2b5 100644
--- a/app/src/main/java/net/osmtracker/db/TracklistAdapter.java
+++ b/app/src/main/java/net/osmtracker/db/TracklistAdapter.java
@@ -76,7 +76,11 @@ private View bind(Cursor cursor, View v, Context context) {
 		if (cursor.isNull(cursor.getColumnIndex(TrackContentProvider.Schema.COL_OSM_UPLOAD_DATE))) {
 			vUploadStatus.setVisibility(View.GONE);
 		}		
-		
+		else{
+			vUploadStatus.setImageResource(android.R.drawable.stat_sys_upload_done);
+			vUploadStatus.setVisibility(View.VISIBLE);
+		}
+
 		// Bind id
 		long trackId = cursor.getLong(cursor.getColumnIndex(TrackContentProvider.Schema.COL_ID));
 		String strTrackId = Long.toString(trackId);
diff --git a/app/src/main/java/net/osmtracker/service/gps/GPSLogger.java b/app/src/main/java/net/osmtracker/service/gps/GPSLogger.java
index d9a6d13f3..7be81c6c0 100644
--- a/app/src/main/java/net/osmtracker/service/gps/GPSLogger.java
+++ b/app/src/main/java/net/osmtracker/service/gps/GPSLogger.java
@@ -90,6 +90,7 @@ public class GPSLogger extends Service implements LocationListener {
 	 * the interval (in ms) to log GPS fixes defined in the preferences
 	 */
 	private long gpsLoggingInterval;
+	private long gpsLoggingMinDistance;
 	
 	/**
 	 * sensors for magnetic orientation
@@ -200,6 +201,8 @@ public void onCreate() {
 		//read the logging interval from preferences
 		gpsLoggingInterval = Long.parseLong(PreferenceManager.getDefaultSharedPreferences(this.getApplicationContext()).getString(
 				OSMTracker.Preferences.KEY_GPS_LOGGING_INTERVAL, OSMTracker.Preferences.VAL_GPS_LOGGING_INTERVAL)) * 1000;
+		gpsLoggingMinDistance = Long.parseLong(PreferenceManager.getDefaultSharedPreferences(this.getApplicationContext()).getString(
+				OSMTracker.Preferences.KEY_GPS_LOGGING_MIN_DISTANCE, OSMTracker.Preferences.VAL_GPS_LOGGING_MIN_DISTANCE));
 		
 		// Register our broadcast receiver
 		IntentFilter filter = new IntentFilter();
@@ -214,8 +217,8 @@ public void onCreate() {
 		lmgr = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
 
 		if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-            lmgr.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
-        }
+			lmgr.requestLocationUpdates(LocationManager.GPS_PROVIDER, gpsLoggingInterval, gpsLoggingMinDistance, this);
+		}
 		
 		//register for Orientation updates
 		sensorListener.register(this);
diff --git a/app/src/main/java/net/osmtracker/view/TextNoteDialog.java b/app/src/main/java/net/osmtracker/view/TextNoteDialog.java
index a5e4376a8..bf38bd573 100644
--- a/app/src/main/java/net/osmtracker/view/TextNoteDialog.java
+++ b/app/src/main/java/net/osmtracker/view/TextNoteDialog.java
@@ -10,6 +10,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.WindowManager.LayoutParams;
 import android.widget.EditText;
 
 import net.osmtracker.db.TrackContentProvider;
@@ -109,6 +110,8 @@ protected void onStart() {
 			intent.putExtra(OSMTracker.INTENT_KEY_NAME, context.getResources().getString(R.string.gpsstatus_record_textnote));
 			context.sendBroadcast(intent);
 		}
+
+		getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 		
 		super.onStart();
 	}
diff --git a/app/src/main/res/layout/tracklist_item.xml b/app/src/main/res/layout/tracklist_item.xml
index e998fecec..a66718b61 100644
--- a/app/src/main/res/layout/tracklist_item.xml
+++ b/app/src/main/res/layout/tracklist_item.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="fill_parent" android:layout_width="fill_parent"
 		android:orientation="horizontal"
-		android:gravity="left|center_vertical"
+		android:gravity="start|center_vertical"
 		android:paddingLeft="3dp" android:paddingRight="3dp" android:paddingTop="5dp" android:paddingBottom="5dp"
 		>
 
@@ -10,37 +10,39 @@
 		android:text="{id}"
 		android:layout_height="fill_parent" android:layout_width="wrap_content"
 		style="@android:style/TextAppearance.Medium"
-		android:gravity="left|center_vertical" android:layout_marginRight="5dp"/>
+		android:gravity="start|center_vertical" android:layout_marginRight="5dp"/>
 
 	<RelativeLayout android:layout_height="fill_parent"
-		android:gravity="left|center_vertical" android:layout_width="0dip" android:layout_weight="1">
+		android:gravity="start|center_vertical" android:layout_width="0dip" android:layout_weight="1">
 
 		<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_nameordate"
 			android:text="{start_date}" android:layout_width="wrap_content" style="@android:style/TextAppearance.Large"/>
 
 		<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_waypoints" android:layout_below="@+id/trackmgr_item_nameordate"
 			android:textStyle="bold" android:layout_marginRight="3dp" style="@android:style/TextAppearance.Small" android:text="@string/trackmgr_waypoints_count"
-			android:layout_width="wrap_content"></TextView>
+			android:layout_width="wrap_content"/>
 
 		<TextView android:layout_height="wrap_content"
 			android:layout_below="@id/trackmgr_item_nameordate" android:id="@+id/trackmgr_item_wps"
 			android:layout_toRightOf="@id/trackmgr_item_waypoints" android:text="{x}"
-			style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"></TextView>
+			style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"/>
+
 		<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_trackpoints" android:layout_toRightOf="@id/trackmgr_item_wps"
 			android:layout_below="@id/trackmgr_item_nameordate" android:layout_marginLeft="8dp"
 			android:textStyle="bold" android:layout_marginRight="3dp" style="@android:style/TextAppearance.Small"
-			android:text="@string/trackmgr_trackpoints_count" android:layout_width="wrap_content"></TextView>
+			android:text="@string/trackmgr_trackpoints_count" android:layout_width="wrap_content"/>
 		<TextView android:layout_height="wrap_content"
 			android:text="{y}" android:id="@+id/trackmgr_item_tps" android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_toRightOf="@id/trackmgr_item_trackpoints" style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"></TextView>
+			android:layout_toRightOf="@id/trackmgr_item_trackpoints" style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"/>
 				
 	</RelativeLayout>
-	
+
 	<ImageView android:id="@+id/trackmgr_item_statusicon"
 		android:layout_height="fill_parent" android:layout_width="wrap_content"
 		android:src="@android:drawable/presence_online"
 		android:paddingLeft="3dp"
 		android:layout_marginRight="3dp"
+		android:layout_marginLeft="3dp"
 		android:layout_gravity="center_horizontal|center_vertical"
 		android:paddingRight="3dp"
 		android:contentDescription="@string/acc.track_status" />
@@ -50,6 +52,7 @@
 		android:src="@android:drawable/stat_sys_upload_done"
 		android:paddingLeft="3dp"
 		android:layout_marginRight="3dp"
+		android:layout_marginLeft="3dp"
 		android:layout_gravity="center_horizontal|center_vertical"
 		android:paddingRight="3dp"
 		android:contentDescription="@string/acc.upload_status" />
diff --git a/app/src/main/res/layout/trackmanager.xml b/app/src/main/res/layout/trackmanager.xml
index 71137a4d6..35ee2a88b 100644
--- a/app/src/main/res/layout/trackmanager.xml
+++ b/app/src/main/res/layout/trackmanager.xml
@@ -1,22 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
-	<TextView android:layout_height="wrap_content" android:gravity="center_horizontal" android:layout_width="fill_parent" style="@android:style/TextAppearance.Large" android:text="@string/trackmgr_tracklist" android:paddingBottom="5dp"></TextView>
+	<TextView android:layout_height="wrap_content" android:gravity="center_horizontal" android:layout_width="fill_parent" style="@android:style/TextAppearance.Large" android:text="@string/trackmgr_tracklist" android:paddingBottom="5dp"/>
 	<FrameLayout android:layout_weight="1" android:layout_width="fill_parent"
 		android:layout_height="0dip" android:padding="3dp">
 
 		<ListView android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:id="@id/android:list"></ListView>
+			android:id="@id/android:list"> </ListView>
 
 		<TextView android:text="@string/trackmgr_empty" android:padding="5dp"
 			android:id="@+id/trackmgr_empty" android:layout_width="fill_parent" android:layout_height="fill_parent"
 			android:gravity="center" style="@android:style/TextAppearance.Large" />
 
 	</FrameLayout>
-	
-	<TextView android:layout_height="wrap_content" android:layout_width="fill_parent"
-		android:id="@+id/trackmgr_hint"
-		android:text="@string/trackmgr_newtrack_hint"
-		android:gravity="bottom|center_horizontal" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/trackmgr_hint"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:layout_gravity="center"
+			android:text="@string/trackmgr_newtrack_hint" />
+
+		<ImageButton
+			android:id="@+id/trackmgr_hint_icon"
+			android:layout_width="wrap_content"
+			android:layout_height="38dp"
+			android:layout_gravity="center"
+			android:background="#323232"
+			android:src="@android:drawable/ic_menu_add" />
+	</LinearLayout>
+
 		
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings-preferences.xml b/app/src/main/res/values-ar/strings-preferences.xml
index d313a507c..54bcc5c34 100644
--- a/app/src/main/res/values-ar/strings-preferences.xml
+++ b/app/src/main/res/values-ar/strings-preferences.xml
@@ -1,11 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">الاعدادت</string>
   <string name="prefs_gps">نظام تحديد الموقع</string>
   <string name="prefs_gps_os_settings">اعدادات تحديد الموقع</string>
   <string name="prefs_gps_os_settings_summary">عرض شاشة اعدادات نظام تحديد المواقع</string>
+  <string name="prefs_check_gps_startup">تفحص GPS عند البدأ</string>
+  <string name="prefs_gps_ignore_clock">تجاهل ساعة GPS</string>
+  <string name="prefs_gps_logging_interval_seconds">ثوان</string>
   <string name="prefs_ui">واجهة المستخدم</string>
+  <string name="prefs_ui_picture_source">مصدر الصورة اﻹفتراضي</string>
+  <string name="prefs_ui_buttons_layout">تعيين الأزرار</string>
   <string name="prefs_ui_buttons_layout_defaut">الافتراضي</string>
+  <string name="prefs_ui_orientation">الإتجاه</string>
+  <string name="prefs_voicerec_duration">مدة التسجيل الصوتي</string>
+  <string name="prefs_voicerec_duration_seconds">ثوان</string>
+  <string name="prefs_theme">سمة الشاشة الرئيسية</string>
+  <string name="prefs_output">إعدادات GPX</string>
+  <string name="prefs_storage_dir">دليل المخزن الخارجي (SD)</string>
+  <string name="prefs_output_one_dir_per_track">دليل واحد لكل مسار</string>
+  <string name="prefs_output_accuracy">الدقة في ملف GPX</string>
+  <string name="prefs_sound_enabled">فعل الصوت</string>
+  <string name="prefs_map_tile">مزود الخرائط القرميدية</string>
   <string name="prefs_map_tile_summary"></string>
+  <string name="prefs_compass_heading">صدر وجهة البوصلة</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 06d8a758c..9475d6813 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,26 +1,78 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Generic strings-->
+  <string name="app_name">متتبع أواسام للأندرويد™</string>
+  <string name="app_short_name">متتبع أواسام</string>
   <!--TrackLogger-->
   <string name="tracklogger_voicerec_title">تسجيل صوتي</string>
+  <string name="tracklogger_voicerec_stop">إيقاف</string>
+  <string name="tracklogger_btnBack">العودة</string>
   <string name="tracklogger_gps_disabled">GPS تعطيل</string>
+  <string name="tracklogger_camera">أخذ صورة بآلة التصوير</string>
+  <string name="tracklogger_gallery">إختيار صورة من المعرض</string>
   <!--Waypoint List-->
+  <string name="wplist_latitude">خط عرض :</string>
+  <string name="wplist_longitude">خط طول :</string>
+  <string name="wplist_elevation">الإرتفاع :</string>
+  <string name="wplist_accuracy">الدقة :</string>
   <!--Track Manager-->
   <string name="trackmgr">مدير المسار</string>
   <string name="trackmgr_tracklist">قائمة تتبع:</string>
+  <string name="trackmgr_waypoints_count">نقاط الطريق :</string>
+  <string name="trackmgr_trackpoints_count">نقاط المسار :</string>
+  <string name="trackmgr_empty">لا توجد بحوزتك أية مسارات.</string>
+  <string name="trackmgr_contextmenu_stop">إيقاف تقفِّي المسار</string>
+  <string name="trackmgr_contextmenu_resume">مواصلة تقفِّي المسار</string>
+  <string name="trackmgr_contextmenu_delete">حذف</string>
+  <string name="trackmgr_contextmenu_osm_upload">إرفع إلى خريطة الشارع المفتوح</string>
+  <string name="trackmgr_contextmenu_display">العرض</string>
+  <string name="trackmgr_contextmenu_details">تفاصيل</string>
+  <string name="trackmgr_contextmenu_title">المسار #{0}</string>
   <!--Track Detail-->
+  <string name="trackdetail">تفاصيل المسار :</string>
+  <string name="trackdetail_startdate">لحظة البداية :</string>
+  <string name="trackdetail_enddate">لحظة النهاية :</string>
+  <string name="trackdetail_description">الوصف</string>
+  <string name="trackdetail_tags">الأوسمة (فاصلة بعد كل وسم)</string>
+  <string name="osm_visibility_private">خاص</string>
+  <string name="osm_visibility_public">عمومي</string>
   <!--OSM upload-->
+  <string name="osm_upload">إرفع إلى خريطة الشارع المفتوح</string>
   <!--GPS Status & record bar-->
+  <string name="gpsstatus_record_voicerec">تسجيل صوتي</string>
+  <string name="gpsstatus_record_stillimage">أخذ صورة</string>
+  <string name="gpsstatus_record_textnote">ملاحظة</string>
   <!--Menu-->
+  <string name="menu_settings">الإعدادات</string>
+  <string name="menu_about">عن</string>
+  <string name="menu_displaytrack">عرض المسار</string>
+  <string name="menu_newtrack">مسار جديد</string>
+  <string name="menu_deletetracks">حذف جميع المسارات</string>
+  <string name="menu_save">احتفاظ</string>
+  <string name="menu_cancel">إلغاء</string>
+  <string name="menu_osm_upload">إرفع إلى خريطة الشارع المفتوح</string>
   <!--Errors-->
   <!--GPX-->
   <!--About screen-->
+  <string name="about">عن</string>
+  <string name="about_translate_text">ساعدنا على ترجمة OSMTracker :</string>
+  <string name="about_export_db">تصدير قاعدة البيانات</string>
+  <string name="about_exporting_db">جارٍ تصدير قاعدة البيانات ...</string>
   <!--Notification-->
+  <string name="notification_text">إضغط هنا لعرض الشاشة الرئسية</string>
   <!--Display track-->
+  <string name="displaytrack">عرض المسار</string>
   <!--Track detail-->
+  <string name="trackdetail_save">احتفاظ</string>
   <!--Various-->
+  <string name="various_accuracy">الدقة</string>
+  <string name="various_accuracy_with_sats">الدقة {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
   <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-be/strings-preferences.xml b/app/src/main/res/values-be/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-be/strings-preferences.xml
+++ b/app/src/main/res/values-be/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 737fe4053..a6276b32c 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -87,4 +87,7 @@
   <!--parameters: (heading in degrees)-->
   <string name="various_heading_unknown">Напрамак не можа быць вызначаны</string>
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 4282fa0ba..3c582e707 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -25,4 +25,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-bn/strings-preferences.xml b/app/src/main/res/values-bn/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-bn/strings-preferences.xml
+++ b/app/src/main/res/values-bn/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 92eb61ae5..7a4027131 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -22,4 +22,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-ca/strings-preferences.xml b/app/src/main/res/values-ca/strings-preferences.xml
index ff9810f97..34e2d1433 100644
--- a/app/src/main/res/values-ca/strings-preferences.xml
+++ b/app/src/main/res/values-ca/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Preferències</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 3208df41c..f3452c175 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Waypints (Punts de ruta):</string>
   <string name="trackmgr_trackpoints_count">Punts:</string>
   <string name="trackmgr_empty">No teniu cap track.</string>
+  <string name="trackmgr_newtrack_hint">Per a enregistrar una traça,\npitgeu <b>Menú</b> i després <b>Traça nova</b></string>
   <string name="trackmgr_newtrack_error">No s\'ha pogut crear la ruta: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Esteu enregistrant la <b>traça núm. {0}</b>\nTrieu-la al llistat per a continuar</string>
   <string name="trackmgr_contextmenu_stop">Atura l\'enregistrament</string>
   <string name="trackmgr_contextmenu_resume">Reemprèn l\'enregistrament</string>
   <string name="trackmgr_contextmenu_delete">Esborra</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">S\'esborrarà la Ruta #{0}</string>
   <string name="trackmgr_deleteall_confirm">S\'esborraràn totes les rutes. Segur que ho voleu?</string>
   <string name="trackmgr_exporting">Exportant la ruta #{0}...</string>
+  <string name="trackmgr_exporting_prepare">S\'està preparant l\'exportació...</string>
   <string name="trackmgr_export_error">No s\'ha pogut exportar la ruta: {0}</string>
   <string name="trackmgr_exportall_confirm">S\'exportaran totes les rutes. Això pot trigar bastant. Voleu continuar?</string>
   <!--Track Detail-->
@@ -100,13 +103,18 @@
   <string name="error_create_track_dir">No s\'ha pogut crear la carpeta de rutes %s</string>
   <string name="error_externalstorage_not_writable_hint">Si us plau, comproveu si l\'emmagatzematge extern està correctament inserit i muntat.</string>
   <string name="error_voicerec_failed">Ha fallat l\'enregistrament de veu</string>
+  <string name="error_userlayout_parsing">S\'ha produït un error en processar el fitxer XML de disposició. Torneu a la disposició predeterminada. </string>
   <!--GPX-->
   <string name="gpx_track_name">Enregistrat amb OSMTracker per a  Android™</string>
+  <string name="gpx_hdop_approximation_cmt">Atenció: els valors HDOP no són els HDOP retornats per l\'aparell GPS. Són aproximats a partir de la precisió de la ubicació en metres.</string>
   <!--About screen-->
   <string name="about">Quant a</string>
   <string name="about_text">Per a més informació, docs i avís d\'errors, visiteu la pàgina web del projecte:</string>
   <string name="about_translate_text">Ajuda a traduïr l\'OSMTracker:</string>
   <string name="about_debug_info">Informació de depuració</string>
+  <string name="about_export_db">Exporta la base de dades</string>
+  <string name="about_exporting_db">S\'està exportant la base de dades...</string>
+  <string name="about_export_db_result">Resultat de l\'exportació de la base de dades: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker està enregistrant</string>
   <string name="notification_title">OSMTracker està enregistrant (#{0})</string>
@@ -130,4 +138,7 @@
   <string name="various_heading_unknown">No s\'ha pogut determinar la direcció</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Mostra ruta OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings-preferences.xml b/app/src/main/res/values-cs-rCZ/strings-preferences.xml
index 3d07ac76c..9f708083a 100644
--- a/app/src/main/res/values-cs-rCZ/strings-preferences.xml
+++ b/app/src/main/res/values-cs-rCZ/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Nastavení</string>
@@ -14,6 +14,7 @@
   <string name="prefs_gps_logging_interval_seconds">sekundy</string>
   <string name="prefs_ui">Uživatelské rozhraní</string>
   <string name="prefs_ui_picture_source">Výchozí zdroj fotografií</string>
+  <string name="prefs_ui_picture_source_summary">Použít fotografie z fotoaparátu nebo galerie?</string>
   <string-array name="prefs_ui_picture_source_keys">
     <item>Fotoaparát</item>
     <item>Galerie</item>
@@ -21,7 +22,12 @@
   </string-array>
   <string name="prefs_ui_buttons_layout">Nastavení sad tlačítek</string>
   <string name="prefs_ui_buttons_layout_summary">Vybrat vlastní sadu tlačítek (viz. dokumentace)</string>
-  <string name="prefs_ui_buttons_layout_defaut">Implicitní</string>
+  <string name="prefs_ui_buttons_layout_default_section">VÝCHOZÍ ROZLOŽENÍ</string>
+  <string name="prefs_ui_buttons_layout_defaut">Výchozí</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">STAŽENÉ ROZLOŽENÍ</string>
+  <string name="prefs_ui_buttons_layout_empty_section">Nemáte stažené soubory rozložení</string>
+  <string name="prefs_ui_available_layout">Dostupná rozložení</string>
+  <string name="prefs_ui_github_repository_settings">Nastavení úložiště Github</string>
   <string name="prefs_ui_orientation">Orientace</string>
   <string name="prefs_ui_orientation_summary">Preferovaná orientace obrazovky s tlačítky</string>
   <string-array name="prefs_ui_orientation_options_keys">
@@ -34,16 +40,16 @@
   <string name="prefs_theme">Grafické téma hlavní obrazovky</string>
   <string name="prefs_theme_summary">Aby se změny projevili, je třeba restart aplikace</string>
   <string-array name="prefs_theme_keys">
-    <item>OS implicitní</item>
-    <item>OS implicitní (tmavý)</item>
-    <item>OS implicitní (světlý)</item>
+    <item>OS výchozí</item>
+    <item>OS výchozí (tmavý)</item>
+    <item>OS výchozí (světlý)</item>
     <item>Vysoký kontrast</item>
   </string-array>
   <string name="prefs_display_always_on">Obrazovka vždy zapnutá</string>
   <string name="prefs_display_always_on_summary">Obrazovka stále zapnutá během trasování. Deaktivace uspoří baterii.</string>
   <string name="prefs_displaytrack_osm">Podkladová mapa</string>
   <string name="prefs_displaytrack_osm_summary">Zobrazit mapu OpenStreetMap pod trasou. Je třeba datové spojení.</string>
-  <string name="prefs_displaytrack_osm_summary_ask">Na pozadí vždy zobrazovat mapu OpenStreetMap? Vyžaduje datové spojení. </string>
+  <string name="prefs_displaytrack_osm_summary_ask">Vždy zobrazovat pozadí OpenStreetMap? Vyžaduje datové připojení.</string>
   <string name="prefs_output">Nastavení GPX</string>
   <string name="prefs_storage_dir">Adresář externího úložiště (SD)</string>
   <string name="prefs_storage_dir_hint">Bude mít vliv pro příští trasu (ne současnou)</string>
@@ -57,11 +63,11 @@
     <item>Datum a čas startu</item>
   </string-array>
   <string name="prefs_output_accuracy">Přesnost v souboru GPX</string>
-  <string name="prefs_output_accuracy_summary">Přidat informaci o přesnosti do souboru GPX, se jménem waypoint nebo v komentáři k waypoint</string>
+  <string name="prefs_output_accuracy_summary">Přidat informaci o přesnosti do souboru GPX, se jménem bodu na trase nebo v komentáři k bodu na trase</string>
   <string-array name="prefs_output_accuracy_keys">
     <item>Nikde</item>
-    <item>Se jménem waypointu</item>
-    <item>V komentáři waypointu</item>
+    <item>Se jménem bodu na trase</item>
+    <item>V komentáři k bodu na trase</item>
   </string-array>
   <string name="prefs_output_gpx_hdop_approximation">Použít aproximaci HDOP</string>
   <string name="prefs_output_gpx_hdop_approximation_summary">Vyplnit HDOP v GPX s hodnotou aproximace upřesnění</string>
@@ -72,4 +78,16 @@
   <string name="prefs_osm_clear_oauth_data_dialog">Je třeba autorizace OSMTrackeru pro opakované nahrání. Jste si jisti?</string>
   <string name="prefs_map_tile">Podkladová mapa</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>Nikde</item>
+    <item>V komentáři</item>
+    <item>V příponě</item>
+  </string-array>
+  <string name="prefs_compass_heading">Exportovat data kompasu</string>
+  <string name="prefs_compass_heading_summary">Nastavuje zda a jak budou data kompasu exportovány do GPX souboru</string>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 9d1ce37df..d613971b1 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -18,20 +18,22 @@
   <string name="tracklogger_camera">Pořídit fotografii fotoaparátem?</string>
   <string name="tracklogger_gallery">Vybrat fotografii z galerie</string>
   <!--Waypoint List-->
-  <string name="wplist">Seznam waypointů</string>
-  <string name="wplist_latitude">Lat:</string>
-  <string name="wplist_longitude">Long:</string>
-  <string name="wplist_elevation">Ele:</string>
+  <string name="wplist">Seznam bodů na trase</string>
+  <string name="wplist_latitude">Zem. šířka:</string>
+  <string name="wplist_longitude">Zem. délka:</string>
+  <string name="wplist_elevation">Výška:</string>
   <string name="wplist_accuracy">Přesnost:</string>
   <string name="wplist_compass">Komp. orien.:</string>
   <string name="wplist_compass_accuracy">Komp. přesn.:</string>
   <!--Track Manager-->
   <string name="trackmgr">Správce tras</string>
   <string name="trackmgr_tracklist">Seznam tras:</string>
-  <string name="trackmgr_waypoints_count">Waypoints:</string>
+  <string name="trackmgr_waypoints_count">Body na trase:</string>
   <string name="trackmgr_trackpoints_count">Body trasy:</string>
   <string name="trackmgr_empty">Zatím nemáte žádné trasy.</string>
+  <string name="trackmgr_newtrack_hint">Pro nahrání stopy,\nstiskněte <b>Nabídka</b> a pak <b>Nová trasa</b></string>
   <string name="trackmgr_newtrack_error">Není možné vytvořit novou trasu: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Právě nahráváte <b>trasu  #{0}</b>\nPro pokračování ji vyberte v seznamu</string>
   <string name="trackmgr_contextmenu_stop">Zastavit trasování</string>
   <string name="trackmgr_contextmenu_resume">Obnovit trasování</string>
   <string name="trackmgr_contextmenu_delete">Smazat</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Trasa #{0} bude smazána</string>
   <string name="trackmgr_deleteall_confirm">Všechny trasy budou smazány. Jste si jisti?</string>
   <string name="trackmgr_exporting">Exportuji trasu #{0}...</string>
+  <string name="trackmgr_exporting_prepare">Přípravuji export...</string>
   <string name="trackmgr_export_error">Není možné exportovat trasu: {0}</string>
   <string name="trackmgr_exportall_confirm">Všechny trasy budou exportovány, to může být časově náročné. Jste si jisti?</string>
   <!--Track Detail-->
@@ -71,7 +74,7 @@
   <string name="osm_upload_oauth_failed">Není možné se přihlásit do OSM</string>
   <string name="osm_upload_sending">Posílám trasu #{0}…</string>
   <string name="osm_upload_waiting_response">Čekám na odpověď od serveru OpenStreetMap</string>
-  <string name="osm_upload_error">Vyskytla se chyba během nahrávání trasy</string>
+  <string name="osm_upload_error">Během nahrávání trasy se vyskytla chyba </string>
   <string name="osm_upload_bad_response">OSM server vrátil chybu: ({0}) zpráva {1}</string>
   <string name="osm_upload_unauthorized">Chyba autorizace. Chcete smazat uložené údaje o přihlášení k OpenStreetMap?</string>
   <string name="osm_upload_sucess">Nahrání na OpenStreetMap bylo úspěšné</string>
@@ -81,7 +84,7 @@
   <string name="gpsstatus_record_textnote">Textová poznámka</string>
   <!--Menu-->
   <string name="menu_settings">Nastavení</string>
-  <string name="menu_waypointlist">Waypoints</string>
+  <string name="menu_waypointlist">Body trasy</string>
   <string name="menu_about">O</string>
   <string name="menu_displaytrack">Zobrazit trasu</string>
   <string name="menu_stoptracking">Zastavit a uložit</string>
@@ -100,7 +103,7 @@
   <string name="error_create_track_dir">Není možné vytvořit složku trasy %s</string>
   <string name="error_externalstorage_not_writable_hint">Zkontrolujte, prosím, jestli je externí úložiště správně vloženo a připojeno.</string>
   <string name="error_voicerec_failed">Došlo k chybě během záznamu hlasu</string>
-  <string name="error_userlayout_parsing">Došlo k chybě během zpracování XML souboru pro rozložení. Přejděte, prosím, k implicitnímu rozložení.</string>
+  <string name="error_userlayout_parsing">Došlo k chybě během zpracování XML souboru pro rozvržení. Přejděte, prosím, k výchozímu rozvržení.</string>
   <!--GPX-->
   <string name="gpx_track_name">Trasováno pomocí OSMTracker pro Android™</string>
   <string name="gpx_hdop_approximation_cmt">Upozornění: hodnoty HDOP nejsou hodnotami HDOP vrácenými zařízením GPS. Hodnoty jsou aproximovány z přesnosti lokace v metrech.</string>
@@ -109,6 +112,9 @@
   <string name="about_text">Pro více informací, dokumentace a hlášení chyb, se podívejte, prosím, na home page projektu.</string>
   <string name="about_translate_text">Pomozte přeložit OSMTracker:</string>
   <string name="about_debug_info">Ladící informace</string>
+  <string name="about_export_db">Export databáze</string>
+  <string name="about_exporting_db">Exportuji databázi...</string>
+  <string name="about_export_db_result">Výsledek exportu databáze: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker nyní trasuje</string>
   <string name="notification_title">OSMTracker nyní trasuje (#{0})</string>
@@ -132,4 +138,36 @@
   <string name="various_heading_unknown">Sever nelze určit</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Zobrazení trasy OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Aktualizovat &amp; instalovat</string>
+  <string name="buttons_presets_context_menu_delete">Smazat</string>
+  <string name="buttons_presets_updating_layout">Aktualizuje se…</string>
+  <string name="buttons_presets_successful_update">Rozvržení bylo úspěšně aktualizováno</string>
+  <string name="buttons_presets_unsuccessful_update">Rozvržení nebylo aktualizováno, zkuste to znovu později</string>
+  <string name="buttons_presets_delete_message">Opravdu chcete smazat rozložení {0}?</string>
+  <string name="buttons_presets_delete_positive_confirmation">Vskutku</string>
+  <string name="buttons_presets_successful_delete">Soubor byl úspěšně smazán</string>
+  <string name="buttons_presets_icon_directory_deleted">Adresář ikon byl úspěšně smazán</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">Tento soubor neměl přidružený žádný adresář ikon</string>
+  <string name="buttons_presets_unsuccessful_delete">Soubor nelze odstranit</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Chyba: nelze se připojit k Internetu</string>
+  <string name="available_layouts_response_null_exception">Chyba: nelze se připojit k výchozím úložištím vlastních rozvržení</string>
+  <string name="available_layouts_connecting_message">(připojuje se…)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Stáhnout</string>
+  <string name="available_layouts_not_available_language">Váš jazyk není k dispozici, vyberte jeden ze seznamu</string>
+  <string name="available_layouts_language_dialog_title">Dostupné jazyky</string>
+  <string name="available_layouts_checking_language_dialog">Kontrola verzí místního jazyka</string>
+  <string name="available_layouts_downloading_dialog">Stahování…</string>
+  <string name="available_layouts_successful_download">Rozvržení bylo úspěšně staženo</string>
+  <string name="available_layouts_unsuccessful_download">Rozvržení nelze stáhnout, zkuste to znovu později</string>
+  <string name="available_layouts_null_response_received">Chyba při načítání dat ze serveru</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">Výchozí</string>
+  <string name="github_repository_settings_custom_checkbox">Vlastní</string>
+  <string name="github_repository_settings_username">Github uživatelské jméno:</string>
+  <string name="github_repository_settings_repository_name">Název úložiště:</string>
+  <string name="github_repository_settings_branch_name">Název oddělené větve:</string>
+  <string name="github_repository_settings_valid_server">Úložiště na Github je platné</string>
+  <string name="github_repository_settings_invalid_server">Github úložiště je neplatné</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings-preferences.xml b/app/src/main/res/values-da/strings-preferences.xml
index 5da52e2ad..29c04ac68 100644
--- a/app/src/main/res/values-da/strings-preferences.xml
+++ b/app/src/main/res/values-da/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Indstillinger</string>
@@ -48,7 +48,7 @@
   <string name="prefs_output">GPX-indstillinger</string>
   <string name="prefs_storage_dir">Eksternt lager (SD) mappe</string>
   <string name="prefs_storage_dir_hint">Gældende for næste track (ikke det nuværende)</string>
-  <string name="prefs_output_one_dir_per_track">Én mappe per track</string>
+  <string name="prefs_output_one_dir_per_track">En mappe per track</string>
   <string name="prefs_output_one_dir_per_track_summary">Gem hvert track og tilhørende filer i egen mappe</string>
   <string name="prefs_output_filename">Filnavn for navngivne tracks</string>
   <string name="prefs_output_filename_summary">Mønster for filnavn hvis track har et navn</string>
@@ -83,6 +83,6 @@
     <item>i kommentart</item>
     <item>i endelse</item>
   </string-array>
-  <string name="prefs_compass_heading">Eksportér kompas retning</string>
-  <string name="prefs_compass_heading_summary">Definér om og hvordan kompas data eksporteres tiul GPX-filen</string>
+  <string name="prefs_compass_heading">Eksporter kompas retning</string>
+  <string name="prefs_compass_heading_summary">Definer om og hvordan kompas data eksporteres til GPX-filen</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 9a7d5dacf..2947d85df 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -3,6 +3,7 @@
   <!--Generic strings-->
   <string name="app_name">OSMTracker til Android™</string>
   <string name="app_short_name">OSMTracker</string>
+  <string name="app_description">Inspireret af OSMTracker på Windows Mobile, der giver dig mulighed for at tracke dine rejser, markerer betydelige waypoints (Tale optagelse, fotos), eksportere dem i GPX format til senere brug sammen med Open Street Map værktøjer som JOSM.</string>
   <!--TrackLogger-->
   <string name="tracklogger">Track logger</string>
   <string name="tracklogger_waiting_gps">Venter på GPS fix før knapper aktiveres…</string>
@@ -14,6 +15,8 @@
   <string name="tracklogger_gps_disabled">GPS slukket</string>
   <string name="tracklogger_gps_disabled_hint">GPS er slukket. Vil du tænde den?</string>
   <string name="tracklogger_choose_gallery_camera">Galleri eller kamera?</string>
+  <string name="tracklogger_camera">Tag foto med kamera</string>
+  <string name="tracklogger_gallery">Vælg foto fra galleri</string>
   <!--Waypoint List-->
   <string name="wplist">Waypoint-liste</string>
   <string name="wplist_latitude">Bred: </string>
@@ -28,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Waypoints: </string>
   <string name="trackmgr_trackpoints_count">Track-punkter: </string>
   <string name="trackmgr_empty">Du har ingen tracks.</string>
+  <string name="trackmgr_newtrack_hint">For at optage et track,\nklik <b>Menu</b> og derefter <b>Nyt track</b></string>
   <string name="trackmgr_newtrack_error">Kunne ikke oprette nyt track: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Du optager i øjeblikket <b>track #{0}</b>\nVælg det på listen for at fortsætte</string>
   <string name="trackmgr_contextmenu_stop">Stop tracking</string>
   <string name="trackmgr_contextmenu_resume">Gentoptag tracking</string>
   <string name="trackmgr_contextmenu_delete">Slet</string>
@@ -40,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Track #{0} bliver slettet</string>
   <string name="trackmgr_deleteall_confirm">Alle tracks bliver slettet. Er du sikker?</string>
   <string name="trackmgr_exporting">Eksporterer track #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Forbereder eksport...</string>
   <string name="trackmgr_export_error">Kunne ikke eksportere track: {0}</string>
   <string name="trackmgr_exportall_confirm">Alle tracks bliver eksporteret. Det kan tage noget tid. Er du sikker?</string>
   <!--Track Detail-->
@@ -74,6 +80,7 @@
   <string name="osm_upload_sucess">OpenStreetMap upload lykkedes</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Tale-optagelse</string>
+  <string name="gpsstatus_record_stillimage">Tag foto</string>
   <string name="gpsstatus_record_textnote">Tekstnote</string>
   <!--Menu-->
   <string name="menu_settings">Indstillinger</string>
@@ -105,6 +112,9 @@
   <string name="about_text">For more information, dokumentation og support besøg venligst projektets hjemmeside:</string>
   <string name="about_translate_text">Hjælp med at oversætte OSMTracker:</string>
   <string name="about_debug_info">Debug info</string>
+  <string name="about_export_db">Eksport database</string>
+  <string name="about_exporting_db">Eksporter database...</string>
+  <string name="about_export_db_result">Database eksport resultat: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker tracker aktuelt</string>
   <string name="notification_title">OSMTracker tracker (#{0})</string>
@@ -128,4 +138,7 @@
   <string name="various_heading_unknown">Retning kan ikke findes</string>
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap track visning</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-de/accessibility.xml b/app/src/main/res/values-de/accessibility.xml
index 366b53921..0ec331eac 100644
--- a/app/src/main/res/values-de/accessibility.xml
+++ b/app/src/main/res/values-de/accessibility.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
-  <string name="acc.osmtracker_logo">OSMTracker Logo</string>
+  <string name="acc.osmtracker_logo">OSMTracker-Logo</string>
   <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">Zoom Hinein</string>
-  <string name="acc.zoom_out">Zoom Heraus</string>
+  <string name="acc.zoom_in">Hineinzoomen</string>
+  <string name="acc.zoom_out">Hinauszoomen</string>
   <!--GPS status bar-->
-  <string name="acc.sat_indicator">Anzeige der Stärke des Satellitensignals</string>
-  <string name="acc.record_indicator">Aufnahme-Fortschrittsanzeige</string>
+  <string name="acc.sat_indicator">Satellitensignalstärkenindikator</string>
+  <string name="acc.record_indicator">Aufnahme-Fortschrittsindikator</string>
   <!--Track list-->
-  <string name="acc.track_status">Anzeige des Track-Status</string>
-  <string name="acc.upload_status">OpenStreetMap-Upload-Statusanzeige</string>
+  <string name="acc.track_status">Spurstatusindikator</string>
+  <string name="acc.upload_status">OpenStreetMap-Hochladestatusindikator</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings-preferences.xml b/app/src/main/res/values-de/strings-preferences.xml
index 514889801..57c004c1e 100644
--- a/app/src/main/res/values-de/strings-preferences.xml
+++ b/app/src/main/res/values-de/strings-preferences.xml
@@ -1,28 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Einstellungen</string>
   <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">GPS Einstellungen</string>
-  <string name="prefs_gps_os_settings_summary">Zeige GPS-Einstellungen des Systems</string>
-  <string name="prefs_check_gps_startup">Prüfe GPS beim Start</string>
-  <string name="prefs_check_gps_startup_summary">Prüfen ob GPS beim Start deaktiviert ist und biete an es zu aktivieren</string>
-  <string name="prefs_gps_ignore_clock">GPS Zeit ignorieren</string>
-  <string name="prefs_gps_ignore_clock_summary">Android Zeit anstelle der GPS Zeit für Zeitstempel verwenden</string>
-  <string name="prefs_gps_logging_interval">GPS Intervall</string>
-  <string name="prefs_gps_logging_interval_summary">0 für das kürzest mögliche Intervall</string>
+  <string name="prefs_gps_os_settings">GPS-Einstellungen</string>
+  <string name="prefs_gps_os_settings_summary">GPS-Einstellungsbildschirm des Systems anzeigen</string>
+  <string name="prefs_check_gps_startup">GPS beim Start prüfen</string>
+  <string name="prefs_check_gps_startup_summary">Prüfen, ob GPS beim Start deaktiviert ist und das Aktivieren anbieten</string>
+  <string name="prefs_gps_ignore_clock">GPS-Uhrzeit ignorieren</string>
+  <string name="prefs_gps_ignore_clock_summary">GPS-Uhrzeit ignorieren und Android-Uhrzeit für Zeitstempel verwenden</string>
+  <string name="prefs_gps_logging_interval">GPS-Protokollierungsintervall</string>
+  <string name="prefs_gps_logging_interval_summary">Verwenden Sie 0 für das kürzestmögliche Intervall (beeinflusst die Batterielebensdauer)</string>
   <string name="prefs_gps_logging_interval_seconds">Sekunden</string>
+  <string name="prefs_gps_logging_min_distance">GPS Distanz Trackpoints</string>
+  <string name="prefs_gps_logging_min_distance_summary">Min. Abstand zweier Trackpoints</string>
+  <string name="prefs_gps_logging_min_distance_meters">Meter</string>
+
   <string name="prefs_ui">Benutzeroberfläche</string>
-  <string name="prefs_ui_picture_source">Standard Foto-Quelle</string>
-  <string name="prefs_ui_picture_source_summary">Foto von Kamera oder Galerie?</string>
+  <string name="prefs_ui_picture_source">Standard-Fotoquelle</string>
+  <string name="prefs_ui_picture_source_summary">Fotos von Kamera oder Galerie nehmen?</string>
   <string-array name="prefs_ui_picture_source_keys">
     <item>Kamera</item>
     <item>Galerie</item>
-    <item>Immer fragen</item>
+    <item>Immer nachfragen</item>
   </string-array>
-  <string name="prefs_ui_buttons_layout">Tastenlayout</string>
-  <string name="prefs_ui_buttons_layout_summary">Erlaube benutzerdefiniertes Tastenlayout (siehe Dokumentation)</string>
+  <string name="prefs_ui_buttons_layout">Tastenvoreinstellungen</string>
+  <string name="prefs_ui_buttons_layout_summary">Benutzerdefinierten Tastensatz auswählen (siehe Dokumentation)</string>
+  <string name="prefs_ui_buttons_layout_default_section">STANDARD Ansicht</string>
   <string name="prefs_ui_buttons_layout_defaut">Standard</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">HERUNTERGELADENES Layout</string>
+  <string name="prefs_ui_buttons_layout_empty_section">Du hast keine heruntergeladenen Layout-Dateien</string>
+  <string name="prefs_ui_available_layout">Verfügbare Layouts</string>
+  <string name="prefs_ui_github_repository_settings">Github Ablageeinstellungen</string>
   <string name="prefs_ui_orientation">Ausrichtung</string>
   <string name="prefs_ui_orientation_summary">Bevorzugte Ausrichtung für die Buttonanzeige</string>
   <string-array name="prefs_ui_orientation_options_keys">
@@ -30,30 +39,30 @@
     <item>Hochformat</item>
     <item>Querformat</item>
   </string-array>
-  <string name="prefs_voicerec_duration">Dauer Sprachaufnahme</string>
+  <string name="prefs_voicerec_duration">Sprachaufnahmendauer</string>
   <string name="prefs_voicerec_duration_seconds">Sekunden</string>
-  <string name="prefs_theme">Motiv Hauptbildschirm</string>
-  <string name="prefs_theme_summary">Applikationsneustart notwendig, damit Einstellungen wirksam werden</string>
+  <string name="prefs_theme">Hauptbildschirm-Grafikthema</string>
+  <string name="prefs_theme_summary">Neustart der Anwendung ist erforderlich, damit die Änderung wirksam wird</string>
   <string-array name="prefs_theme_keys">
-    <item>OS Standard</item>
-    <item>OS Standard (Dunkel)</item>
-    <item>OS Standard (Hell)</item>
+    <item>BS-Standard</item>
+    <item>BS-Standard (Dunkel)</item>
+    <item>BS-Standard (Hell)</item>
     <item>Hoher Kontrast</item>
   </string-array>
   <string name="prefs_display_always_on">Bildschirm immer an</string>
-  <string name="prefs_display_always_on_summary">Bildschirm bleibt während des Trackings beleuchtet. Deaktivieren um Batterie zu sparen</string>
+  <string name="prefs_display_always_on_summary">Bildschirm bleibt während der Routenverfolgung beleuchtet. Deaktivieren um Akku zu sparen</string>
   <string name="prefs_displaytrack_osm">Hintergrundkarte</string>
-  <string name="prefs_displaytrack_osm_summary">OpenStreetMap als Track-Hintergrund. Benötigt Datenverbindung</string>
-  <string name="prefs_displaytrack_osm_summary_ask">OpenStreetMap als Track-Hintergrund. Benötigt Datenverbindung</string>
-  <string name="prefs_output">GPX Dateiausgabe</string>
+  <string name="prefs_displaytrack_osm_summary">OpenStreetMap-Karte unter Route anzeigen. Benötigt eine Datenverbindung</string>
+  <string name="prefs_displaytrack_osm_summary_ask">OpenStreetMap-Hintergrund immer anzeigen? Benötigt eine Datenverbindung.</string>
+  <string name="prefs_output">GPX-Einstellungen</string>
   <string name="prefs_storage_dir">Externes Speicherverzeichnis (SD)</string>
-  <string name="prefs_storage_dir_hint">Dies gilt nur für neue Tracks.</string>
-  <string name="prefs_output_one_dir_per_track">Ein Verzeichnis je Track</string>
-  <string name="prefs_output_one_dir_per_track_summary">Speichert jeden Track und zugehörige Dateien in einem eigenen Verzeichnis</string>
-  <string name="prefs_output_filename">Dateiname für Tracks</string>
-  <string name="prefs_output_filename_summary">Form des Dateinamens, wenn ein Track einen Namen hat</string>
+  <string name="prefs_storage_dir_hint">Gültig ab der nächste Route (nicht für die derzeitige)</string>
+  <string name="prefs_output_one_dir_per_track">Ein Verzeichnis pro Route</string>
+  <string name="prefs_output_one_dir_per_track_summary">Jede Route und zugehörige Dateien in einem eigenen Verzeichnis speichern</string>
+  <string name="prefs_output_filename">Dateiname für benannte Routen</string>
+  <string name="prefs_output_filename_summary">Form des Dateinamens, wenn die Route einen Namen hat</string>
   <string-array name="prefs_output_filename_keys">
-    <item>Track Name</item>
+    <item>Routename</item>
     <item>Name, Startdatum und -zeit</item>
     <item>Startdatum und -zeit</item>
   </string-array>
@@ -66,12 +75,12 @@
   </string-array>
   <string name="prefs_output_gpx_hdop_approximation">Benutze HDOP-Annäherung</string>
   <string name="prefs_output_gpx_hdop_approximation_summary">Fülle HDOP (im GPX) mit Näherungswerten der Genauigkeitsmessung</string>
-  <string name="prefs_sound_enabled">Sound aktivieren</string>
-  <string name="prefs_sound_enabled_summary">Spiele Sounds ab, wenn Sprachaufnahme startet und endet</string>
-  <string name="prefs_osm_clear_oauth_data">OSM-Anmeldedaten rücksetzen</string>
-  <string name="prefs_osm_clear_oauth_data_summary">OSM-Anmeldedaten und -Rechte vergessen und OSMTracker neu danach fragen lassen</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">Du musst OSMTracker neu erlauben, Tracks hochladen zu dürfen. Bist Du sicher?</string>
-  <string name="prefs_map_tile">Hintergrund-Karte Anbieter</string>
+  <string name="prefs_sound_enabled">Klänge aktivieren</string>
+  <string name="prefs_sound_enabled_summary">Spiele Klänge ab, wenn Sprachaufnahme startet und endet</string>
+  <string name="prefs_osm_clear_oauth_data">OSM-Anmeldedaten zurücksetzen</string>
+  <string name="prefs_osm_clear_oauth_data_summary">OSM-Anmeldedaten und -berechtigungen vergessen und OSMTracker neu danach fragen lassen</string>
+  <string name="prefs_osm_clear_oauth_data_dialog">Sie müssen OSMTracker erneut zum Hochladen von Routen autorisieren. Sind Sie sicher?</string>
+  <string name="prefs_map_tile">Hintergrundkarten-Anbieter</string>
   <string name="prefs_map_tile_summary"></string>
   <string-array name="prefs_map_tile_keys">
     <item>Mapnik</item>
diff --git a/app/src/main/res/values-de/strings-tags.xml b/app/src/main/res/values-de/strings-tags.xml
index e3de94fe9..9c48d3900 100644
--- a/app/src/main/res/values-de/strings-tags.xml
+++ b/app/src/main/res/values-de/strings-tags.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="tag.misc">Verschiedenes</string>
-  <string name="tag.restriction">Barrieren</string>
+  <string name="tag.restriction">Beschränkung</string>
   <string name="tag.car">Auto</string>
   <string name="tag.tourism">Tourismus</string>
   <string name="tag.amenity">Einrichtungen</string>
   <string name="tag.amenity_more">Einrichtungen (+)</string>
-  <string name="tag.way">Wege</string>
-  <string name="tag.track">Pfade</string>
+  <string name="tag.way">Weg</string>
+  <string name="tag.track">Route</string>
   <string name="tag.landuse">Landnutzung</string>
   <string name="tag.misc_bus_stop">Bushaltestelle</string>
   <string name="tag.misc_railway">Eisenbahn</string>
@@ -16,34 +16,34 @@
   <string name="tag.misc_atm">Bankautomat</string>
   <string name="tag.misc_bollard">Poller</string>
   <string name="tag.misc_toilets">Toiletten</string>
-  <string name="tag.misc_shelter">Wartehalle</string>
+  <string name="tag.misc_shelter">Unterstand</string>
   <string name="tag.misc_surveillance">Überwachung</string>
   <string name="tag.restriction_20">Maximal 20</string>
-  <string name="tag.restriction_30">Max 30</string>
+  <string name="tag.restriction_30">Maximal 30</string>
   <string name="tag.restriction_40">Maximal 40</string>
-  <string name="tag.restriction_50">Max 50</string>
+  <string name="tag.restriction_50">Maximal 50</string>
   <string name="tag.restriction_60">Maximal 60</string>
   <string name="tag.restriction_70">Maximal 70</string>
-  <string name="tag.restriction_80">Max 80</string>
+  <string name="tag.restriction_80">Maximal 80</string>
   <string name="tag.restriction_90">Maximal 90</string>
-  <string name="tag.restriction_100">Max 100</string>
-  <string name="tag.restriction_110">Max 110</string>
-  <string name="tag.restriction_120">Max 120</string>
-  <string name="tag.restriction_130">MAximal 130</string>
+  <string name="tag.restriction_100">Maximal 100</string>
+  <string name="tag.restriction_110">Maximal 110</string>
+  <string name="tag.restriction_120">Maximal 120</string>
+  <string name="tag.restriction_130">Maximal 130</string>
   <string name="tag.restriction_no_exit">Sackgasse</string>
   <string name="tag.restriction_traffic_light">Ampel</string>
   <string name="tag.restriction_one_way">Einbahnstraße</string>
   <string name="tag.car_fuel_station">Tankstelle</string>
   <string name="tag.car_parking">Parkplatz</string>
   <string name="tag.car_emergency_phone">Notruf</string>
-  <string name="tag.car_turning_circle">Kreisverkehr</string>
+  <string name="tag.car_turning_circle">Wendekreis</string>
   <string name="tag.car_speed_camera">Radargerät</string>
   <string name="tag.tourism_view_point">Aussichtspunkt</string>
   <string name="tag.tourism_information">Information</string>
   <string name="tag.tourism_picnic">Rastplatz</string>
   <string name="tag.tourism_attraction">Attraktion</string>
   <string name="tag.tourism_theme_park">Freizeitpark</string>
-  <string name="tag.tourism_castle">Burg/Schloß</string>
+  <string name="tag.tourism_castle">Burg/Schloss</string>
   <string name="tag.tourism_monument">Monument</string>
   <string name="tag.tourism_museum">Museum</string>
   <string name="tag.tourism_cinema">Kino</string>
@@ -54,7 +54,9 @@
   <string name="tag.amenity_marina">Hafen</string>
   <string name="tag.amenity_sport">Sport</string>
   <string name="tag.amenity_taxi">Taxi</string>
+  <string name="tag.amenity_doctors">Krankenhaus,\nÄrzte</string>
   <string name="tag.amenity_recycling">Recycling</string>
+  <string name="tag.amenity_place_of_worship">Andachts-\nstätte</string>
   <string name="tag.amenity_post_office">Postamt</string>
   <string name="tag.amenity_library">Bibliothek</string>
   <string name="tag.amenitymore_school">Schule</string>
@@ -67,7 +69,7 @@
   <string name="tag.amenitymore_motel">Motel</string>
   <string name="tag.amenitymore_hostel">Hostel</string>
   <string name="tag.amenitymore_restaurant">Restaurant</string>
-  <string name="tag.amenitymore_fastfood">Fastfood</string>
+  <string name="tag.amenitymore_fastfood">Schnellimbiss</string>
   <string name="tag.amenitymore_camp_site">Campingplatz</string>
   <string name="tag.way_bridge">Brücke</string>
   <string name="tag.way_zebra_crossing">Zebrastreifen</string>
@@ -79,11 +81,11 @@
   <string name="tag.way_residential">Straße an/in
 Wohngebieten</string>
   <string name="tag.way_service">Erschließungsweg</string>
-  <string name="tag.track_track">Feldweg</string>
+  <string name="tag.track_track">Route</string>
   <string name="tag.track_cycleway">Fahrradweg</string>
   <string name="tag.track_footway">Fußweg</string>
   <string name="tag.track_bridleway">Reitweg</string>
-  <string name="tag.track_steps">Treppen</string>
+  <string name="tag.track_steps">Treppe</string>
   <string name="tag.track_living_street">Verkehrsberuhigter
 Bereich</string>
   <string name="tag.track_pedestrian">Fußgängerweg</string>
@@ -105,4 +107,5 @@ genutzte Fläche</string>
   <string name="tag.landuse_forest">Forstwirtschaft</string>
   <string name="tag.landuse_allotments">Kleingarten</string>
   <string name="tag.landuse_cemetery">Friedhof</string>
+  <string name="tag.landuse_recreation_ground">Erholungs-\gebiet</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fa1fa56ce..ff5e73d32 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,50 +3,53 @@
   <!--Generic strings-->
   <string name="app_name">OSMTracker für Android™</string>
   <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">Inspiriert durch OSMTracker auf Windows Mobile. OSMTracker erlaubt die Aufzeichnung von Routen, das Markieren signifikanter Wegepunkte (Sprachaufnahme, Foto) und dessen Export in eine GPX-Datei zur weiteren Bearbeitung mit OpenStreetMap-Tools, wie z.B. JOSM.</string>
+  <string name="app_description">Inspiriert von OSMTracker auf Windows Mobile. OSMTracker ermöglicht die Aufzeichnung Ihrer Routen, das Markieren signifikanter Wegpunkte (z. B. durch Sprachaufnahme oder Foto) und dessen Export in eine GPX-Datei zur weiteren Bearbeitung mit OpenStreetMap-Werkzeugen wie JOSM.</string>
   <!--TrackLogger-->
-  <string name="tracklogger">Track Logger</string>
-  <string name="tracklogger_waiting_gps">Warte auf GPS-Standortbestimmung bevor Tasten verfügbar sind…</string>
+  <string name="tracklogger">Routen-Aufzeichner</string>
+  <string name="tracklogger_waiting_gps">Warte auf GPS-Fix vor Tastenaktivierung…</string>
   <string name="tracklogger_voicerec_title">Sprachaufnahme</string>
-  <string name="tracklogger_voicerec_text">Aufnahme eines {0}s Audio-Clips.</string>
-  <string name="tracklogger_voicerec_stop">Stop</string>
+  <string name="tracklogger_voicerec_text">{0}s Audioclip wird aufgenommen.</string>
+  <string name="tracklogger_voicerec_stop">Stopp</string>
   <string name="tracklogger_btnBack">Zurück</string>
-  <string name="tracklogger_tracked">Tracked: </string>
-  <string name="tracklogger_gps_disabled">GPS ist deaktiviert</string>
+  <string name="tracklogger_tracked">Aufgezeichnete Route:</string>
+  <string name="tracklogger_gps_disabled">GPS deaktiviert</string>
   <string name="tracklogger_gps_disabled_hint">GPS ist deaktiviert. Möchten Sie es aktivieren?</string>
   <string name="tracklogger_choose_gallery_camera">Galerie oder Kamera?</string>
   <string name="tracklogger_camera">Foto mit Kamera aufnehmen</string>
   <string name="tracklogger_gallery">Foto aus Galerie auswählen</string>
   <!--Waypoint List-->
-  <string name="wplist">Waypoint Liste</string>
+  <string name="wplist">Wegpunktliste</string>
   <string name="wplist_latitude">Lat: </string>
   <string name="wplist_longitude">Long: </string>
-  <string name="wplist_elevation">Ele: </string>
-  <string name="wplist_accuracy">Accur: </string>
-  <string name="wplist_compass">Kompass-Richtung</string>
-  <string name="wplist_compass_accuracy">Kompass-Genauigkeit</string>
+  <string name="wplist_elevation">Höhe: </string>
+  <string name="wplist_accuracy">Genau: </string>
+  <string name="wplist_compass">Kompassrichtung:</string>
+  <string name="wplist_compass_accuracy">Kompassgenauigkeit:</string>
   <!--Track Manager-->
-  <string name="trackmgr">Track Verwaltung</string>
-  <string name="trackmgr_tracklist">Track Liste:</string>
-  <string name="trackmgr_waypoints_count">Waypoints: </string>
-  <string name="trackmgr_trackpoints_count">Trackpoints: </string>
-  <string name="trackmgr_empty">Bisher sind keine Tracks vorhanden.</string>
-  <string name="trackmgr_newtrack_error">Neuer Track kann nicht erstellt werden: {0}</string>
-  <string name="trackmgr_contextmenu_stop">Tracking stoppen</string>
-  <string name="trackmgr_contextmenu_resume">Tracking fortsetzen</string>
+  <string name="trackmgr">Routenverwaltung</string>
+  <string name="trackmgr_tracklist">Routenliste:</string>
+  <string name="trackmgr_waypoints_count">Wegpunkte: </string>
+  <string name="trackmgr_trackpoints_count">Routenpunkte: </string>
+  <string name="trackmgr_empty">Sie haben keine Routen.</string>
+  <string name="trackmgr_newtrack_hint">Drücken Sie <b>Menü</b>\n und anschließend<b>Neue Route</b>, um eine neue Route aufzunehmen</string>
+  <string name="trackmgr_newtrack_error">Neue Route kann nicht erstellt werden: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Aktuell wird <b>Route #{0}</b> aufgezeichnet.\nWählen Sie diese aus der Liste aus, um fortzufahren.</string>
+  <string name="trackmgr_contextmenu_stop">Routenverfolgung stoppen</string>
+  <string name="trackmgr_contextmenu_resume">Routenaufnahme fortsetzen</string>
   <string name="trackmgr_contextmenu_delete">Löschen</string>
   <string name="trackmgr_contextmenu_export">Als GPX exportieren</string>
   <string name="trackmgr_contextmenu_osm_upload">Zu OpenStreetMap hochladen</string>
-  <string name="trackmgr_contextmenu_display">Anzeigen</string>
+  <string name="trackmgr_contextmenu_display">Auf Karte anzeigen</string>
   <string name="trackmgr_contextmenu_details">Details</string>
-  <string name="trackmgr_contextmenu_title">Track bearbeiten</string>
-  <string name="trackmgr_delete_confirm">Track #{0} wird gelöscht</string>
-  <string name="trackmgr_deleteall_confirm">Alle Tracks werden gelöscht. Sind Sie sicher?</string>
-  <string name="trackmgr_exporting">Track #{0} wird exportiert…</string>
-  <string name="trackmgr_export_error">Track kann nicht exportiert werden: {0}</string>
-  <string name="trackmgr_exportall_confirm">Alle Tracks werden hochgeladen. Dies kann einige Zeit dauern. Möchten Sie fortfahren?</string>
+  <string name="trackmgr_contextmenu_title">Route #{0}</string>
+  <string name="trackmgr_delete_confirm">Route #{0} wird gelöscht</string>
+  <string name="trackmgr_deleteall_confirm">Alle Routen werden gelöscht. Sind Sie sicher?</string>
+  <string name="trackmgr_exporting">Route #{0} wird exportiert…</string>
+  <string name="trackmgr_exporting_prepare">Bereite Export vor...</string>
+  <string name="trackmgr_export_error">Route kann nicht exportiert werden: {0}</string>
+  <string name="trackmgr_exportall_confirm">Alle Routen werden exportiert, dies kann einige Zeit dauern. Sind Sie sicher?</string>
   <!--Track Detail-->
-  <string name="trackdetail">Track Details</string>
+  <string name="trackdetail">Routendetails</string>
   <string name="trackdetail_startdate">Startzeit: </string>
   <string name="trackdetail_enddate">Endzeit: </string>
   <string name="trackdetail_startloc">Startet bei: </string>
@@ -62,33 +65,33 @@
   <string name="trackdetail_description_mandatory">Sie müssen eine Beschreibung eingeben.</string>
   <string name="osm_visibility_private">Privat</string>
   <string name="osm_visibility_public">Öffentlich</string>
-  <string name="osm_visibility_trackable">Sichtbar</string>
+  <string name="osm_visibility_trackable">Verfolgbar</string>
   <string name="osm_visibility_identifiable">Identifizierbar</string>
   <!--OSM upload-->
   <string name="osm_upload">OpenStreetMap-Upload</string>
   <string name="osm_upload_ok">Speichern und hochladen</string>
-  <string name="osm_upload_tmpfile_failed">Konnte den Track nicht in eine temporäre Datei exportieren</string>
+  <string name="osm_upload_tmpfile_failed">Route konnte nicht in eine temporäre Datei exportiert werden</string>
   <string name="osm_upload_oauth_failed">Konnte keine Anmeldung bei OSM durchführen</string>
-  <string name="osm_upload_sending">Übertrage Track #{0}...</string>
-  <string name="osm_upload_waiting_response">Warte auf die Antwort des OpenStreetMap Servers</string>
-  <string name="osm_upload_error">Fehler beim Hochladen des Tracks</string>
-  <string name="osm_upload_bad_response">Der OSM Server meldet einen Fehler: ({0})message{1}</string>
-  <string name="osm_upload_unauthorized">Autorisierungsfehler. Möchtest Du die gespeicherten OpenStreetMap-Anmeldedaten zurücksetzen?</string>
-  <string name="osm_upload_sucess">Hochladen erfolgreich</string>
+  <string name="osm_upload_sending">Route #{0} wird gesendet...</string>
+  <string name="osm_upload_waiting_response">Warte auf die Antwort des OpenStreetMap-Servers...</string>
+  <string name="osm_upload_error">Fehler beim Hochladen der Route</string>
+  <string name="osm_upload_bad_response">Der OSM-Server meldet einen Fehler: ({0})message{1}</string>
+  <string name="osm_upload_unauthorized">Autorisierungsfehler. Möchten Sie die gespeicherten OpenStreetMap-Anmeldedaten zurücksetzen?</string>
+  <string name="osm_upload_sucess">Hochladen zu OpenStreetMap erfolgreich</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Sprachaufnahme</string>
   <string name="gpsstatus_record_stillimage">Foto aufnehmen</string>
   <string name="gpsstatus_record_textnote">Textnotiz</string>
   <!--Menu-->
   <string name="menu_settings">Einstellungen</string>
-  <string name="menu_waypointlist">Waypoints</string>
+  <string name="menu_waypointlist">Wegpunkte</string>
   <string name="menu_about">Über</string>
-  <string name="menu_displaytrack">Zeige Track</string>
-  <string name="menu_stoptracking">Stoppen &amp; Speichern</string>
-  <string name="menu_newtrack">Neuer Track</string>
-  <string name="menu_deletetracks">Lösche alle Tracks</string>
-  <string name="menu_continue">Track weiterbearbeiten</string>
-  <string name="menu_stopcurrenttrack">Aktuellen Track anhalten</string>
+  <string name="menu_displaytrack">Route anzeigen</string>
+  <string name="menu_stoptracking">Stoppen &amp; speichern</string>
+  <string name="menu_newtrack">Neue Route</string>
+  <string name="menu_deletetracks">Alle Routen löschen</string>
+  <string name="menu_continue">Route fortsetzen</string>
+  <string name="menu_stopcurrenttrack">Aktuelle Route stoppen</string>
   <string name="menu_save">Speichern</string>
   <string name="menu_cancel">Abbrechen</string>
   <string name="menu_export">Als GPX exportieren</string>
@@ -97,7 +100,7 @@
   <string name="menu_exportall">Exportiere als GPX</string>
   <!--Errors-->
   <string name="error_externalstorage_not_writable">Schreiben auf externen Speicher nicht möglich.</string>
-  <string name="error_create_track_dir">Der Ordner %s kann nicht erstellt werden.</string>
+  <string name="error_create_track_dir">Routenordner %s kann nicht erstellt werden</string>
   <string name="error_externalstorage_not_writable_hint">Bitte überprüfen Sie, ob der externe Speicher korrekt eingesetzt und eingebunden ist.</string>
   <string name="error_voicerec_failed">Sprachaufnahme fehlgeschlagen</string>
   <string name="error_userlayout_parsing">Fehler während Parsen der XML-Datei. Bitte auf Standardlayout wechseln.</string>
@@ -107,14 +110,17 @@
   <!--About screen-->
   <string name="about">Über</string>
   <string name="about_text">Für mehr Information, Dokumentation und Meldungen besuchen Sie bitte die Projekt-Homepage:</string>
-  <string name="about_translate_text">Hilf OSM Tracker zu übersetzten</string>
-  <string name="about_debug_info">Debug Informationen</string>
+  <string name="about_translate_text">Helfen Sie beim Übersetzen von OSMTracker:</string>
+  <string name="about_debug_info">Debug-Informationen</string>
+  <string name="about_export_db">Exportiere Datenbank</string>
+  <string name="about_exporting_db">Datenbank wird exportiert...</string>
+  <string name="about_export_db_result">Datenbankexport Ergebnis: %s</string>
   <!--Notification-->
-  <string name="notification_ticker_text">OSMTracker ist aktiv</string>
-  <string name="notification_title">OSMTracker ist aktiv (#{0})</string>
-  <string name="notification_text">Hier tippen um den Hauptbildschirm aufzurufen</string>
+  <string name="notification_ticker_text">OSMTracker zeichnet auf</string>
+  <string name="notification_title">OSMTracker zeichnet auf (#{0})</string>
+  <string name="notification_text">Hier tippen, um den Hauptbildschirm aufzurufen</string>
   <!--Display track-->
-  <string name="displaytrack">Zeige Track</string>
+  <string name="displaytrack">Route anzeigen</string>
   <string name="displaytrack_map">Karte als Hintergrund anzeigen</string>
   <string name="displaytrack_north">N</string>
   <!--Track detail-->
@@ -124,12 +130,44 @@
   <string name="various_accuracy">Genauigkeit</string>
   <string name="various_accuracy_with_sats">Genauigkeit {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">Warte auf GPS Standortbestimmung… ({0}/{1})</string>
+  <string name="various_waiting_gps_fix">Warte auf GPS-Fix… ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
   <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
   <string name="various_heading">Warte auf Richtung...</string>
   <string name="various_heading_unknown">Richtung kann nicht bestimmt werden</string>
   <!--OSM map view-->
-  <string name="displaytrackmap">OpenStreetMap Track Anzeige</string>
+  <string name="displaytrackmap">OpenStreetMap-Routenanzeige</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Aktualisieren &amp; Installieren</string>
+  <string name="buttons_presets_context_menu_delete">Löschen</string>
+  <string name="buttons_presets_updating_layout">Aktualisiere...</string>
+  <string name="buttons_presets_successful_update">Layout erfolgreich aktualisiert</string>
+  <string name="buttons_presets_unsuccessful_update">Layout nicht erfolgreich aktualisiert, bitte später noch einmal versuchen</string>
+  <string name="buttons_presets_delete_message">Bist Du sicher das {0} Layout zu löschen?</string>
+  <string name="buttons_presets_delete_positive_confirmation">Ja</string>
+  <string name="buttons_presets_successful_delete">Die Datei wurde erfolgreich gelöscht</string>
+  <string name="buttons_presets_icon_directory_deleted">Das Symbol-Verzeichnis wurde erfolgreich gelöscht</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">Die Datei hat kein zugehöriges Icon-Verzeichnis</string>
+  <string name="buttons_presets_unsuccessful_delete">Die Datei konnte nicht gelöscht werden</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Fehler: Verbindung zum Internet nicht verfügbar</string>
+  <string name="available_layouts_response_null_exception">Fehler: konnte nicht mit dem speziell angelegten Layout-Ablage verbinden</string>
+  <string name="available_layouts_connecting_message">(Verbinde...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Herunterladen</string>
+  <string name="available_layouts_not_available_language">Deine Sprache ist nicht verfügbar. Wähle eine von der Liste</string>
+  <string name="available_layouts_language_dialog_title">Verfügbare Sprachen</string>
+  <string name="available_layouts_checking_language_dialog">Prüfe lokale Sprachversionen</string>
+  <string name="available_layouts_downloading_dialog">Herunterladen...</string>
+  <string name="available_layouts_successful_download">Das Layout wurde erfolgreich heruntergeladen</string>
+  <string name="available_layouts_unsuccessful_download">Das Layout konnte nicht heruntergeladen werden, bitte später versuchen</string>
+  <string name="available_layouts_null_response_received">Fehler beim Abruf der Daten vom Server</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">Standard</string>
+  <string name="github_repository_settings_custom_checkbox">Anwenderspezifisch</string>
+  <string name="github_repository_settings_username">GitHub-Benutzername:</string>
+  <string name="github_repository_settings_repository_name">Ablagename:</string>
+  <string name="github_repository_settings_branch_name">Zweig-Name</string>
+  <string name="github_repository_settings_valid_server">Github Ablage gültig</string>
+  <string name="github_repository_settings_invalid_server">Github Ablage ungültig</string>
 </resources>
diff --git a/app/src/main/res/values-de/waypoints.xml b/app/src/main/res/values-de/waypoints.xml
index 9ebf977da..b8652df87 100644
--- a/app/src/main/res/values-de/waypoints.xml
+++ b/app/src/main/res/values-de/waypoints.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">Sprachaufnahme</string>
   <string name="wpt_stillimage">Foto</string>
diff --git a/app/src/main/res/values-el/strings-preferences.xml b/app/src/main/res/values-el/strings-preferences.xml
index 20d251e41..20a0a4471 100644
--- a/app/src/main/res/values-el/strings-preferences.xml
+++ b/app/src/main/res/values-el/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Ρυθμίσεις</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 15fd02008..4a33e5b48 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -31,7 +31,11 @@
   <string name="trackmgr_waypoints_count">Ενδιάμεσα σημεία:</string>
   <string name="trackmgr_trackpoints_count">Ίχνη:</string>
   <string name="trackmgr_empty">Δεν έχετε ίχνη.</string>
+  <string name="trackmgr_newtrack_hint">Για να γράψεις ένα ίχνος,\n
+πάτα <b>Μενού</b> και μετά <b>Νέο ίχνος</b></string>
   <string name="trackmgr_newtrack_error">Αδύνατη η δημιουργία νέου ίχνους: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Αυτή τη στιγμή καταγράφετε το <b>ίχνος #{0}</b>\n
+Επιλέξτε το στον κατάλογο για συνέχεια</string>
   <string name="trackmgr_contextmenu_stop">Τερματισμός ίχνους</string>
   <string name="trackmgr_contextmenu_resume">Συνέχεια ίχνους</string>
   <string name="trackmgr_contextmenu_delete">Διαγραφή</string>
@@ -43,6 +47,7 @@
   <string name="trackmgr_delete_confirm">Το ίχνος #{0} θα διαγραφεί</string>
   <string name="trackmgr_deleteall_confirm">Όλα τα ίχνη θα διαγραφούν. Είστε σίγουροι;</string>
   <string name="trackmgr_exporting">Εξαγωγή ίχνους #{0}...</string>
+  <string name="trackmgr_exporting_prepare">Προετοιμασία εξαγωγής...</string>
   <string name="trackmgr_export_error">Αδύνατη η εξαγωγή του ίχνους: {0}</string>
   <string name="trackmgr_exportall_confirm">Όλα τα ίχνη θα εξαχθούν, κάτι που μπορεί να πάρει ώρα. Είστε σίγουρος;</string>
   <!--Track Detail-->
@@ -109,6 +114,9 @@
   <string name="about_text">Για περισσότερες πληροφορίες, εγχειρίδια και αναφορές λαθών, επισκεφθείτε τη σελίδα της εφαρμογής:</string>
   <string name="about_translate_text">Βοηθήστε στη μετάφραση του OSMTracker:</string>
   <string name="about_debug_info">Πληροφορίες εντοπισμού σφαλμάτων</string>
+  <string name="about_export_db">Εξαγωγή βάσης δεδομένων</string>
+  <string name="about_exporting_db">Γίνεται εξαγωγή βάσης δεδομένων...</string>
+  <string name="about_export_db_result">Αποτέλεσμα εξαγωγής βάσης δεδομένων: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">Το OSMTracker ιχνηλατεί</string>
   <string name="notification_title">Το OSMTracker ιχνηλατεί (#{0})</string>
@@ -132,4 +140,7 @@
   <string name="various_heading_unknown">Δεν ήταν δυνατό να προσδιοριστεί η κατεύθυνση</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Προβολή ιχνών OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-es-rCL/strings-preferences.xml b/app/src/main/res/values-es-rCL/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-es-rCL/strings-preferences.xml
+++ b/app/src/main/res/values-es-rCL/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index f769800bd..e779edd5e 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -19,4 +19,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-es/strings-preferences.xml b/app/src/main/res/values-es/strings-preferences.xml
index f1d6c935e..a6fbb6bbc 100644
--- a/app/src/main/res/values-es/strings-preferences.xml
+++ b/app/src/main/res/values-es/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Configuración</string>
@@ -20,14 +20,14 @@
     <item>Galería</item>
     <item>Preguntar siempre</item>
   </string-array>
-  <string name="prefs_ui_buttons_layout">Disposición de botones</string>
+  <string name="prefs_ui_buttons_layout">Disposición de los botones</string>
   <string name="prefs_ui_buttons_layout_summary">Escoja una disposición personalizada de los botones (ver documentación)</string>
-  <string name="prefs_ui_buttons_layout_defaut">Predeterminada</string>
   <string name="prefs_ui_buttons_layout_default_section">PREDETERMINADA</string>
+  <string name="prefs_ui_buttons_layout_defaut">Predeterminada</string>
   <string name="prefs_ui_buttons_layout_downloaded_section">DESCARGADAS</string>
   <string name="prefs_ui_buttons_layout_empty_section">Usted no tiene disposiciones descargadas aún</string>
   <string name="prefs_ui_available_layout">Disposiciones para descargar</string>
-  <string name="prefs_ui_github_repository_settings">Configuración del Repositorio Github</string>
+  <string name="prefs_ui_github_repository_settings">Configuración del Repositorio GitHub</string>
   <string name="prefs_ui_orientation">Orientación</string>
   <string name="prefs_ui_orientation_summary">Orientación preferida para la pantalla de botones</string>
   <string-array name="prefs_ui_orientation_options_keys">
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fa32b40a5..a6e1d910c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -8,7 +8,7 @@
   <string name="tracklogger">Grabadora de trazas</string>
   <string name="tracklogger_waiting_gps">Esperando la señal de GPS para habilitar los botones…</string>
   <string name="tracklogger_voicerec_title">Grabación de voz</string>
-  <string name="tracklogger_voicerec_text">Grabando un sonido de {0} s.</string>
+  <string name="tracklogger_voicerec_text">Grabando un audio de {0} s.</string>
   <string name="tracklogger_voicerec_stop">Detener</string>
   <string name="tracklogger_btnBack">Atrás</string>
   <string name="tracklogger_tracked">Trazado: </string>
@@ -32,6 +32,8 @@
   <string name="trackmgr_trackpoints_count">P. de traza:</string>
   <string name="trackmgr_empty">Usted no tiene ninguna traza.</string>
   <string name="trackmgr_newtrack_error">No se puede crear una nueva traza: {0}</string>
+  <string name="trackmgr_newtrack_hint">Para iniciar una traza, presione </string>
+  <string name="trackmgr_continuetrack_hint">En este momento está grabando la <b>traza #{0}</b>\nElíjalo en la lista para continuar</string>
   <string name="trackmgr_contextmenu_stop">Detener el trazado</string>
   <string name="trackmgr_contextmenu_resume">Reanudar el trazado</string>
   <string name="trackmgr_contextmenu_delete">Eliminar</string>
@@ -43,20 +45,21 @@
   <string name="trackmgr_delete_confirm">La traza #{0} se eliminará.</string>
   <string name="trackmgr_deleteall_confirm">Se eliminarán todos las trazas. ¿Está seguro?</string>
   <string name="trackmgr_exporting">Exportando traza #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Preparando la exportación...</string>
   <string name="trackmgr_export_error">No se puede exportar la traza: {0}</string>
   <string name="trackmgr_exportall_confirm">Se exportarán todas las trazas, lo cual podría tardar mucho tiempo. ¿Está seguro?</string>
   <!--Track Detail-->
   <string name="trackdetail">Detalles de la traza</string>
   <string name="trackdetail_startdate">Hora de inicio: </string>
-  <string name="trackdetail_enddate">Hora de fin: </string>
-  <string name="trackdetail_startloc">Se inicia en: </string>
-  <string name="trackdetail_endloc">Termina en: </string>
-  <string name="trackdetail_exportdate">Se exportó a: </string>
+  <string name="trackdetail_enddate">Hora de finalización: </string>
+  <string name="trackdetail_startloc">Inicia en: </string>
+  <string name="trackdetail_endloc">Termina en:</string>
+  <string name="trackdetail_exportdate">Se exportó a:</string>
   <string name="trackdetail_osm_upload_date">Subido a OpenStreetMap:</string>
   <string name="trackdetail_btn_export">Exportar a GPX</string>
   <string name="trackdetail_export_notyet">(aún no exportado)</string>
   <string name="trackdetail_osm_upload_notyet">(aún no subido)</string>
-  <string name="trackdetail_export_display">Visualizar</string>
+  <string name="trackdetail_export_display">Mostrar</string>
   <string name="trackdetail_description">Descripción: </string>
   <string name="trackdetail_tags">Etiquetas (delimitado por comas)</string>
   <string name="trackdetail_description_mandatory">Debe introducir una descripción</string>
@@ -109,6 +112,9 @@
   <string name="about_text">Para más información, documentos e informe de incidencias, visite la web del proyecto:</string>
   <string name="about_translate_text">Ayúdanos a traducir OSMTracker:</string>
   <string name="about_debug_info">Info. de depuración</string>
+  <string name="about_export_db">Exportar base de datos</string>
+  <string name="about_exporting_db">Exportando base de datos...</string>
+  <string name="about_export_db_result">Resultado de exportar la base de datos: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker está trazando</string>
   <string name="notification_title">OSMTracker está trazando (#{0})</string>
@@ -131,42 +137,37 @@
   <string name="various_heading">Espere por la cabecera…</string>
   <string name="various_heading_unknown">La cabecera no se puede determinar</string>
   <!--OSM map view-->
-  <string name="displaytrackmap">Visualización de traza OpenStreetMap</string>
-
-  <!-- Buttons Presets messages -->
-
+  <string name="displaytrackmap">Vista de la traza en OpenStreetMap</string>
+  <!--Buttons presets messages-->
   <string name="buttons_presets_context_menu_update_install">Actualizar e instalar</string>
   <string name="buttons_presets_context_menu_delete">Eliminar</string>
   <string name="buttons_presets_updating_layout">Actualizando…</string>
   <string name="buttons_presets_successful_update">Disposición actualizada con éxito</string>
-  <string name="buttons_presets_unsuccessful_update">Lo sentimos, la disposición no se pudo actualizar</string>
+  <string name="buttons_presets_unsuccessful_update">La disposición no se pudo actualizar, intente de nuevo más tarde</string>
   <string name="buttons_presets_delete_message">¿Está seguro que desea eliminar la disposición de {0}?</string>
   <string name="buttons_presets_delete_positive_confirmation">Sí</string>
   <string name="buttons_presets_successful_delete">El archivo fue borrado con éxito</string>
   <string name="buttons_presets_icon_directory_deleted">Iconos de la disposición eliminados con éxito</string>
   <string name="buttons_presets_icon_directory_does_not_exist">Este archivo no tenía ningún directorio de iconos asociado</string>
   <string name="buttons_presets_unsuccessful_delete">No se pudo eliminar el archivo</string>
-
-  <!-- Available Layouts messages -->
-  <string name="available_layouts_connection_error">Error: No se puede conectar a internet, por favor revise su conexión</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Error: No se puede conectar a Internet, por favor revise su conexión</string>
   <string name="available_layouts_response_null_exception">Error: No se pudo conectar con el servidor de disposiciones personalizadas predeterminado</string>
   <string name="available_layouts_connecting_message">(Conectando…)</string>
   <string name="available_layouts_description_dialog_positive_confirmation">Descargar</string>
   <string name="available_layouts_not_available_language">Tu idioma no está disponible, por favor seleccione uno de la lista</string>
   <string name="available_layouts_language_dialog_title">Lenguajes Disponibles</string>
-  <string name="available_layouts_checking_language_dialog">Verificando tu idioma</string>
+  <string name="available_layouts_checking_language_dialog">Verificación de versiones de idioma local</string>
   <string name="available_layouts_downloading_dialog">Descargando…</string>
   <string name="available_layouts_successful_download">La disposición fue descargada con éxito</string>
   <string name="available_layouts_unsuccessful_download">No se pudo descargar la disposición, por favor intente más tarde</string>
-
-  <!-- Github Repository Settings -->
+  <string name="available_layouts_null_response_received">Error al recuperar datos del servidor</string>
+  <!--Github Repository Settings-->
   <string name="github_repository_settings_default_checkbox">Predeterminado</string>
   <string name="github_repository_settings_custom_checkbox">Personalizado</string>
-  <string name="github_repository_settings_username">Nombre de usuario Github: </string>
+  <string name="github_repository_settings_username">Nombre de usuario GitHub: </string>
   <string name="github_repository_settings_repository_name">Nombre del Repositorio: </string>
   <string name="github_repository_settings_branch_name">Nombre de la rama: </string>
-  <string name="github_repository_settings_valid_server">Repositorio de Github válido</string>
-  <string name="github_repository_settings_invalid_server">Repositorio de Github inválido</string>
-
-
+  <string name="github_repository_settings_valid_server">Repositorio de GitHub válido</string>
+  <string name="github_repository_settings_invalid_server">Repositorio de GitHub inválido</string>
 </resources>
diff --git a/app/src/main/res/values-et/accessibility.xml b/app/src/main/res/values-et/accessibility.xml
new file mode 100644
index 000000000..b81e0d2e1
--- /dev/null
+++ b/app/src/main/res/values-et/accessibility.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About screen-->
+  <!--Zoom in/out in map view-->
+  <!--GPS status bar-->
+  <!--Track list-->
+</resources>
diff --git a/app/src/main/res/values-et/strings-preferences.xml b/app/src/main/res/values-et/strings-preferences.xml
new file mode 100644
index 000000000..cc2bd985b
--- /dev/null
+++ b/app/src/main/res/values-et/strings-preferences.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Preferences-->
+  <string name="prefs_map_tile_summary"></string>
+</resources>
diff --git a/app/src/main/res/values-et/strings-tags.xml b/app/src/main/res/values-et/strings-tags.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/app/src/main/res/values-et/strings-tags.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
new file mode 100644
index 000000000..02cc7411f
--- /dev/null
+++ b/app/src/main/res/values-et/strings.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Generic strings-->
+  <string name="app_short_name">OSMTracker</string>
+  <!--TrackLogger-->
+  <string name="tracklogger_voicerec_stop">Peata</string>
+  <string name="tracklogger_btnBack">Tagasi</string>
+  <string name="tracklogger_gps_disabled">GPS on väljas</string>
+  <string name="tracklogger_choose_gallery_camera">Galerii või kaamera?</string>
+  <!--Waypoint List-->
+  <!--Track Manager-->
+  <string name="trackmgr_contextmenu_delete">Kustuta</string>
+  <string name="trackmgr_contextmenu_display">Näita</string>
+  <string name="trackmgr_contextmenu_details">Üksikasjad</string>
+  <!--Track Detail-->
+  <string name="trackdetail_startdate">Alguse aeg:</string>
+  <string name="trackdetail_enddate">Lõpu aeg:</string>
+  <string name="trackdetail_startloc">Algab:</string>
+  <string name="trackdetail_endloc">Lõpeb:</string>
+  <string name="trackdetail_exportdate">Eksporditud:</string>
+  <string name="trackdetail_description">Kirjeldus</string>
+  <string name="osm_visibility_private">Privaatne</string>
+  <string name="osm_visibility_public">Avalik</string>
+  <string name="osm_visibility_identifiable">Tuvastatav</string>
+  <!--OSM upload-->
+  <string name="osm_upload_ok">Salvesta ja laadi üles</string>
+  <!--GPS Status & record bar-->
+  <string name="gpsstatus_record_stillimage">Tee foto</string>
+  <string name="gpsstatus_record_textnote">Tekstimärkus</string>
+  <!--Menu-->
+  <string name="menu_settings">Seaded</string>
+  <string name="menu_about">Info</string>
+  <string name="menu_save">Salvesta</string>
+  <string name="menu_cancel">Loobu</string>
+  <!--Errors-->
+  <!--GPX-->
+  <!--About screen-->
+  <string name="about">Info</string>
+  <!--Notification-->
+  <!--Display track-->
+  <string name="displaytrack_north">N</string>
+  <!--Track detail-->
+  <string name="trackdetail_save">Salvesta</string>
+  <!--Various-->
+  <string name="various_unit_meters">m</string>
+  <string name="various_accuracy">Täpsus</string>
+  <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display">{0}°</string>
+  <!--parameters: (heading in degrees)-->
+  <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
+</resources>
diff --git a/app/src/main/res/values-et/waypoints.xml b/app/src/main/res/values-et/waypoints.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/app/src/main/res/values-et/waypoints.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/app/src/main/res/values-eu/strings-preferences.xml b/app/src/main/res/values-eu/strings-preferences.xml
index 2f7163d46..5b91e124d 100644
--- a/app/src/main/res/values-eu/strings-preferences.xml
+++ b/app/src/main/res/values-eu/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Ezarpenak</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 4bdc30c9c..277e6bf05 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -119,4 +119,7 @@
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap ibilbidea</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/accessibility.xml b/app/src/main/res/values-fa-rIR/accessibility.xml
index 4131bf35d..b2180a1a3 100644
--- a/app/src/main/res/values-fa-rIR/accessibility.xml
+++ b/app/src/main/res/values-fa-rIR/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">لوگوی OSMTracker</string>
@@ -10,5 +10,5 @@
   <string name="acc.record_indicator">نشانگر ضبط در جریان</string>
   <!--Track list-->
   <string name="acc.track_status">نشانگر وضعیت مسیر</string>
-  <string name="acc.upload_status">نشانگر وضعیت بارگزاری به OpenStreetMap </string>
+  <string name="acc.upload_status">نشانگر وضعیت بارگذاری در OpenStreetMap </string>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/strings-preferences.xml b/app/src/main/res/values-fa-rIR/strings-preferences.xml
index 451b3ea4d..e2ac219b6 100644
--- a/app/src/main/res/values-fa-rIR/strings-preferences.xml
+++ b/app/src/main/res/values-fa-rIR/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">تنظیمات</string>
@@ -8,23 +8,68 @@
   <string name="prefs_check_gps_startup">بررسی GPS هنگام شروع</string>
   <string name="prefs_check_gps_startup_summary">بررسی غیرفعال بودن GPS هنگام شروع برنامه و پیشنهاد برای فعالسازی آن</string>
   <string name="prefs_gps_ignore_clock">نادیده گرفتن ساعت GPS</string>
+  <string name="prefs_gps_ignore_clock_summary">نادیده گرفتن ساعت جی پی اس و استفاده از ساعت آندروید برای timestamps</string>
   <string name="prefs_gps_logging_interval">فواصل ثبت GPS</string>
+  <string name="prefs_gps_logging_interval_summary">برای کوتاهترین زمان ممکن از 0 استفاده کن. (تاثیر روی مصرف باتری)</string>
   <string name="prefs_gps_logging_interval_seconds">ثانیه</string>
   <string name="prefs_ui">رابط کاربری</string>
-  <string name="prefs_ui_picture_source">منبع پیشفرض تصویر</string>
+  <string name="prefs_ui_picture_source">محل پیش فرض برای عکس</string>
+  <string name="prefs_ui_picture_source_summary">انتخاب عکس از دوربین یا گالری؟</string>
+  <string-array name="prefs_ui_picture_source_keys"/>
   <string name="prefs_ui_buttons_layout">پیشفرض دکمه‌ها</string>
   <string name="prefs_ui_buttons_layout_summary">انتخاب دکمه‌های دلخواه (مستندات را ببینید)</string>
-  <string name="prefs_ui_buttons_layout_defaut">پیش فرض</string>
+  <string name="prefs_ui_buttons_layout_default_section">چیدمان پیشفرض</string>
+  <string name="prefs_ui_buttons_layout_defaut">پیشفرض</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">چیدمان دانلود شده</string>
+  <string name="prefs_ui_buttons_layout_empty_section">فایل‌های چیدمان را دانلود نکرده‌اید</string>
+  <string name="prefs_ui_available_layout">چیدمان‌های موجود</string>
+  <string name="prefs_ui_github_repository_settings">تنظیمات مخزن گیت‌هاب</string>
   <string name="prefs_ui_orientation">جهت</string>
+  <string name="prefs_ui_orientation_summary">جهتی که برای صفحه دکمه‌ها ترجیح می‌دهید</string>
+  <string-array name="prefs_ui_orientation_options_keys"/>
   <string name="prefs_voicerec_duration">مدت ضبط صدا</string>
   <string name="prefs_voicerec_duration_seconds">ثانیه</string>
   <string name="prefs_theme">قالب گرافیکی صفحه اصلی</string>
-  <string name="prefs_display_always_on">روشن ماندن صفحه</string>
-  <string name="prefs_displaytrack_osm">نقشه پیش‌زمینه</string>
+  <string name="prefs_theme_summary">برای اثربخشی تغییرات برنامه را مجدداً راه‌اندازی کنید</string>
+  <string-array name="prefs_theme_keys"/>
+  <string name="prefs_display_always_on">صفحه همیشه روشن</string>
+  <string name="prefs_display_always_on_summary">صفحه‌نمایش هنگام ردیابی روشن خواهد ماند. برای صرفه‌جویی در مصرف باتری غیرفعال کنید.</string>
+  <string name="prefs_displaytrack_osm">نقشه پس‌زمینه</string>
+  <string name="prefs_displaytrack_osm_summary">نمایش نقشه OpenStreetMap زیر مسیر. به ارتباط اینترنتی نیاز دارد.</string>
+  <string name="prefs_displaytrack_osm_summary_ask">پس‌زمینه  OpenStreetMap همیشه نمایش داده شود؟ نیاز به ارتباط اینترنتی دارد.</string>
   <string name="prefs_output">تنظیمات GPS</string>
+  <string name="prefs_storage_dir">حافظه خارجی (SD)</string>
+  <string name="prefs_storage_dir_hint">موثر برای مسیر بعدی (روی مسیر فعلی تاثیر نمی‌گذارد)</string>
   <string name="prefs_output_one_dir_per_track">یک شاخه برای هر مسیر</string>
-  <string name="prefs_output_one_dir_per_track_summary">هر مسیر و فایلهای پیوست آنرا در شاخه مجزا ذخیره کن</string>
-  <string name="prefs_output_accuracy">میزان دقت در فایل GPS</string>
+  <string name="prefs_output_one_dir_per_track_summary">هر مسیر و فایل‌های پیوست آن را در شاخه مجزا ذخیره کن</string>
+  <string name="prefs_output_filename">اسم فایل برای مسیرهای نام گذاری شده</string>
+  <string name="prefs_output_filename_summary">الگو برای نام فایل اگر مسیر نامی داشته باشد</string>
+  <string name="prefs_output_accuracy">ثبت دقت در فایل GPX</string>
+  <string name="prefs_output_accuracy_summary">اطلاعات دقت را به فایل GPX اضافه می‌کند: در کنار نام نقطه بین‌راهی یا در توضیحات نقطه بین‌راهی</string>
+  <string-array name="prefs_output_accuracy_keys">
+    <item>خالی</item>
+    <item>کنار نام نقطه</item>
+    <item>در توضیحات نقطه</item>
+  </string-array>
+  <string name="prefs_output_gpx_hdop_approximation">از تقریب HDOP استفاده شود</string>
+  <string name="prefs_output_gpx_hdop_approximation_summary">مقدار HDOP در فایل GPX با مقداری تقریبی از دقت دستگاه پر شود.</string>
   <string name="prefs_sound_enabled">فعالسازی صدا</string>
+  <string name="prefs_sound_enabled_summary">هنگام شروع و پایان ضبط صدا هشدار صوتی داده شود</string>
+  <string name="prefs_osm_clear_oauth_data">بازنشانی اطلاعات احراز هویت OSM</string>
+  <string name="prefs_osm_clear_oauth_data_summary">اعتبارنامه‌ها و مجوزهای OSM را فراموش کن و OSMTracker را مجبور به درخواست دوباره آن‌ها کن</string>
+  <string name="prefs_osm_clear_oauth_data_dialog">باید دویاره به OSMTracker مجوز بدهید تا بتوانید مسیرهای ذخیره شده را بارگذاری کنید. مطمئن هستید؟</string>
+  <string name="prefs_map_tile">ارائه‌دهندهٔ کاشی نقشه</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>خالی</item>
+    <item>در توضیحات</item>
+    <item>در extension</item>
+  </string-array>
+  <string name="prefs_compass_heading">خزوجی از جهت قطب نما</string>
+  <string name="prefs_compass_heading_summary">مشخص می‌کند آیا و چگونه اطلاعات قطب‌نما به فایل GPX وارد شود</string>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/strings-tags.xml b/app/src/main/res/values-fa-rIR/strings-tags.xml
index 00ac73891..716300ad2 100644
--- a/app/src/main/res/values-fa-rIR/strings-tags.xml
+++ b/app/src/main/res/values-fa-rIR/strings-tags.xml
@@ -14,6 +14,7 @@
   <string name="tag.misc_telephone">تلفن</string>
   <string name="tag.misc_post_box">صندوق پست</string>
   <string name="tag.misc_atm">خودپرداز</string>
+  <string name="tag.misc_bollard">تیرک مهار</string>
   <string name="tag.misc_toilets">دستشویی</string>
   <string name="tag.misc_shelter">پناهگاه</string>
   <string name="tag.misc_surveillance">نظارت</string>
@@ -30,6 +31,7 @@
   <string name="tag.restriction_120">حداکثر سرعت ۱۲۰</string>
   <string name="tag.restriction_130">حداکثر سرعت ۱۳۰</string>
   <string name="tag.restriction_no_exit">بن‌بست</string>
+  <string name="tag.restriction_traffic_light">چراغ راهنمایی و رانندگی</string>
   <string name="tag.restriction_one_way">یکطرفه</string>
   <string name="tag.car_fuel_station">پمپ بنزین</string>
   <string name="tag.car_parking">پارکینگ</string>
@@ -42,7 +44,7 @@
   <string name="tag.tourism_attraction">جاذبه‌ها</string>
   <string name="tag.tourism_theme_park">پارک تفریحی</string>
   <string name="tag.tourism_castle">قلعه</string>
-  <string name="tag.tourism_monument">کوهستان</string>
+  <string name="tag.tourism_monument">یادمان</string>
   <string name="tag.tourism_museum">موزه</string>
   <string name="tag.tourism_cinema">سینما</string>
   <string name="tag.amenity_bench">نمیکت</string>
@@ -52,7 +54,9 @@
   <string name="tag.amenity_marina">دریایی</string>
   <string name="tag.amenity_sport">ورزشی</string>
   <string name="tag.amenity_taxi">تاکسی</string>
+  <string name="tag.amenity_doctors">بیمارستان،\nپزشکان</string>
   <string name="tag.amenity_recycling">بازیافت</string>
+  <string name="tag.amenity_place_of_worship">مکان /n عبادت</string>
   <string name="tag.amenity_post_office">اداره پست</string>
   <string name="tag.amenity_library">کتابخانه</string>
   <string name="tag.amenitymore_school">مدرسه</string>
@@ -68,19 +72,21 @@
   <string name="tag.amenitymore_fastfood">فست فود</string>
   <string name="tag.amenitymore_camp_site">اردوگاه</string>
   <string name="tag.way_bridge">پل</string>
-  <string name="tag.way_zebra_crossing">خط‌کشی عابر پیاده</string>
+  <string name="tag.way_zebra_crossing">خط‌کشی راه‌راه پیاده</string>
   <string name="tag.way_motorway">آزادراه</string>
   <string name="tag.way_trunk">بزرگراه</string>
-  <string name="tag.way_primary">خیابان اولیه</string>
-  <string name="tag.way_secondary">خیابان ثانویه</string>
-  <string name="tag.way_residential">خیابان مسکونی</string>
+  <string name="tag.way_primary">شریانی اصلی</string>
+  <string name="tag.way_secondary">شریانی فرعی</string>
+  <string name="tag.way_tertiary">جمع‌وپخش‌کننده</string>
+  <string name="tag.way_residential">مسکونی</string>
+  <string name="tag.way_service">دسترسی</string>
   <string name="tag.track_track">جاده خاکی</string>
   <string name="tag.track_cycleway">مسیر دوچرخه</string>
-  <string name="tag.track_footway">پیادهرو</string>
+  <string name="tag.track_footway">راه پیاده</string>
   <string name="tag.track_bridleway">مسیر مال‌رو</string>
   <string name="tag.track_steps">پله</string>
   <string name="tag.track_living_street">خیابان محلی</string>
-  <string name="tag.track_pedestrian">پیاده‌رو</string>
+  <string name="tag.track_pedestrian">پیاده‌راه عریض</string>
   <string name="tag.track_grade1">درجه ۱</string>
   <string name="tag.track_grade2">درجه ۲</string>
   <string name="tag.track_grade3">درجه ۳</string>
@@ -90,6 +96,8 @@
   <string name="tag.landuse_landfill">محل دفن زباله</string>
   <string name="tag.landuse_basin">حوضچه</string>
   <string name="tag.landuse_reservoir">مخزن</string>
-  <string name="tag.landuse_forest">جنگا</string>
+  <string name="tag.landuse_forest">جنگل</string>
+  <string name="tag.landuse_allotments">باغ‌های تخصیص‌یافته</string>
   <string name="tag.landuse_cemetery">گورستان</string>
+  <string name="tag.landuse_recreation_ground">زمین بازی \nو ورزش</string>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 7ac3a3a4f..cce0764e0 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -1,40 +1,173 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Generic strings-->
+  <string name="app_name">OSMTracker برای اندروید</string>
+  <string name="app_short_name">OSMTracker</string>
+  <string name="app_description">با الهام از OSMTracker بر روی ویندوز موبایل، این نرم‌افزار به شما این امکان را می‌دهد که رد سفرهای خود را ضبط کنید، نقاط بین‌راهی مهم را نشانه‌گذاری کنید (همراه با ضبط صدا و تصاویر) و از آن‌ها در قالب فایل GPX خروجی بگیرید. سپس می‌توانید این خروجی‌ها را در ابزارهای OpenStreetMap، مانند JOSM، به‌کار ببرید.</string>
   <!--TrackLogger-->
+  <string name="tracklogger">واقعه نگار مسیر</string>
+  <string name="tracklogger_waiting_gps">در انتظار ثابت شدن GPS برای فعال کردن دکمه ها...</string>
+  <string name="tracklogger_voicerec_title">ضبط صدا</string>
+  <string name="tracklogger_voicerec_text">در حال ضبط (0) ثانیه فایل صوتی</string>
   <string name="tracklogger_voicerec_stop">توقف</string>
   <string name="tracklogger_btnBack">عقب</string>
+  <string name="tracklogger_tracked">مسیر ثبت شده:</string>
   <string name="tracklogger_gps_disabled">GPS غیرفعال</string>
   <string name="tracklogger_gps_disabled_hint">GPS غیرفعال است. آنرا فعال میکنید؟</string>
+  <string name="tracklogger_choose_gallery_camera">گالری تصاویر یا دوربین؟</string>
+  <string name="tracklogger_camera">با دوربین عکس بگیر</string>
+  <string name="tracklogger_gallery">انتخاب عکس از گالری</string>
   <!--Waypoint List-->
+  <string name="wplist">لیست نقاط بین‌راهی</string>
+  <string name="wplist_latitude">عرض جغرافیایی:</string>
+  <string name="wplist_longitude">طول جغرافیایی:</string>
+  <string name="wplist_elevation">ارتفاع:</string>
+  <string name="wplist_accuracy">دقت:</string>
+  <string name="wplist_compass">جهت قطب‌نما:</string>
+  <string name="wplist_compass_accuracy">دقت قطب‌نما:</string>
   <!--Track Manager-->
+  <string name="trackmgr">مدیریت مسیرها</string>
+  <string name="trackmgr_tracklist">لیست مسیرها:</string>
+  <string name="trackmgr_waypoints_count">نقاط بین‌راهی:</string>
+  <string name="trackmgr_trackpoints_count">نقاط مسیر:</string>
+  <string name="trackmgr_empty">شما هیچ مسیری ندارید.</string>
+  <string name="trackmgr_newtrack_hint">جهت ضبط مسیر، وارد Menu شده و سپس New Track را انتخاب نمایید.</string>
+  <string name="trackmgr_newtrack_error">امکان ساخت مسیر جدید وجود ندارد: {0}</string>
+  <string name="trackmgr_continuetrack_hint">هم‌اکنون در حال ضبط &lt;b&gt;مسیر#{0}&lt;b/&gt; هستید \nبرای ادامه‌دادنش آن را در لیست انتخاب کنید</string>
+  <string name="trackmgr_contextmenu_stop">توقف ضبط مسیر</string>
+  <string name="trackmgr_contextmenu_resume">ادامه‌دادن ضبط مسیر</string>
   <string name="trackmgr_contextmenu_delete">حذف</string>
+  <string name="trackmgr_contextmenu_export">تهیه خروجی در قالب GPX</string>
+  <string name="trackmgr_contextmenu_osm_upload">بارگذاری در OpenStreetMap</string>
   <string name="trackmgr_contextmenu_display">نمایش</string>
   <string name="trackmgr_contextmenu_details">جزئیات</string>
+  <string name="trackmgr_contextmenu_title">مسیر #{0}</string>
+  <string name="trackmgr_delete_confirm">مسیر #{0} پاک خواهد شد</string>
+  <string name="trackmgr_deleteall_confirm">تمامی مسیرها پاک خواهد شد. آیا مطمئن هستید؟</string>
+  <string name="trackmgr_exporting">در حال خروجی‌گرفتن از مسیر #{0}...</string>
+  <string name="trackmgr_exporting_prepare">در حال آماده‌سازی فایل خروجی...</string>
+  <string name="trackmgr_export_error">امکان تهیه خروجی از مسیر شماره: {0} وجود ندارد</string>
+  <string name="trackmgr_exportall_confirm">از تمامی مسیرها خروجی تهیه خواهد شد که امکان دارد زمان زیادی طول بکشد. آیا مطمئن هستید؟</string>
   <!--Track Detail-->
+  <string name="trackdetail">جزئیات مسیر</string>
   <string name="trackdetail_startdate">زمان شروع:</string>
   <string name="trackdetail_enddate">زمان خاتمه:</string>
   <string name="trackdetail_startloc">شروع در:</string>
   <string name="trackdetail_endloc">خاتمه در:</string>
+  <string name="trackdetail_exportdate">خروجی:</string>
+  <string name="trackdetail_osm_upload_date">در سایت OpenStreetMap بارگذاری شد</string>
+  <string name="trackdetail_btn_export">تهیه خروجی در قالب GPX</string>
+  <string name="trackdetail_export_notyet">(هنوز از آن خروجی نگرفته‌اید)</string>
+  <string name="trackdetail_osm_upload_notyet">(هنوز بارگذاری نشده است)</string>
+  <string name="trackdetail_export_display">نمایش</string>
   <string name="trackdetail_description">توضیح</string>
+  <string name="trackdetail_tags">برچسب ( با کاما جدا شوند)</string>
+  <string name="trackdetail_description_mandatory">باید شرحی بنویسید</string>
   <string name="osm_visibility_private">خصوصی</string>
   <string name="osm_visibility_public">عمومی</string>
   <string name="osm_visibility_trackable">قابل ردیابی</string>
   <string name="osm_visibility_identifiable">قابل تعریف</string>
   <!--OSM upload-->
+  <string name="osm_upload">بارگذاری در OpenStreetMap</string>
+  <string name="osm_upload_ok">ذخیره و بارگذاری</string>
+  <string name="osm_upload_tmpfile_failed">تهیه خروجی مسیر روی فایل موقت میسر نشد</string>
+  <string name="osm_upload_oauth_failed">نرم افزار قادر به تایید حساب کاربری در OSM نیست</string>
+  <string name="osm_upload_sending">در حال ارسال مسیر #{0}...</string>
+  <string name="osm_upload_waiting_response">منتظر پاسخ از سرور OpenStreetMap...</string>
+  <string name="osm_upload_error">بارگذاری مسیر با خطا مواجه گردید</string>
+  <string name="osm_upload_bad_response">سرور OSM یک خطا برگرداند: {(0)} پیغام {1}</string>
+  <string name="osm_upload_unauthorized">خطای دسترسی. مایلید اطلاعات ورود به حساب کاربری OpenStreetMap که روی دستگاه ذخیره شده، پاک شود؟</string>
+  <string name="osm_upload_sucess">بارگذرای در OpenStreetMap موفقیت‌آمیز بود</string>
   <!--GPS Status & record bar-->
+  <string name="gpsstatus_record_voicerec">ضبط صدا</string>
+  <string name="gpsstatus_record_stillimage">عکس گرفتن</string>
+  <string name="gpsstatus_record_textnote">یادداشت متنی</string>
   <!--Menu-->
+  <string name="menu_settings">تنظیمات</string>
+  <string name="menu_waypointlist">نقاط بین‌راهی</string>
+  <string name="menu_about">درباره ما</string>
+  <string name="menu_displaytrack">نمایش مسیر</string>
+  <string name="menu_stoptracking">توقف و ذخیره</string>
+  <string name="menu_newtrack">مسیر جدید</string>
+  <string name="menu_deletetracks">پاک کردن تمامی مسیرها</string>
+  <string name="menu_continue">ادامه دادن مسیر</string>
+  <string name="menu_stopcurrenttrack">توقف ثبت مسیر جاری</string>
+  <string name="menu_save">ذخیره</string>
+  <string name="menu_cancel">لغو</string>
+  <string name="menu_export">تهیه خروجی در قالب GPX</string>
+  <string name="menu_osm_upload">بارگذاری در OpenStreetMap</string>
+  <string name="menu_center_to_gps">مرکز به GPS</string>
+  <string name="menu_exportall">همه را در قالب GPX خروجی بگیر</string>
   <!--Errors-->
+  <string name="error_externalstorage_not_writable">نرم‌افزار نمی‌تواند در حافظه خارجی بنویسد.</string>
+  <string name="error_create_track_dir">نرم افزار نمی‌تواند پوشهٔ %s را برای مسیر بسازد</string>
+  <string name="error_externalstorage_not_writable_hint">لطفاً مطمئن شوید حافظه خارجی دستگاه به‌درستی جاگذاری و سوار(mount) شده باشد.</string>
+  <string name="error_voicerec_failed">ضبط صدا با اشکال مواجه شد</string>
+  <string name="error_userlayout_parsing">خطا هنگام تجزیه فایل چیدمان XML. لطفاً به چیدمان پیشفرض برگردانید.</string>
   <!--GPX-->
+  <string name="gpx_track_name">با OSM Tracker for Android ضبط شده است</string>
+  <string name="gpx_hdop_approximation_cmt">هشدار: مقادیر HDOP همان مقادیر HDOP دریافتی از دستگاه GPS نیستند؛ بلکه بر اساس دقت مکانی بر حسب متر تقریب زده شده‌اند.</string>
   <!--About screen-->
+  <string name="about">درباره</string>
+  <string name="about_text">برای اطلاعات بیشتر، دیدن مستندات و گزارش مشکل لطفاً از سایت پروژه دیدن فرمایید:</string>
+  <string name="about_translate_text">کمک کنید OSMTracker را ترجمه کنیم:</string>
+  <string name="about_debug_info">اطلاعات اشکال‌زدایی</string>
+  <string name="about_export_db">خروجی از پایگاه‌داده</string>
+  <string name="about_exporting_db">در حال خروجی گرفتن از پایگاه‌داده....</string>
+  <string name="about_export_db_result">نتیجه خروجی پایگاه‌داده: %s</string>
   <!--Notification-->
+  <string name="notification_ticker_text">OSMTracker در حال ضبط مسیر است</string>
+  <string name="notification_title">OSMTracker درحال ضبط مسیر (#{0}) است</string>
+  <string name="notification_text">برای نمایش صفحه اصلی اینجا را لمس کنید</string>
   <!--Display track-->
+  <string name="displaytrack">نمایش مسیر</string>
+  <string name="displaytrack_map">نمایش نقشه پس‌زمنیه</string>
+  <string name="displaytrack_north">N</string>
   <!--Track detail-->
   <string name="trackdetail_save">ذخیره</string>
   <!--Various-->
+  <string name="various_unit_meters">m</string>
   <string name="various_accuracy">دقت</string>
+  <string name="various_accuracy_with_sats">دقت {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <string name="various_waiting_gps_fix">در انتظار تثبیت GPS...‏ ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display">{0}°‎</string>
   <!--parameters: (heading in degrees)-->
+  <string name="various_heading">منتظر جهت حرکت...</string>
+  <string name="various_heading_unknown">سیستم قادر به تشخیص جهت حرکت نیست</string>
   <!--OSM map view-->
+  <string name="displaytrackmap">نمایش مسیر OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">به‌روزرسانی و نصب</string>
+  <string name="buttons_presets_context_menu_delete">حذف</string>
+  <string name="buttons_presets_updating_layout">در حال به‌روزآوری...</string>
+  <string name="buttons_presets_successful_update">به‌روزرسانی چیدمان با موفقیت انجام شد</string>
+  <string name="buttons_presets_unsuccessful_update">چیدمان به‌روز نشد، بعداً تلاش کنید</string>
+  <string name="buttons_presets_delete_message">آیا چیدمان {0} را حذف می‌کنید؟</string>
+  <string name="buttons_presets_delete_positive_confirmation">بله</string>
+  <string name="buttons_presets_successful_delete">فایل با موفقیت حذف شد</string>
+  <string name="buttons_presets_icon_directory_deleted">شاخه icon با موفقیت حذف شد</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">هیچ شاخه icon متناظر با این فایل وجود ندارد</string>
+  <string name="buttons_presets_unsuccessful_delete">این فایل را نمی‌توان پاک کرد</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">خطا: نمی‌توان به اینترنت متصل شد</string>
+  <string name="available_layouts_response_null_exception">خطا: نمی‌توان به مخزن پیشفرض برای چیدمان‌های سفارشی متصل شد</string>
+  <string name="available_layouts_connecting_message">(در حال اتصال...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">بارگیری</string>
+  <string name="available_layouts_not_available_language">زبان شما موجود نیست. یکی را از لیست انتخاب کنید</string>
+  <string name="available_layouts_language_dialog_title">زبان‌های موجود</string>
+  <string name="available_layouts_checking_language_dialog">در حال بررسی نسخه‌های زبان محلی</string>
+  <string name="available_layouts_downloading_dialog">در حال بارگیری...</string>
+  <string name="available_layouts_successful_download">چیدمان با موفقیت بارگیری شد</string>
+  <string name="available_layouts_unsuccessful_download">نمی‌توان چیدمان را بارگیری کرد. بعداً تلاش کنید</string>
+  <string name="available_layouts_null_response_received">خطا در بازیابی داده‌ها از سرور</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">پیشفرض</string>
+  <string name="github_repository_settings_custom_checkbox">سفارشی</string>
+  <string name="github_repository_settings_username">نام کاربری گیت‌هاب:</string>
+  <string name="github_repository_settings_repository_name">نام مخزن:</string>
+  <string name="github_repository_settings_branch_name">نام شاخه:</string>
+  <string name="github_repository_settings_valid_server">مخزن گیت‌هاب معتبر</string>
+  <string name="github_repository_settings_invalid_server">مخزن گیت‌هاب نامعتبر</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings-preferences.xml b/app/src/main/res/values-fi/strings-preferences.xml
index eec14d988..080a31efc 100644
--- a/app/src/main/res/values-fi/strings-preferences.xml
+++ b/app/src/main/res/values-fi/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Asetukset</string>
@@ -73,6 +73,16 @@
   <string name="prefs_osm_clear_oauth_data_dialog">Joudut antamaan OSMTrackerille uudestaan luvan jälkien lähettämiseen. Oletko varma?</string>
   <string name="prefs_map_tile">Kartan tarjoaja</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Pyöräilykartta</item>
+    <item>MapQuest Open</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>Ei lainkaan</item>
+    <item>Kommenttina</item>
+    <item>Tarkenteessa</item>
+  </string-array>
   <string name="prefs_compass_heading">Vie kompassin suunta</string>
   <string name="prefs_compass_heading_summary">Määrittää, viedäänkö ja millä tavoin kompassin tiedot GPX-tiedostoon</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b046035fb..f8407b7bc 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Etapit: </string>
   <string name="trackmgr_trackpoints_count">Reittipisteet: </string>
   <string name="trackmgr_empty">Ei reittejä.</string>
+  <string name="trackmgr_newtrack_hint">Tallentaaksesi reitini,\npaina <b>Valikko</b> <b>Uusi reitti</b></string>
   <string name="trackmgr_newtrack_error">Uuden reitin luonti ei onnistu: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Tallennat parhaillaan <b>reittiä #{0}</b>\nValitse se listasta jatkaaksesi</string>
   <string name="trackmgr_contextmenu_stop">Lopeta seuranta</string>
   <string name="trackmgr_contextmenu_resume">Jatka reitin tallentamista</string>
   <string name="trackmgr_contextmenu_delete">Poista</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Reitti #{0} poistetaan</string>
   <string name="trackmgr_deleteall_confirm">Kaikki reiti poistetaan. Oletko varma?</string>
   <string name="trackmgr_exporting">Tallennetaan reitti #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Valmistellaan viemistä…</string>
   <string name="trackmgr_export_error">Reittiä ei voitu tallentaa: {0}</string>
   <string name="trackmgr_exportall_confirm">Kaikki reitit viedään, mutta siinä saattaa kestää kauan. Haluatko jatkaa?</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">Lisätiedot, kuten dokumentit ja ongelmaraportointi, projektin verkkosivustolla:</string>
   <string name="about_translate_text">Auta kääntämään OSMTrackeria:</string>
   <string name="about_debug_info">Virheenjäljitys</string>
+  <string name="about_export_db">Vie tietokanta</string>
+  <string name="about_exporting_db">Viedään tietokantaa…</string>
+  <string name="about_export_db_result">Tietokannan viennin tulos: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker on edelleen päällä</string>
   <string name="notification_title">OSMTracker on edelleen päällä</string>
@@ -132,4 +138,7 @@
   <string name="various_heading_unknown">Suuntaa ei voi määrittää</string>
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap-reittinäyttö</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings-preferences.xml b/app/src/main/res/values-fr-rFR/strings-preferences.xml
index cc2bd985b..457a8a483 100644
--- a/app/src/main/res/values-fr-rFR/strings-preferences.xml
+++ b/app/src/main/res/values-fr-rFR/strings-preferences.xml
@@ -1,5 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
+  <string name="prefs">Paramètres</string>
+  <string name="prefs_gps">GPS</string>
+  <string name="prefs_gps_os_settings">Paramètres du GPS</string>
+  <string name="prefs_gps_os_settings_summary">Ecran du système d\'affichage des paramètres GPS</string>
+  <string name="prefs_check_gps_startup">Vérification GPS au démarrage</string>
+  <string name="prefs_check_gps_startup_summary">Vérifiez si le GPS est désactivé au démarrage , et permettre son activation</string>
+  <string name="prefs_gps_ignore_clock">Ignorez l\'horloge GPS</string>
+  <string name="prefs_gps_ignore_clock_summary">Ignorez l\'horloge GPS et utilisez l\'horloge ANdroid pour l\'horodatage </string>
+  <string name="prefs_gps_logging_interval">Intervalle de connection GPS</string>
+  <string name="prefs_gps_logging_interval_summary">Utilisez 0 pour le plus court possible (affecte la durée de vie de la batterie)</string>
+  <string name="prefs_gps_logging_interval_seconds">secondes</string>
+  <string name="prefs_ui">Interface de l\'utilisateur</string>
+  <string name="prefs_ui_picture_source">Source par défaut de la photo</string>
+  <string name="prefs_ui_picture_source_summary">Prendre une photo depuis l\'appareil photo ou dans la galerie</string>
+  <string-array name="prefs_ui_picture_source_keys">
+    <item>Appareil Photo</item>
+    <item>Galerie</item>
+    <item>Toujours demander</item>
+  </string-array>
+  <string name="prefs_ui_buttons_layout_defaut">Défaut</string>
+  <string name="prefs_ui_orientation">Orientation</string>
+  <string name="prefs_voicerec_duration_seconds">secondes</string>
+  <string name="prefs_display_always_on">Ecran toujours allumé</string>
+  <string name="prefs_output">Paramètres GPX</string>
+  <string name="prefs_sound_enabled">Activer les sons</string>
+  <string name="prefs_sound_enabled_summary">Jouer les sons lorsque l\'enregistrement vocal commence et se termine</string>
+  <string name="prefs_osm_clear_oauth_data">Réinitialiser l\'authentification OSM</string>
   <string name="prefs_map_tile_summary"></string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index f769800bd..ce178fde1 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -2,21 +2,42 @@
 <resources>
   <!--Generic strings-->
   <!--TrackLogger-->
+  <string name="tracklogger_voicerec_title">Enregistrement vocal</string>
+  <string name="tracklogger_voicerec_stop">Stop</string>
+  <string name="tracklogger_btnBack">Retour</string>
   <!--Waypoint List-->
   <!--Track Manager-->
+  <string name="trackmgr_contextmenu_delete">Effacer</string>
+  <string name="trackmgr_contextmenu_export">Exporter comme GPX</string>
+  <string name="trackmgr_contextmenu_display">Afficher</string>
+  <string name="trackmgr_contextmenu_details">Détails</string>
   <!--Track Detail-->
+  <string name="trackdetail_btn_export">Exporter comme GPX</string>
+  <string name="trackdetail_export_display">Afficher</string>
   <!--OSM upload-->
   <!--GPS Status & record bar-->
   <!--Menu-->
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_about">A Propos</string>
+  <string name="menu_save">Sauvegarder</string>
+  <string name="menu_cancel">Annuler</string>
+  <string name="menu_export">Exporter comme GPX</string>
   <!--Errors-->
   <!--GPX-->
   <!--About screen-->
+  <string name="about">A Propos</string>
+  <string name="about_export_db">Exporter la base de données</string>
+  <string name="about_exporting_db">Export en cours de la base de données...</string>
   <!--Notification-->
   <!--Display track-->
   <!--Track detail-->
+  <string name="trackdetail_save">Sauvegarder</string>
   <!--Various-->
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml
index 3e4868b44..dbe684853 100644
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Paramètres</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 94805ada5..ffe876f87 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Points d\'interêt :</string>
   <string name="trackmgr_trackpoints_count">Pts. de trace :</string>
   <string name="trackmgr_empty">Vous n\'avez pas de traces.</string>
+  <string name="trackmgr_newtrack_hint">Pour enregistrer une trace,\npressez <b>Menu</b> puis <b>Nouvelle trace</b></string>
   <string name="trackmgr_newtrack_error">Impossible de créer une nouvelle trace : {0}</string>
+  <string name="trackmgr_continuetrack_hint">Vous enregistrez en ce moment<b>la trace #{0}</b>\nChoisissez-la dans la liste pour continuer</string>
   <string name="trackmgr_contextmenu_stop">Arrêter l\'enregistrement</string>
   <string name="trackmgr_contextmenu_resume">Reprendre l\'enregistrement</string>
   <string name="trackmgr_contextmenu_delete">Supprimer</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">La trace #{0} sera supprimée.</string>
   <string name="trackmgr_deleteall_confirm">Toutes les traces seront supprimées. Êtes-vous sûr ?</string>
   <string name="trackmgr_exporting">Export de la trace #{0} en cours…</string>
+  <string name="trackmgr_exporting_prepare">Préparation de l\'export...</string>
   <string name="trackmgr_export_error">Impossible d\'exporter la trace : {0}</string>
   <string name="trackmgr_exportall_confirm">Toutes les traces vont être exportées, cela peut prendre du temps. Êtes-vous sûr ?</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">Pour plus d\'informations, documentation et bugs, veuillez visiter la page du projet :</string>
   <string name="about_translate_text">Aidez à traduire OSMTracker</string>
   <string name="about_debug_info">Info de débogage</string>
+  <string name="about_export_db">Export de la base de données</string>
+  <string name="about_exporting_db">Exportation de la base de données ...</string>
+  <string name="about_export_db_result">Résultat de l\'export de la base de données: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker est en cours d\'éxécution</string>
   <string name="notification_title">OSMTracker est en cours d\'éxécution</string>
@@ -132,4 +138,7 @@
   <string name="various_heading_unknown">Les coordonées n\'ont pas pu être déterminées</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Voir le tracé avec OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-gl/strings-preferences.xml b/app/src/main/res/values-gl/strings-preferences.xml
index e83b9b85f..a14796545 100644
--- a/app/src/main/res/values-gl/strings-preferences.xml
+++ b/app/src/main/res/values-gl/strings-preferences.xml
@@ -1,5 +1,88 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
+  <string name="prefs">Configuración</string>
+  <string name="prefs_gps">GPS</string>
+  <string name="prefs_gps_os_settings">Configuración do GPS</string>
+  <string name="prefs_gps_os_settings_summary">Amosar pantalla de configuración do sistema GPS</string>
+  <string name="prefs_check_gps_startup">Comprobar GPS no inicio</string>
+  <string name="prefs_check_gps_startup_summary">Comprobar se o GPS está desactivado ao iniciar, e preguntar se desexa activalo</string>
+  <string name="prefs_gps_ignore_clock">Ignorar o reloxo GPS</string>
+  <string name="prefs_gps_ignore_clock_summary">Ignorar o reloxo GPS e utilizar o reloxo Android como marcas de tempo</string>
+  <string name="prefs_gps_logging_interval">Intervalo de rexistro de GPS</string>
+  <string name="prefs_gps_logging_interval_summary">Utilice 0 para o máis breve posible (afecta á vida da batería)</string>
+  <string name="prefs_gps_logging_interval_seconds">segundos</string>
+  <string name="prefs_ui">Interface de usuario</string>
+  <string name="prefs_ui_picture_source">Fonte de fotos predeterminada</string>
+  <string name="prefs_ui_picture_source_summary">Tomar fotos dende a cámara ou a galería?</string>
+  <string-array name="prefs_ui_picture_source_keys">
+    <item>Cámara</item>
+    <item>Galería</item>
+    <item>Preguntar sempre</item>
+  </string-array>
+  <string name="prefs_ui_buttons_layout">Disposición dos botóns</string>
+  <string name="prefs_ui_buttons_layout_summary">Escolla unha disposición personalizada dos botóns (ver documentación)</string>
+  <string name="prefs_ui_buttons_layout_defaut">Predeterminada</string>
+  <string name="prefs_ui_orientation">Orientación</string>
+  <string name="prefs_ui_orientation_summary">Orientación preferida para a pantalla de botóns</string>
+  <string-array name="prefs_ui_orientation_options_keys">
+    <item>Automático</item>
+    <item>Vertical</item>
+    <item>Apaisado</item>
+  </string-array>
+  <string name="prefs_voicerec_duration">Duración da gravación de voz</string>
+  <string name="prefs_voicerec_duration_seconds">segundos</string>
+  <string name="prefs_theme">Tema da pantalla principal</string>
+  <string name="prefs_theme_summary">É preciso reiniciar a aplicación para que os cambios surtan efecto</string>
+  <string-array name="prefs_theme_keys">
+    <item>Predeterminado do SO</item>
+    <item>Predeterminado do SO (escuro)</item>
+    <item>SO por defecto (light)</item>
+    <item>Alto contraste</item>
+  </string-array>
+  <string name="prefs_display_always_on">Pantalla sempre activa</string>
+  <string name="prefs_display_always_on_summary">A pantalla permanecerá encendida mentres estea trazando. Desactivar para aforrar batería</string>
+  <string name="prefs_displaytrack_osm">Mapa de fondo</string>
+  <string name="prefs_displaytrack_osm_summary">Visualizar OpenStreetMap baixo a traza. Require unha conexión de datos</string>
+  <string name="prefs_displaytrack_osm_summary_ask">Amosar sempre fondo OpenStreetMap? Require unha conexión de datos.</string>
+  <string name="prefs_output">Configuracións GPX</string>
+  <string name="prefs_storage_dir">Cartafol de almacenamento externo (SD)</string>
+  <string name="prefs_storage_dir_hint">Actualizar á seguinte pista (non a actual)</string>
+  <string name="prefs_output_one_dir_per_track">Un cartafol por pista</string>
+  <string name="prefs_output_one_dir_per_track_summary">Gardar cada pista en arquivos asociados ao cartafol de seu</string>
+  <string name="prefs_output_filename">Arquivo para nome das pistas</string>
+  <string name="prefs_output_filename_summary">Patrón do nome de ficheiro se pista ten un nome</string>
+  <string-array name="prefs_output_filename_keys">
+    <item>Nome da pista</item>
+    <item>Nome, de inicio data e hora</item>
+    <item>Data de inicio e hora</item>
+  </string-array>
+  <string name="prefs_output_accuracy">Precisión no arquivo GPX</string>
+  <string name="prefs_output_accuracy_summary">Engadir información de precisión en arquivo GPX, co nome do punto de paso ou comentario en punto de paso</string>
+  <string-array name="prefs_output_accuracy_keys">
+    <item>Non</item>
+    <item>Con nome do punto de referencia</item>
+    <item>En comentario do punto de referencia</item>
+  </string-array>
+  <string name="prefs_output_gpx_hdop_approximation">Emprego aproximación HDOP </string>
+  <string name="prefs_output_gpx_hdop_approximation_summary">Encha HDOP en GPX cun valor de precisión aproximado</string>
+  <string name="prefs_sound_enabled">Habilitar o son</string>
+  <string name="prefs_sound_enabled_summary">Tocar sons cando a gravación de voz comeza e remata</string>
+  <string name="prefs_osm_clear_oauth_data">Resetear autentificación OSM</string>
+  <string name="prefs_osm_clear_oauth_data_summary">Esquecer credenciais OSM e permisos e forzar a OSMTracker a volver preguntar</string>
+  <string name="prefs_osm_clear_oauth_data_dialog">Vai ter que autorizar OSMTracker para cargar pistas de novo. Estás seguro?</string>
+  <string name="prefs_map_tile">Fornecedor de Mapa de Mosaico</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>Abrir MapQuest</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>Non</item>
+    <item>en comentario</item>
+    <item>en extensión</item>
+  </string-array>
+  <string name="prefs_compass_heading">Exportar Compás</string>
+  <string name="prefs_compass_heading_summary">Define se e como os datos do compás deben ser exportados ao arquivo GPX</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 62f87a92c..3e9c9f6a1 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,7 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Generic strings-->
+  <string name="app_name">OSMTracker para Android™</string>
   <string name="app_short_name">OSMTracker</string>
+  <string name="app_description">Inspirado por OSMTracker en Windows Mobile, permite que acompañe as súas viaxes, marcar puntos de forma significativa (gravación de voz, imaxes), exportalos en formato GPX para uso posterior con ferramentas Open Street Map como JOSM.</string>
   <!--TrackLogger-->
   <string name="tracklogger">Rexistro de rutas</string>
   <string name="tracklogger_waiting_gps">A agardar que funcione o GPS para activar os botóns...</string>
@@ -12,30 +14,131 @@
   <string name="tracklogger_tracked">Seguimento:</string>
   <string name="tracklogger_gps_disabled">GPS desactivado</string>
   <string name="tracklogger_gps_disabled_hint">O GPS está desactivado. Desexa activalo?</string>
+  <string name="tracklogger_choose_gallery_camera">Galería ou cámara?</string>
+  <string name="tracklogger_camera">Tirar foto con cámara</string>
+  <string name="tracklogger_gallery">Seleccionar foto da galería</string>
   <!--Waypoint List-->
+  <string name="wplist">Lita de punto de paso</string>
   <string name="wplist_latitude">Lista de paradas</string>
   <string name="wplist_longitude">Lat:</string>
   <string name="wplist_elevation">Ele:</string>
   <string name="wplist_accuracy">Prcs:</string>
+  <string name="wplist_compass">Comp. principal:</string>
+  <string name="wplist_compass_accuracy">Comp. precisión:</string>
   <!--Track Manager-->
   <string name="trackmgr">Xestor de rutas</string>
   <string name="trackmgr_tracklist">Lista de rutas:</string>
   <string name="trackmgr_waypoints_count">Paradas:</string>
   <string name="trackmgr_trackpoints_count">Puntos de ruta:</string>
   <string name="trackmgr_empty">Non tén ningunha ruta.</string>
+  <string name="trackmgr_newtrack_hint">Gravar pista,\npress <b>Menú</b> entón <b>Pista nova</b></string>
+  <string name="trackmgr_newtrack_error">Activar e crear unha nova pista: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Estás gravando a precisión <b>pista #{0}</b>\nChoose na lista para continuar</string>
+  <string name="trackmgr_contextmenu_stop">Deter seguimento</string>
+  <string name="trackmgr_contextmenu_resume">Resumo de seguimento</string>
+  <string name="trackmgr_contextmenu_delete">Borrar</string>
+  <string name="trackmgr_contextmenu_export">Exportar coma GPX</string>
+  <string name="trackmgr_contextmenu_osm_upload">Subir a OpenStreetMap</string>
+  <string name="trackmgr_contextmenu_display">Amosar</string>
+  <string name="trackmgr_contextmenu_details">Detalles</string>
+  <string name="trackmgr_contextmenu_title">Pista #{0}</string>
+  <string name="trackmgr_delete_confirm">Pista #{0} será borrada</string>
+  <string name="trackmgr_deleteall_confirm">Tódolas pistas serán borradas, Estás certo?</string>
+  <string name="trackmgr_exporting">Exportando pista #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Preparando exportación…</string>
+  <string name="trackmgr_export_error">Non se pode exportar pista: {0}</string>
+  <string name="trackmgr_exportall_confirm">Tádalas pistas serán exportadas, pode levar moito tempo. Estás certo?</string>
   <!--Track Detail-->
+  <string name="trackdetail">Detalles de Pistas</string>
+  <string name="trackdetail_startdate">Tempo de Inicio:</string>
+  <string name="trackdetail_enddate">Tempo Fin:</string>
+  <string name="trackdetail_startloc">Inicio a:</string>
+  <string name="trackdetail_endloc">Fin a:</string>
+  <string name="trackdetail_exportdate">Exportado:</string>
+  <string name="trackdetail_osm_upload_date">Subir a OpenStreetMap:</string>
+  <string name="trackdetail_btn_export">Exportar coma GPX</string>
+  <string name="trackdetail_export_notyet">(Non exportar aínda)</string>
+  <string name="trackdetail_osm_upload_notyet">(Non subir aínda)</string>
+  <string name="trackdetail_export_display">Amosar</string>
+  <string name="trackdetail_description">Descrición</string>
+  <string name="trackdetail_tags">Tags (separados por comas)</string>
+  <string name="trackdetail_description_mandatory">Debes dar unha descrición</string>
+  <string name="osm_visibility_private">Privado</string>
+  <string name="osm_visibility_public">Público</string>
+  <string name="osm_visibility_trackable">Trazable</string>
+  <string name="osm_visibility_identifiable">identificable</string>
   <!--OSM upload-->
+  <string name="osm_upload">Subido a OpenStreetMap</string>
+  <string name="osm_upload_ok">Gardar e subir</string>
+  <string name="osm_upload_tmpfile_failed">Non se pode exportar a pista a un arquivo temporal</string>
+  <string name="osm_upload_oauth_failed">Non se pode acceder a OSM</string>
+  <string name="osm_upload_sending">Enviando pista #{0}…</string>
+  <string name="osm_upload_waiting_response">Esperando por resposta do server OpenStreetMap...</string>
+  <string name="osm_upload_error">Erro cando subiu a pista</string>
+  <string name="osm_upload_bad_response">O server OSM devolve un erro: ({0}) mensaxe {1}</string>
+  <string name="osm_upload_unauthorized">Error de autorización. Queres limpar as credenciais gardadas en OpenStreetMap?</string>
+  <string name="osm_upload_sucess">Subido ben a OpenStreetMap</string>
   <!--GPS Status & record bar-->
+  <string name="gpsstatus_record_voicerec">Gravación de voz</string>
+  <string name="gpsstatus_record_stillimage">Tirar foto</string>
+  <string name="gpsstatus_record_textnote">Nota de texto</string>
   <!--Menu-->
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_waypointlist">Paradas</string>
+  <string name="menu_about">Desto</string>
+  <string name="menu_displaytrack">Amosar pistas</string>
+  <string name="menu_stoptracking">Parar &amp; gardar</string>
+  <string name="menu_newtrack">Nova pista</string>
+  <string name="menu_deletetracks">Borrar tódalas pistas</string>
+  <string name="menu_continue">Continuar pista</string>
+  <string name="menu_stopcurrenttrack">Deter pista actual</string>
+  <string name="menu_save">Gardar</string>
+  <string name="menu_cancel">Cancelar</string>
+  <string name="menu_export">Exportar coma GPX</string>
+  <string name="menu_osm_upload">Subido a OpenStreetMap</string>
+  <string name="menu_center_to_gps">Centro a GPS</string>
+  <string name="menu_exportall">Exportar todo como GPX</string>
   <!--Errors-->
+  <string name="error_externalstorage_not_writable">Imposible escribir para almacenamento externo.</string>
+  <string name="error_create_track_dir">Non se pode crear o cartafol ca pista %s</string>
+  <string name="error_externalstorage_not_writable_hint">Por favor, asegúrese de que o almacenamento ext. estea correctamente inserido e montado.</string>
+  <string name="error_voicerec_failed">A gravación de voz non vai</string>
+  <string name="error_userlayout_parsing">Erro ao analizar o ficheiro XML. Por favor volver ao nivel de capa por defecto.</string>
   <!--GPX-->
+  <string name="gpx_track_name">Tracked con OSMTracker para Android™</string>
+  <string name="gpx_hdop_approximation_cmt">Coidado: os valores HDOP non son de HDOP como retorno do dispositivo GPS. Están aproximados á precisión de localización en metros.</string>
   <!--About screen-->
+  <string name="about">Para</string>
+  <string name="about_text">Para máis información, documentos ou reportes impresos, por favor visita a páxina do proxecto:</string>
+  <string name="about_translate_text">Axuda na tradución de OSMTracker:</string>
+  <string name="about_debug_info">Información de erros</string>
+  <string name="about_export_db">Exportar base de datos</string>
+  <string name="about_exporting_db">Exportando base de datos...</string>
+  <string name="about_export_db_result">Base de datos exportada nun: %s</string>
   <!--Notification-->
+  <string name="notification_ticker_text">OSMTracker está enrutando</string>
+  <string name="notification_title">OSMTracker está enrutando (#{0})</string>
+  <string name="notification_text">Preme aquí para ver a pantalla de inicio</string>
   <!--Display track-->
+  <string name="displaytrack">Amosar pista</string>
+  <string name="displaytrack_map">Amosar mapa de fondo</string>
+  <string name="displaytrack_north">N</string>
   <!--Track detail-->
+  <string name="trackdetail_save">Gardar</string>
   <!--Various-->
+  <string name="various_unit_meters">m</string>
+  <string name="various_accuracy">Precisión</string>
+  <string name="various_accuracy_with_sats">Precisión {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <string name="various_waiting_gps_fix">Esperar por GPS fixo… ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
+  <string name="various_heading">Agarda por posición ...</string>
+  <string name="various_heading_unknown">A posición non pode ser determinada</string>
   <!--OSM map view-->
+  <string name="displaytrackmap">OpenStreetMap amosar pista</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-he/accessibility.xml b/app/src/main/res/values-he/accessibility.xml
new file mode 100644
index 000000000..77b4b81fa
--- /dev/null
+++ b/app/src/main/res/values-he/accessibility.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About screen-->
+  <string name="acc.osmtracker_logo">הלוגו של OSMTracker</string>
+  <!--Zoom in/out in map view-->
+  <string name="acc.zoom_in">הגדל</string>
+  <string name="acc.zoom_out">הקטן</string>
+  <!--GPS status bar-->
+  <string name="acc.sat_indicator">מד עוצמת אות לוויני</string>
+  <string name="acc.record_indicator">מד הקלטה בפעולה</string>
+  <!--Track list-->
+  <string name="acc.track_status">מד מצב מסלול</string>
+  <string name="acc.upload_status">מד מצב העלאה ל-OpenStreetMap</string>
+</resources>
diff --git a/app/src/main/res/values-he/strings-preferences.xml b/app/src/main/res/values-he/strings-preferences.xml
new file mode 100644
index 000000000..35b5ab5c0
--- /dev/null
+++ b/app/src/main/res/values-he/strings-preferences.xml
@@ -0,0 +1,88 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Preferences-->
+  <string name="prefs">הגדרות</string>
+  <string name="prefs_gps">ג\'י.פי.אס</string>
+  <string name="prefs_gps_os_settings">הגדרות ג\'י.פי.אס</string>
+  <string name="prefs_gps_os_settings_summary">הצג מסך הגדרות ג\'י.פי.אס של המערכת</string>
+  <string name="prefs_check_gps_startup">בדוק ג\'י.פי.אס בהפעלה</string>
+  <string name="prefs_check_gps_startup_summary">בדוק אם ג\'י.פי.אס כבוי בהפעלה, והצע להפעיל אותו</string>
+  <string name="prefs_gps_ignore_clock">התעלם משעון ג\'י.פי.אס</string>
+  <string name="prefs_gps_ignore_clock_summary">התעלם משעון ג\'י.פי.אס והשתמש בשעון מערכת האנדרואיד עבור חותמות זמן</string>
+  <string name="prefs_gps_logging_interval">מרווח רישום ג\'י.פי.אס</string>
+  <string name="prefs_gps_logging_interval_summary">השתמש ב- 0 עבור הקצר ביותר (משפיע על אורך חיי הסוללה)</string>
+  <string name="prefs_gps_logging_interval_seconds">שניות</string>
+  <string name="prefs_ui">ממשק משתמש</string>
+  <string name="prefs_ui_picture_source">מקור ברירת מחדל של תמונות</string>
+  <string name="prefs_ui_picture_source_summary">לקחת תמונה מהמצלמה או מהגלריה?</string>
+  <string-array name="prefs_ui_picture_source_keys">
+    <item>מצלמה</item>
+    <item>גלריה</item>
+    <item>שאל תמיד</item>
+  </string-array>
+  <string name="prefs_ui_buttons_layout">הגדרות לחצנים</string>
+  <string name="prefs_ui_buttons_layout_summary">בחר רשימת לחצנים מותאמת אישית (ראה תיעוד)</string>
+  <string name="prefs_ui_buttons_layout_defaut">ברירת מחדל</string>
+  <string name="prefs_ui_orientation">כיוון</string>
+  <string name="prefs_ui_orientation_summary">כיוון מועדף של המסך</string>
+  <string-array name="prefs_ui_orientation_options_keys">
+    <item>אוטומטי</item>
+    <item>לאורך</item>
+    <item>לרוחב</item>
+  </string-array>
+  <string name="prefs_voicerec_duration">אורך הקלטה קולית</string>
+  <string name="prefs_voicerec_duration_seconds">שניות</string>
+  <string name="prefs_theme">תבנית התצוגה של המסך הראשי</string>
+  <string name="prefs_theme_summary">אתחול האפליקציה נדרש על מנת לבצע את השינויים</string>
+  <string-array name="prefs_theme_keys">
+    <item>ברירת מחדל של מערכת ההפעלה</item>
+    <item>ברירת מחדל של מערכת ההפעלה (כהה)</item>
+    <item>ברירת מחדל של מערכת ההפעלה (בהיר)</item>
+    <item>ניגודיות גבוהה</item>
+  </string-array>
+  <string name="prefs_display_always_on">מסך דולק תמיד</string>
+  <string name="prefs_display_always_on_summary">המסך ישאר דולק בעת הקלטת מסלול. בטל כדי לחסוך בסוללה</string>
+  <string name="prefs_displaytrack_osm">מפת רקע</string>
+  <string name="prefs_displaytrack_osm_summary">הצג את מפת OpenStreetMap כרקע למסלול. דורש חיבור לאינטרנט</string>
+  <string name="prefs_displaytrack_osm_summary_ask">הצג תמיד את OpenStreetMap ברקע המסלול? דורש חיבור לאינטרנט.</string>
+  <string name="prefs_output">הגדרות GPX</string>
+  <string name="prefs_storage_dir">תיקיית אכסון חיצוני (SD)</string>
+  <string name="prefs_storage_dir_hint">יחל במסלול הבא (לא במסלול הנוכחי)</string>
+  <string name="prefs_output_one_dir_per_track">תיקייה אחת לכל מסלול</string>
+  <string name="prefs_output_one_dir_per_track_summary">שמור כל מסלול והקבצים הנלווים לו בתיקייה נפרדת</string>
+  <string name="prefs_output_filename">שם קובץ למסלולים בעלי שם</string>
+  <string name="prefs_output_filename_summary">תבנית לשם הקובץ, אם למסלול יש שם</string>
+  <string-array name="prefs_output_filename_keys">
+    <item>שם המסלול</item>
+    <item>שם, תאריך וזמן התחלה</item>
+    <item>תאריך וזמן התחלה</item>
+  </string-array>
+  <string name="prefs_output_accuracy">שמור את הדיוק בקובץ ה-GPX</string>
+  <string name="prefs_output_accuracy_summary">הוסף את הדיוק לקובץ ה-GPX בשם נקודת הציון או כהערה לנקודת הציון</string>
+  <string-array name="prefs_output_accuracy_keys">
+    <item>ללא שמירה</item>
+    <item>בשם נקודת הציון</item>
+    <item>כהערה לנקודת הציון</item>
+  </string-array>
+  <string name="prefs_output_gpx_hdop_approximation">השתמש בהערכת HDOP</string>
+  <string name="prefs_output_gpx_hdop_approximation_summary">קבע את ה HDOP בקובץ ה-GPX כהערכה שמבוססת על הדיוק</string>
+  <string name="prefs_sound_enabled">אפשר צלילים</string>
+  <string name="prefs_sound_enabled_summary">השמע צלילים בתחילת הקלטה ובסיומה</string>
+  <string name="prefs_osm_clear_oauth_data">איפוס אימות פרטי משתמש OSM</string>
+  <string name="prefs_osm_clear_oauth_data_summary">מחק את אימות פרטי משתמש OSM ואלץ את הכנסתם מחדש</string>
+  <string name="prefs_osm_clear_oauth_data_dialog">ידרש אימות מחדש כדי לשוב ולהעלות מסלולים. את/ה בטוח/ה?</string>
+  <string name="prefs_map_tile">מקור מפת הרקע</string>
+  <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>ללא שמירה</item>
+    <item>כהערה</item>
+    <item>כהרחבה</item>
+  </string-array>
+  <string name="prefs_compass_heading">שמירת כיוון המצפן</string>
+  <string name="prefs_compass_heading_summary">מגדיר האם וכיצד ישמר כיוון המצפן בקובץ ה-GPX</string>
+</resources>
diff --git a/app/src/main/res/values-he/strings-tags.xml b/app/src/main/res/values-he/strings-tags.xml
new file mode 100644
index 000000000..4a66d99ec
--- /dev/null
+++ b/app/src/main/res/values-he/strings-tags.xml
@@ -0,0 +1,103 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tag.misc">שונות</string>
+  <string name="tag.restriction">הגבלות</string>
+  <string name="tag.car">רכב</string>
+  <string name="tag.tourism">תיירות</string>
+  <string name="tag.amenity">נוחות</string>
+  <string name="tag.amenity_more">נוחות (+)</string>
+  <string name="tag.way">דרך</string>
+  <string name="tag.track">מסלול</string>
+  <string name="tag.landuse">שימוש בקרקע</string>
+  <string name="tag.misc_bus_stop">תחנת אוטובוס</string>
+  <string name="tag.misc_railway">פסי רכבת</string>
+  <string name="tag.misc_telephone">טלפון</string>
+  <string name="tag.misc_post_box">תיבת דואר</string>
+  <string name="tag.misc_atm">כספומט</string>
+  <string name="tag.misc_bollard">עמוד</string>
+  <string name="tag.misc_toilets">שירותים</string>
+  <string name="tag.misc_shelter">מקלט</string>
+  <string name="tag.misc_surveillance">מעקב</string>
+  <string name="tag.restriction_20">20 לכל היותר</string>
+  <string name="tag.restriction_30">30 לכל היותר</string>
+  <string name="tag.restriction_40">40 לכל היותר</string>
+  <string name="tag.restriction_50">50 לכל היותר</string>
+  <string name="tag.restriction_60">60 לכל היותר</string>
+  <string name="tag.restriction_70">70 לכל היותר</string>
+  <string name="tag.restriction_80">80 לכל היותר</string>
+  <string name="tag.restriction_90">90 לכל היותר</string>
+  <string name="tag.restriction_100">100 לכל היותר</string>
+  <string name="tag.restriction_110">110 לכל היותר</string>
+  <string name="tag.restriction_120">120 לכל היותר</string>
+  <string name="tag.restriction_130">130 לכל היותר</string>
+  <string name="tag.restriction_no_exit">אין יציאה</string>
+  <string name="tag.restriction_traffic_light">רמזור</string>
+  <string name="tag.restriction_one_way">חד סיטרי</string>
+  <string name="tag.car_fuel_station">תחנת דלק</string>
+  <string name="tag.car_parking">חניה</string>
+  <string name="tag.car_emergency_phone">טלפון חרום</string>
+  <string name="tag.car_turning_circle">מעגל תנועה</string>
+  <string name="tag.car_speed_camera">מצלמת מהירות</string>
+  <string name="tag.tourism_view_point">נקודת תצפית</string>
+  <string name="tag.tourism_information">מידע</string>
+  <string name="tag.tourism_picnic">חניון יום</string>
+  <string name="tag.tourism_attraction">אטרקציה</string>
+  <string name="tag.tourism_theme_park">פארק שעשועים</string>
+  <string name="tag.tourism_castle">טירה</string>
+  <string name="tag.tourism_monument">יד זיכרון</string>
+  <string name="tag.tourism_museum">מוזיאון</string>
+  <string name="tag.tourism_cinema">בית קולנוע</string>
+  <string name="tag.amenity_bench">ספסל</string>
+  <string name="tag.amenity_water">מים</string>
+  <string name="tag.amenity_pharmacy">בית מרקחת</string>
+  <string name="tag.amenity_shop">חנות</string>
+  <string name="tag.amenity_marina">מרינה</string>
+  <string name="tag.amenity_sport">ספורט</string>
+  <string name="tag.amenity_taxi">תחנת מונית</string>
+  <string name="tag.amenity_doctors">בית חולים,\nרופאים</string>
+  <string name="tag.amenity_recycling">מיחזור</string>
+  <string name="tag.amenity_place_of_worship">בית תפילה</string>
+  <string name="tag.amenity_post_office">דואר</string>
+  <string name="tag.amenity_library">ספריה</string>
+  <string name="tag.amenitymore_school">בית ספר</string>
+  <string name="tag.amenitymore_police">משטרה</string>
+  <string name="tag.amenitymore_fire_station">תחנת כיבוי אש</string>
+  <string name="tag.amenitymore_bank">בנק</string>
+  <string name="tag.amenitymore_playground">מגרש משחקים</string>
+  <string name="tag.amenitymore_pub">פאב</string>
+  <string name="tag.amenitymore_hotel">מלון</string>
+  <string name="tag.amenitymore_motel">מוטל</string>
+  <string name="tag.amenitymore_hostel">אכסניה</string>
+  <string name="tag.amenitymore_restaurant">מסעדה</string>
+  <string name="tag.amenitymore_fastfood">מזון מהיר</string>
+  <string name="tag.amenitymore_camp_site">חניון לילה</string>
+  <string name="tag.way_bridge">גשר</string>
+  <string name="tag.way_zebra_crossing">מעבר חציה</string>
+  <string name="tag.way_motorway">דרך מהירה</string>
+  <string name="tag.way_trunk">כביש בין-עירוני</string>
+  <string name="tag.way_primary">כביש ראשי</string>
+  <string name="tag.way_secondary">כביש משני</string>
+  <string name="tag.way_tertiary">כביש צדדי</string>
+  <string name="tag.way_residential">דרך עירונית</string>
+  <string name="tag.way_service">כביש שרות</string>
+  <string name="tag.track_track">מסלול</string>
+  <string name="tag.track_cycleway">דרך לאופניים</string>
+  <string name="tag.track_footway">דרך להולכי רגל</string>
+  <string name="tag.track_bridleway">דרך לסוסים</string>
+  <string name="tag.track_steps">מדרגות</string>
+  <string name="tag.track_living_street">מדרחוב</string>
+  <string name="tag.track_pedestrian">מדרכה</string>
+  <string name="tag.track_grade1">דרך עפר מצויינת</string>
+  <string name="tag.track_grade2">דרך לכל רכב</string>
+  <string name="tag.track_grade3">דרך לג\'יפים רכים</string>
+  <string name="tag.track_grade4">דרך לג\'יפים קשוחים</string>
+  <string name="tag.track_grade5">עבירות קשה</string>
+  <string name="tag.landuse_farm">חווה</string>
+  <string name="tag.landuse_landfill">מזבלה</string>
+  <string name="tag.landuse_basin">מאגר שטפונות</string>
+  <string name="tag.landuse_reservoir">מאגר מים</string>
+  <string name="tag.landuse_forest">יער</string>
+  <string name="tag.landuse_allotments">גינות ירק</string>
+  <string name="tag.landuse_cemetery">בית קברות</string>
+  <string name="tag.landuse_recreation_ground">מגרש ספורט</string>
+</resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
new file mode 100644
index 000000000..71fe9dec3
--- /dev/null
+++ b/app/src/main/res/values-he/strings.xml
@@ -0,0 +1,146 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Generic strings-->
+  <string name="app_name">OSMTracker עבור אנדרואיד</string>
+  <string name="app_short_name">OSMTracker</string>
+  <string name="app_description">בהשראת OSMTracker עבור Windows Mobile, האפליקציה מאפשרת לך לעקוב אחר מסלולים, לסמן נקודות עניין (באמצעות הקלטת קול ותמונות), ייצוא המידע בפורמט GPX לשימוש עתידי עם כלי Open Street Map כמו JOSM.</string>
+  <!--TrackLogger-->
+  <string name="tracklogger">תיעוד מסלול</string>
+  <string name="tracklogger_waiting_gps">ממתין למיקום ג\'י.פי.אס כדי לאפשר לחצנים</string>
+  <string name="tracklogger_voicerec_title">הקלטת קול</string>
+  <string name="tracklogger_voicerec_text">מקליט קטע קולי באורך {0} שניות.</string>
+  <string name="tracklogger_voicerec_stop">עצור</string>
+  <string name="tracklogger_btnBack">חזרה</string>
+  <string name="tracklogger_tracked">תועד:</string>
+  <string name="tracklogger_gps_disabled">ג\'י.פי.אס מבוטל</string>
+  <string name="tracklogger_gps_disabled_hint">ג\'י.פי.אס מבוטל. האם ברצונך לאפשר?</string>
+  <string name="tracklogger_choose_gallery_camera">גלריה או מצלמה?</string>
+  <string name="tracklogger_camera">צלם תמונה במצלמה</string>
+  <string name="tracklogger_gallery">בחר תמונה מהגלריה</string>
+  <!--Waypoint List-->
+  <string name="wplist">רשימת נקודות ציון</string>
+  <string name="wplist_latitude">קו רוחב:</string>
+  <string name="wplist_longitude">קו אורך:</string>
+  <string name="wplist_elevation">גובה:</string>
+  <string name="wplist_accuracy">דיוק:</string>
+  <string name="wplist_compass">כיוון מצפן:</string>
+  <string name="wplist_compass_accuracy">דיוק מצפן:</string>
+  <!--Track Manager-->
+  <string name="trackmgr">מנהל מסלולים</string>
+  <string name="trackmgr_tracklist">רשימת מסלולים:</string>
+  <string name="trackmgr_waypoints_count">נקודות ציון:</string>
+  <string name="trackmgr_trackpoints_count">נקודות מסלול:</string>
+  <string name="trackmgr_empty">אין לך מסלולים</string>
+  <string name="trackmgr_newtrack_hint">על מנת להקליט מסלול,\n
+לחץ <b>תפריט</b> ואז <b>מסלול חדש</b></string>
+  <string name="trackmgr_newtrack_error">לא ניתן ליצור מסלול חדש: {0}</string>
+  <string name="trackmgr_continuetrack_hint">הנך מקליט כרגע <b> מסלול מספר {0}</b>\n
+בחר אותו מהרשימה כדי להמשיך</string>
+  <string name="trackmgr_contextmenu_stop">עצור מסלול</string>
+  <string name="trackmgr_contextmenu_resume">חזור למסלול</string>
+  <string name="trackmgr_contextmenu_delete">מחק</string>
+  <string name="trackmgr_contextmenu_export">ייצא כקובץ GPX</string>
+  <string name="trackmgr_contextmenu_osm_upload">העלאה ל OpenStreetMap</string>
+  <string name="trackmgr_contextmenu_display">הצג</string>
+  <string name="trackmgr_contextmenu_details">פרטים</string>
+  <string name="trackmgr_contextmenu_title">הקלטה מס. {0}</string>
+  <string name="trackmgr_delete_confirm">הקלטה מס. {0} תימחק</string>
+  <string name="trackmgr_deleteall_confirm">כל ההקלטות תמחקנה. להמשיך?</string>
+  <string name="trackmgr_exporting">מייצא את הקלטה {0}...</string>
+  <string name="trackmgr_exporting_prepare">מתכונן ליצוא...</string>
+  <string name="trackmgr_export_error">יצוא של הקלטה {0} נכשל...</string>
+  <string name="trackmgr_exportall_confirm">כל ההקלטות ייוצאו, דבר שעשוי לארוך זמן רב. להמשיך?</string>
+  <!--Track Detail-->
+  <string name="trackdetail">פרטי ההקלטה</string>
+  <string name="trackdetail_startdate">זמן התחלה:</string>
+  <string name="trackdetail_enddate">זמן סיום:</string>
+  <string name="trackdetail_startloc">נקודת התחלה:</string>
+  <string name="trackdetail_endloc">נקודת סיום:</string>
+  <string name="trackdetail_exportdate">יצוא:</string>
+  <string name="trackdetail_osm_upload_date">העלאה ל OpenStreetMap:</string>
+  <string name="trackdetail_btn_export">ייצא כקובץ GPX</string>
+  <string name="trackdetail_export_notyet">לא בוצע עדיין</string>
+  <string name="trackdetail_osm_upload_notyet">לא נשלח עדיין</string>
+  <string name="trackdetail_export_display">הצג</string>
+  <string name="trackdetail_description">תיאור</string>
+  <string name="trackdetail_tags">תגיות (מופרדות בפסיקים)</string>
+  <string name="trackdetail_description_mandatory">חובה למלא את התיאור</string>
+  <string name="osm_visibility_private">פרטי (Private)</string>
+  <string name="osm_visibility_public">פומבי (Public)</string>
+  <string name="osm_visibility_trackable">ניתן לעקיבה (Trackable)</string>
+  <string name="osm_visibility_identifiable">ניתן לזיהוי (Identifiable)</string>
+  <!--OSM upload-->
+  <string name="osm_upload">העלאה ל OpenStreetMap</string>
+  <string name="osm_upload_ok">שמירה והעלאה</string>
+  <string name="osm_upload_tmpfile_failed">לא ניתן לייצא את ההקלטה לקובץ זמני</string>
+  <string name="osm_upload_oauth_failed">לא ניתן לאמת את משתמש OSM</string>
+  <string name="osm_upload_sending">שולח האת הקלטה מס. {0}...</string>
+  <string name="osm_upload_waiting_response">ממתין לתשובת שרת OpenStreetMap...</string>
+  <string name="osm_upload_error">תקלה בזמן העלאת ההקלטה</string>
+  <string name="osm_upload_bad_response">שרת OSM החזיר שגיאה: ({0}) הודעה {1}</string>
+  <string name="osm_upload_unauthorized">שגיאת אימות. האם למחוק את האישורים הקיימים מ OpenStreetMap?</string>
+  <string name="osm_upload_sucess">העלאת המסלול ל OpenStreetMap הסתיימה בהצלחה</string>
+  <!--GPS Status & record bar-->
+  <string name="gpsstatus_record_voicerec">הקלטת הודעה קולית</string>
+  <string name="gpsstatus_record_stillimage">צילום תמונה</string>
+  <string name="gpsstatus_record_textnote">הערה בכתב</string>
+  <!--Menu-->
+  <string name="menu_settings">הגדרות</string>
+  <string name="menu_waypointlist">נקודות עיניין</string>
+  <string name="menu_about">אודות</string>
+  <string name="menu_displaytrack">הצגת הקלטה</string>
+  <string name="menu_stoptracking">עצור ושמור</string>
+  <string name="menu_newtrack">הקלטה חדשה</string>
+  <string name="menu_deletetracks">מחק את כל ההקלטות</string>
+  <string name="menu_continue">המשך הקלטה</string>
+  <string name="menu_stopcurrenttrack">עצור הקלטה</string>
+  <string name="menu_save">שמור</string>
+  <string name="menu_cancel">ביטול</string>
+  <string name="menu_export">ייצא כקובץ GPX</string>
+  <string name="menu_osm_upload">העלעה ל OpenStreetMap</string>
+  <string name="menu_center_to_gps">מרכז למיקום ה GPS</string>
+  <string name="menu_exportall">יצא הכל כ GPX</string>
+  <!--Errors-->
+  <string name="error_externalstorage_not_writable">לא ניתן לכתוב להתקן הזיכרון החיצוני</string>
+  <string name="error_create_track_dir">לא ניתן ליצור תיקיית הקלטות %s</string>
+  <string name="error_externalstorage_not_writable_hint">בדקו אם התקן הזיכרון החיצוני הוכנס כראוי והתחבר</string>
+  <string name="error_voicerec_failed">ההקלטה הקולית נכשלה</string>
+  <string name="error_userlayout_parsing">שגיאה בניתוח קובץ ה XML של העימוד. נא לחזור לעימוד המקורי</string>
+  <!--GPX-->
+  <string name="gpx_track_name"> Tracked with OSMTracker for Android™</string>
+  <string name="gpx_hdop_approximation_cmt">אזהרה: ערכי HDOP לא התקבלו מה GPS אלא הוערכו על פי דיוק המיקום במטרים.</string>
+  <!--About screen-->
+  <string name="about">אודות</string>
+  <string name="about_text">למידע נוסף, תיעוד ודיווח על תקלות, אנא בקרו באתר הבית של הפרוייקט:</string>
+  <string name="about_translate_text">עיזרו לתרגם את OSMTracker:</string>
+  <string name="about_debug_info">מידע לניפוי שגיאות</string>
+  <string name="about_export_db">ייצא את מסד הנתונים</string>
+  <string name="about_exporting_db">מייצא את מסד הנתונים...</string>
+  <string name="about_export_db_result">תוצאת יצוא מסד הנתונים: %s</string>
+  <!--Notification-->
+  <string name="notification_ticker_text">OSMTracker מקליט</string>
+  <string name="notification_title">OSMTracket מקליט ({0})</string>
+  <string name="notification_text">לחצו כאן להצגת המסך הראשי</string>
+  <!--Display track-->
+  <string name="displaytrack">הצגת ההקלטה</string>
+  <string name="displaytrack_map">הצגת מפת רקע</string>
+  <string name="displaytrack_north">צפון</string>
+  <!--Track detail-->
+  <string name="trackdetail_save">שמירה</string>
+  <!--Various-->
+  <string name="various_unit_meters">מטר</string>
+  <string name="various_accuracy">דיוק</string>
+  <string name="various_accuracy_with_sats">דיוק {0}{1} ({2}/{3})</string>
+  <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <string name="various_waiting_gps_fix">ממתין למיקום GPS... ({0}/{1})</string>
+  <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display"> {0}°</string>
+  <!--parameters: (heading in degrees)-->
+  <string name="various_heading">ממתין לכיוון...</string>
+  <string name="various_heading_unknown">לא ניתן לקבוע את הכיוון</string>
+  <!--OSM map view-->
+  <string name="displaytrackmap">הצגת הקלטת OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
+</resources>
diff --git a/app/src/main/res/values-he/waypoints.xml b/app/src/main/res/values-he/waypoints.xml
new file mode 100644
index 000000000..b9e84658e
--- /dev/null
+++ b/app/src/main/res/values-he/waypoints.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="wpt_voicerec">הקלטת קול</string>
+  <string name="wpt_stillimage">תמונה</string>
+</resources>
diff --git a/app/src/main/res/values-hr/strings-preferences.xml b/app/src/main/res/values-hr/strings-preferences.xml
index 6afb62ddd..9ebab95f3 100644
--- a/app/src/main/res/values-hr/strings-preferences.xml
+++ b/app/src/main/res/values-hr/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Postavke</string>
@@ -6,6 +6,74 @@
   <string name="prefs_gps_os_settings">GPS postavke</string>
   <string name="prefs_gps_os_settings_summary">Prikaži zaslon s GPS postavkama</string>
   <string name="prefs_check_gps_startup">Provjeri GPS pri pokretanju</string>
+  <string name="prefs_check_gps_startup_summary">Provjerava je li GPS je onemogućen pri pokretanju i nudi uključivanje </string>
   <string name="prefs_gps_ignore_clock">Zanemari GPS sat</string>
+  <string name="prefs_gps_ignore_clock_summary">Ignoriraj GPS sat i koristi Android sat za vremenske oznake</string>
+  <string name="prefs_gps_logging_interval">Interval GPS bilježenja</string>
+  <string name="prefs_gps_logging_interval_summary">Koristite 0 za najkraći mogući (utječe na trajanje baterije)</string>
+  <string name="prefs_gps_logging_interval_seconds">sekundi</string>
+  <string name="prefs_ui">Korisničko sučelje</string>
+  <string name="prefs_ui_picture_source">Zadani izvor fotografija</string>
+  <string name="prefs_ui_picture_source_summary">Iskoristite fotografije iz fotoaparata ili galerije?</string>
+  <string-array name="prefs_ui_picture_source_keys">
+    <item>Fotoaparat</item>
+    <item>Galerija</item>
+    <item>Uvijek pitaj</item>
+  </string-array>
+  <string name="prefs_ui_buttons_layout_defaut">Zadano</string>
+  <string name="prefs_ui_orientation">Orijentacija</string>
+  <string-array name="prefs_ui_orientation_options_keys">
+    <item>Automatski</item>
+    <item>Portret</item>
+    <item>Pejzaž</item>
+  </string-array>
+  <string name="prefs_voicerec_duration">Trajanje glasovnog zapisa</string>
+  <string name="prefs_voicerec_duration_seconds">sekundi</string>
+  <string name="prefs_theme">Tema glavnog zaslona</string>
+  <string name="prefs_theme_summary">Potrebno je ponovno pokrenuti aplikaciju kako bi nastupile promjene</string>
+  <string-array name="prefs_theme_keys">
+    <item>OS zadano</item>
+    <item>OS zadano (tamno)</item>
+    <item>OS zadano (svijetlo)</item>
+    <item>Visoki kontrast</item>
+  </string-array>
+  <string name="prefs_display_always_on">Zaslon uvijek uključen</string>
+  <string name="prefs_display_always_on_summary">Zaslon će ostati uključen za vrijeme bilježenja. Isključite da biste uštedjeli bateriju</string>
+  <string name="prefs_displaytrack_osm">Pozadinska karta</string>
+  <string name="prefs_displaytrack_osm_summary">Prikaži OpenStreetMap kartu ispod traga. Zahtjeva internet vezu</string>
+  <string name="prefs_displaytrack_osm_summary_ask">Uvijek prikaži OpenStreetMap pozadinu? Zahtijeva internet vezu.</string>
+  <string name="prefs_output">GPX postavke</string>
+  <string name="prefs_storage_dir">Memorijska kartica (SD) mapa</string>
+  <string name="prefs_storage_dir_hint">Primijeniti će se na sljedeći zapis (ne na trenutni)</string>
+  <string name="prefs_output_one_dir_per_track">Jedna mapa po zapisu</string>
+  <string name="prefs_output_one_dir_per_track_summary">Spremite svaki zapis i povezane datoteke na svoju mapu</string>
+  <string name="prefs_output_filename">Ime za naziv zapisa</string>
+  <string name="prefs_output_filename_summary">Uzorak za datoteke, ako zapis ima ime</string>
+  <string-array name="prefs_output_filename_keys">
+    <item>Naziv zapisa</item>
+    <item>Ime, datum početka i vrijeme</item>
+    <item>Datum i vrijeme</item>
+  </string-array>
+  <string name="prefs_output_accuracy">GPX preciznost</string>
+  <string name="prefs_output_accuracy_summary">Dodaj informacije o točnosti u GPX datoteci, s nazivom međutočke ili u komentaru međutočke</string>
+  <string-array name="prefs_output_accuracy_keys">
+    <item>Ništa</item>
+    <item>S nazivom međutočke</item>
+    <item>U komentaru međutočke</item>
+  </string-array>
+  <string name="prefs_sound_enabled">Uključi zvuk</string>
+  <string name="prefs_sound_enabled_summary">Zvučna obavijest kada kada snimanje glasa počinje i završava</string>
+  <string name="prefs_osm_clear_oauth_data">Reset OSM provjere autentičnosti</string>
+  <string name="prefs_map_tile">Pružatelj karte</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>Ništa</item>
+    <item>u komentaru</item>
+    <item>u produžetku</item>
+  </string-array>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index f47be46f7..3a0e243ba 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -4,9 +4,27 @@
   <string name="app_name">OSMTracker for Android™</string>
   <string name="app_short_name">OSMTracker</string>
   <!--TrackLogger-->
+  <string name="tracklogger_voicerec_title">Glasovni zapis</string>
+  <string name="tracklogger_voicerec_text">Snimanje {0}s zvučnog zapisa.</string>
+  <string name="tracklogger_voicerec_stop">Zaustavi</string>
+  <string name="tracklogger_btnBack">Natrag</string>
+  <string name="tracklogger_gps_disabled">GPS isključen</string>
+  <string name="tracklogger_gps_disabled_hint">GPS je isključen. Želite li ga uključiti?</string>
+  <string name="tracklogger_choose_gallery_camera">Galerija ili fotoaparat?</string>
+  <string name="tracklogger_camera">Uslikaj fotografiju</string>
+  <string name="tracklogger_gallery">Odaberite fotografiju iz galerije</string>
   <!--Waypoint List-->
+  <string name="wplist">Popis međutočaka</string>
   <!--Track Manager-->
+  <string name="trackmgr_contextmenu_delete">Izbrisati</string>
+  <string name="trackmgr_contextmenu_export">Izvezi kao GPX</string>
+  <string name="trackmgr_contextmenu_details">Detalji</string>
+  <string name="trackmgr_contextmenu_title">Staza #{0}</string>
+  <string name="trackmgr_delete_confirm">Staza #{0} bit će izbrisana</string>
+  <string name="trackmgr_deleteall_confirm">Sve staze će biti izbrisane. Jesi li sigurani?</string>
   <!--Track Detail-->
+  <string name="trackdetail_startdate">Vrijeme početka:</string>
+  <string name="trackdetail_enddate">Vrijeme završetka:</string>
   <!--OSM upload-->
   <!--GPS Status & record bar-->
   <!--Menu-->
@@ -21,4 +39,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-hu/strings-preferences.xml b/app/src/main/res/values-hu/strings-preferences.xml
index c9239dedc..a3c0184bd 100644
--- a/app/src/main/res/values-hu/strings-preferences.xml
+++ b/app/src/main/res/values-hu/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Beállítások</string>
@@ -18,13 +18,13 @@
   <string-array name="prefs_ui_picture_source_keys">
     <item>Kamera</item>
     <item>Galéria</item>
-    <item>Mindig kérdez</item>
+    <item>Mindig kérdezzen rá</item>
   </string-array>
-  <string name="prefs_ui_buttons_layout">Gomb alapértelmezések</string>
-  <string name="prefs_ui_buttons_layout_summary">Válasszon egy egyedi nyomógomb készletet (lásd dokumentáció)</string>
+  <string name="prefs_ui_buttons_layout">Gomb-előbeállítások</string>
+  <string name="prefs_ui_buttons_layout_summary">Válasszon egy egyedi gombkészletet (lásd dokumentáció)</string>
   <string name="prefs_ui_buttons_layout_defaut">Alapértelmezett</string>
   <string name="prefs_ui_orientation">Tájolás</string>
-  <string name="prefs_ui_orientation_summary">Az előnyben részesített tájolás a gombos képernyőhöz</string>
+  <string name="prefs_ui_orientation_summary">Előnyben részesített tájolás a gombos képernyőhöz</string>
   <string-array name="prefs_ui_orientation_options_keys">
     <item>Automatikus</item>
     <item>Álló</item>
@@ -32,8 +32,8 @@
   </string-array>
   <string name="prefs_voicerec_duration">Hangrögzítés hosszúsága</string>
   <string name="prefs_voicerec_duration_seconds">másodperc</string>
-  <string name="prefs_theme">Fő képernyő grafikus téma</string>
-  <string name="prefs_theme_summary">Az alkalmazás újraindítása szükséges a változások érvénybe lépéséhez</string>
+  <string name="prefs_theme">Főképernyő grafikus témája</string>
+  <string name="prefs_theme_summary">A változások érvénybe lépéséhez újra kell indítani az alkalmazást</string>
   <string-array name="prefs_theme_keys">
     <item>Rendszer alapértelmezett</item>
     <item>Rendszer alapértelmezett (sötét)</item>
@@ -42,7 +42,7 @@
   </string-array>
   <string name="prefs_display_always_on">Képernyő mindig bekapcsolva</string>
   <string name="prefs_display_always_on_summary">A képernyő bekapcsolva marad nyomkövetéskor. Kapcsolja ki az akku jobb üzemidejéhez</string>
-  <string name="prefs_displaytrack_osm">Háttér térkép</string>
+  <string name="prefs_displaytrack_osm">Háttértérkép</string>
   <string name="prefs_displaytrack_osm_summary">Az OpenStreetMap megjelenítése a nyomkövetés alatt. Adatkapcsolatot igényel</string>
   <string name="prefs_displaytrack_osm_summary_ask">Az OpenStreetMap háttér megjelenítése mindig? Adatkapcsolatot igényel.</string>
   <string name="prefs_output">GPX beállítások</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 17d0f24c0..c4f01d374 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -5,10 +5,10 @@
   <string name="app_short_name">OSMTracker</string>
   <string name="app_description">A Windows Mobile-on elérhető OSMTracker inspirálta, amely lehetővé teszi utazásai követését, megjelölésés fontos pontokkal (hangrögzítés, fényképek) exportálhatja GPX formában a későbbi olyan Open Street Map eszközökkel történő használathoz, mint például a JOSM.</string>
   <!--TrackLogger-->
-  <string name="tracklogger">Nyomvonal rögzítő</string>
-  <string name="tracklogger_waiting_gps">Várakozás a GPS beállására a gombok engedélyezéséhez...</string>
+  <string name="tracklogger">Nyomvonalrögzítő</string>
+  <string name="tracklogger_waiting_gps">Várakozás a GPS beállására a gombok engedélyezéséhez…</string>
   <string name="tracklogger_voicerec_title">Hangrögzítés</string>
-  <string name="tracklogger_voicerec_text">{0} mp hangfájl rögzítése.</string>
+  <string name="tracklogger_voicerec_text">{0} másodperces hangfájl rögzítése.</string>
   <string name="tracklogger_voicerec_stop">Leállítás</string>
   <string name="tracklogger_btnBack">Vissza</string>
   <string name="tracklogger_tracked">Rögzítve:</string>
@@ -18,49 +18,52 @@
   <string name="tracklogger_camera">Fénykép készítése a kamerával</string>
   <string name="tracklogger_gallery">Fénykép kiválasztása galériából</string>
   <!--Waypoint List-->
-  <string name="wplist">Útpont lista</string>
-  <string name="wplist_latitude">Szél:</string>
-  <string name="wplist_longitude">Hossz:</string>
-  <string name="wplist_elevation">Mag:</string>
-  <string name="wplist_accuracy">Pontos:</string>
-  <string name="wplist_compass">Irányt. állás:</string>
-  <string name="wplist_compass_accuracy">Irányt. pontosság:</string>
+  <string name="wplist">Útpontlista</string>
+  <string name="wplist_latitude">Szél.:</string>
+  <string name="wplist_longitude">Hossz.:</string>
+  <string name="wplist_elevation">Mag.:</string>
+  <string name="wplist_accuracy">Pontosság:</string>
+  <string name="wplist_compass">Iránytű állása:</string>
+  <string name="wplist_compass_accuracy">Iránytű pontossága:</string>
   <!--Track Manager-->
-  <string name="trackmgr">Nyomvonal kezelő</string>
-  <string name="trackmgr_tracklist">Nyomvonal lista:</string>
+  <string name="trackmgr">Nyomvonalkezelő</string>
+  <string name="trackmgr_tracklist">Nyomvonallista:</string>
   <string name="trackmgr_waypoints_count">Útpontok:</string>
   <string name="trackmgr_trackpoints_count">Nyompontok:</string>
   <string name="trackmgr_empty">Nincs egyetlen nyomvonala sem.</string>
+  <string name="trackmgr_newtrack_hint">Új nyomvonal rögzítéséhez,\nnyomja meg a <b>Menü</b>t, majd válassza az <b>Új nyomvonal</b>at</string>
   <string name="trackmgr_newtrack_error">Nem sikerült új nyomvonalat létrehozni: {0}</string>
-  <string name="trackmgr_contextmenu_stop">Nyomkövetés leállítása</string>
-  <string name="trackmgr_contextmenu_resume">Nyomkövetés folytatása</string>
+  <string name="trackmgr_continuetrack_hint">Jelenleg a <b>#{0}.nyomvonalat</b> rögzíti\nVálasszon a listáról a folytatáshoz.</string>
+  <string name="trackmgr_contextmenu_stop">Nyomvonalkészítés leállítása</string>
+  <string name="trackmgr_contextmenu_resume">Nyomvonalkészítés folytatása</string>
   <string name="trackmgr_contextmenu_delete">Törlés</string>
   <string name="trackmgr_contextmenu_export">Exportálás GPX fájlként</string>
   <string name="trackmgr_contextmenu_osm_upload">Feltöltés az OpenStreetMapre</string>
   <string name="trackmgr_contextmenu_display">Megjelenítés</string>
   <string name="trackmgr_contextmenu_details">Részletek</string>
   <string name="trackmgr_contextmenu_title">{0}. nyomvonal </string>
-  <string name="trackmgr_delete_confirm"> {0}. nyomvonal törlésre kerül</string>
+  <string name="trackmgr_delete_confirm"> {0}. nyomvonal törlődik</string>
   <string name="trackmgr_deleteall_confirm">Minden nyomvonal törlésre kerül. Biztosan ezt akarja?</string>
   <string name="trackmgr_exporting">{0}. nyomvonal exportálása…</string>
+  <string name="trackmgr_exporting_prepare">Exportálás előkészítése</string>
   <string name="trackmgr_export_error">{0}. nyomvonal exportálása sikertelen</string>
-  <string name="trackmgr_exportall_confirm">Minden nyomvonal exportálásra kerül, ami sokáig tarthat. Biztosan ezt akarja?</string>
+  <string name="trackmgr_exportall_confirm">Minden nyomvonal exportáltatik, ami sokáig tarthat. Biztosan ezt akarja?</string>
   <!--Track Detail-->
-  <string name="trackdetail">Nyomvonal részletek</string>
+  <string name="trackdetail">Nyomvonal részletei</string>
   <string name="trackdetail_startdate">Kezdési időpont:</string>
-  <string name="trackdetail_enddate">Befejezés ideje:</string>
+  <string name="trackdetail_enddate">Befejezési időpont:</string>
   <string name="trackdetail_startloc">Kezdőpont:</string>
   <string name="trackdetail_endloc">Végpont:</string>
   <string name="trackdetail_exportdate">Exportálva:</string>
   <string name="trackdetail_osm_upload_date">Feltöltve az OpenStreetMapre:</string>
   <string name="trackdetail_btn_export">Exportálás GPX fájlként</string>
-  <string name="trackdetail_export_notyet">(Még nem exportált)</string>
-  <string name="trackdetail_osm_upload_notyet">(Még nem volt feltöltve)</string>
+  <string name="trackdetail_export_notyet">(Még nincs exportálva)</string>
+  <string name="trackdetail_osm_upload_notyet">(Még nincs feltöltve)</string>
   <string name="trackdetail_export_display">Megjelenítés</string>
   <string name="trackdetail_description">Leírás</string>
   <string name="trackdetail_tags">Címkék (vesszővel elválasztva)</string>
   <string name="trackdetail_description_mandatory">Meg kell adnia egy leírást</string>
-  <string name="osm_visibility_private">Privát</string>
+  <string name="osm_visibility_private">Magántulajdon</string>
   <string name="osm_visibility_public">Publikus</string>
   <string name="osm_visibility_trackable">Követhető</string>
   <string name="osm_visibility_identifiable">Azonosítható</string>
@@ -70,7 +73,7 @@
   <string name="osm_upload_tmpfile_failed">A nyomvonal exportálása az átmeneti fájlba nem sikerült</string>
   <string name="osm_upload_oauth_failed">Az OSM bejelentkezés nem sikerült</string>
   <string name="osm_upload_sending">{0}. nyomvonal küldése…</string>
-  <string name="osm_upload_waiting_response">Várakozás az OpenStreetMap szerver válaszára…</string>
+  <string name="osm_upload_waiting_response">Várakozás az OpenStreetMap-szerver válaszára…</string>
   <string name="osm_upload_error">Hiba a nyomvonal feltöltése közben</string>
   <string name="osm_upload_bad_response">Az OSM szerver hibával tért vissza: ({0}) üzenet {1}</string>
   <string name="osm_upload_unauthorized">Bejelentkezési hiba. Szeretné törölni a mentett OpenStreetMap bejelentkezési információkat?</string>
@@ -97,10 +100,10 @@
   <string name="menu_exportall">Minden exportálása GPX fájlba</string>
   <!--Errors-->
   <string name="error_externalstorage_not_writable">A külső tárolóra írás nem sikerült.</string>
-  <string name="error_create_track_dir">%s nyomvonal mappa létrehozása sikertelen</string>
-  <string name="error_externalstorage_not_writable_hint">Kérem ellenőrizze, hogy a külső tároló csatlakoztatását.</string>
+  <string name="error_create_track_dir">%s nyomvonalmappa létrehozása sikertelen</string>
+  <string name="error_externalstorage_not_writable_hint">Kérem ellenőrizze a külső tároló csatlakoztatását.</string>
   <string name="error_voicerec_failed">Hangrögzítés sikertelen</string>
-  <string name="error_userlayout_parsing">Hiba az XML séma fájl értelmezésekor. Kérjük térjen vissza az alapértelmezett sémához.</string>
+  <string name="error_userlayout_parsing">Hiba az XML sémafájl értelmezésekor. Kérjük térjen vissza az alapértelmezett sémához.</string>
   <!--GPX-->
   <string name="gpx_track_name">Tracked with OSMTracker for Android™</string>
   <string name="gpx_hdop_approximation_cmt">Figyelem: A HDOP értékek nem azok a HDOP értékek, amit a GPS eszköz ad vissza. Ezek becsült értékek a hely pontosságából, méterben.</string>
@@ -109,6 +112,9 @@
   <string name="about_text">További információkért, dokumentációért és hibabejelentésért, kérjük tekintse meg a projekt honlapját:</string>
   <string name="about_translate_text">Segítsen az OSMTracker fordításában:</string>
   <string name="about_debug_info">Hibakeresési információ</string>
+  <string name="about_export_db">Adatbázis exportálása</string>
+  <string name="about_exporting_db">Adatbázis exportálása folyamatban</string>
+  <string name="about_export_db_result">Adatbázis exportálás eredménye: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">Az OSMTracker rögzít</string>
   <string name="notification_title">Az OSMTracker rögzít ({0}.)</string>
@@ -124,12 +130,15 @@
   <string name="various_accuracy">Pontosság</string>
   <string name="various_accuracy_with_sats">Pontosság {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">GPS javításra vár... ({0}/{1})</string>
+  <string name="various_waiting_gps_fix">GPS javításra vár ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
   <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
-  <string name="various_heading">Várakozás az irányra...</string>
+  <string name="various_heading">Várakozás az irányra</string>
   <string name="various_heading_unknown">Az irány nem meghatározható</string>
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap nyomvonal megjelenítés</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-hy/strings-preferences.xml b/app/src/main/res/values-hy/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-hy/strings-preferences.xml
+++ b/app/src/main/res/values-hy/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index dd331d6cf..75b4ad2dd 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -31,4 +31,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-id-rID/strings-preferences.xml b/app/src/main/res/values-id-rID/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-id-rID/strings-preferences.xml
+++ b/app/src/main/res/values-id-rID/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-id-rID/strings.xml b/app/src/main/res/values-id-rID/strings.xml
index f769800bd..e779edd5e 100644
--- a/app/src/main/res/values-id-rID/strings.xml
+++ b/app/src/main/res/values-id-rID/strings.xml
@@ -19,4 +19,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-id/strings-preferences.xml b/app/src/main/res/values-id/strings-preferences.xml
index 5ceb85dfc..02b361b5f 100644
--- a/app/src/main/res/values-id/strings-preferences.xml
+++ b/app/src/main/res/values-id/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Pengaturan</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 37396508f..8411a2bdc 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -132,4 +132,7 @@
   <string name="various_heading_unknown">Arah tidak dapat ditentukan</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Tampilan trek OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml
index a5b9f7604..45d5856b0 100644
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Impostazioni</string>
@@ -22,7 +22,12 @@
   </string-array>
   <string name="prefs_ui_buttons_layout">Formato tasti</string>
   <string name="prefs_ui_buttons_layout_summary">Permette di definire un formato personalizzato dei tasti (vedi manuale)</string>
+  <string name="prefs_ui_buttons_layout_default_section">DEFAULT LAYOUT</string>
   <string name="prefs_ui_buttons_layout_defaut">Predefinito</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">LAYOUT SCARICATO</string>
+  <string name="prefs_ui_buttons_layout_empty_section">Non hai scaricato file di layout</string>
+  <string name="prefs_ui_available_layout">Layout disponibili</string>
+  <string name="prefs_ui_github_repository_settings">Impostazioni del Github Repository</string>
   <string name="prefs_ui_orientation">Orientamento</string>
   <string name="prefs_ui_orientation_summary">Orientamento preferito per i tasti dello schermo</string>
   <string-array name="prefs_ui_orientation_options_keys">
@@ -43,7 +48,7 @@
   <string name="prefs_display_always_on">Schermo sempre attivo</string>
   <string name="prefs_display_always_on_summary">Lo schermo rimarrà attivo durante la registrazione della traccia. Disattiva per risparmiare la batteria</string>
   <string name="prefs_displaytrack_osm">Sfondo OSM</string>
-  <string name="prefs_displaytrack_osm_summary">Mostra OpenStreetMap sotto la traccia. E\' necessaria una connessione dati</string>
+  <string name="prefs_displaytrack_osm_summary">Mostra OpenStreetMap sotto la traccia. È necessaria una connessione dati</string>
   <string name="prefs_displaytrack_osm_summary_ask">Mostra sempre lo sfondo OpenStreetMap? Richiede una connessione dati.</string>
   <string name="prefs_output">Salvataggio file GPX</string>
   <string name="prefs_storage_dir">Directory memoria esterna (SD)</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 569e20e05..f5a54633e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">POI: </string>
   <string name="trackmgr_trackpoints_count">Punti traccia: </string>
   <string name="trackmgr_empty">Nessuna traccia disponibile.</string>
+  <string name="trackmgr_newtrack_hint">Per registrare una traccia,\npremi <b>Menu</b> poi <b>Nuova traccia</b></string>
   <string name="trackmgr_newtrack_error">Impossibile creare una nuova traccia: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Stai già registrando la <b>traccia #{0}</b>\nSelezionala nell\'elenco per continuare</string>
   <string name="trackmgr_contextmenu_stop">Ferma registrazione</string>
   <string name="trackmgr_contextmenu_resume">Riprendi registrazione</string>
   <string name="trackmgr_contextmenu_delete">Elimina</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">La traccia #{0} sarà eliminata</string>
   <string name="trackmgr_deleteall_confirm">Tutte le tracce saranno eliminate. Sei sicuro?</string>
   <string name="trackmgr_exporting">Esportazione traccia #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Preparazione esportazione...</string>
   <string name="trackmgr_export_error">Impossibile esportare la traccia: {0}</string>
   <string name="trackmgr_exportall_confirm">Tutti i tracciati verranno esportati, ma questo può richiedere un po\' di tempo. Sei sicuro?</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">Per maggiori informazioni e segnalazioni di problemi visita la pagina principale del progetto:</string>
   <string name="about_translate_text">Aiuta a tradurre OSMTracker:</string>
   <string name="about_debug_info">Info debug</string>
+  <string name="about_export_db">Esporta database</string>
+  <string name="about_exporting_db">Esportazione database...</string>
+  <string name="about_export_db_result">Risultato esportazione database: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker sta registrando</string>
   <string name="notification_title">OSMTracker sta registrando (#{0})</string>
@@ -132,4 +138,36 @@
   <string name="various_heading_unknown">La direzione non può essere determinata</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Mostra traccia OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Aggiorna &amp; installa</string>
+  <string name="buttons_presets_context_menu_delete">Elimina</string>
+  <string name="buttons_presets_updating_layout">Aggiornamento...</string>
+  <string name="buttons_presets_successful_update">Il formato è stato aggiornato con successo</string>
+  <string name="buttons_presets_unsuccessful_update">Il formato non è stato aggiornato, riprovare più tardi</string>
+  <string name="buttons_presets_delete_message">Vuoi veramente eliminare il formato {0}?</string>
+  <string name="buttons_presets_delete_positive_confirmation">Sì</string>
+  <string name="buttons_presets_successful_delete">Il file è stato eliminato con successo</string>
+  <string name="buttons_presets_icon_directory_deleted">La directory delle icone è stata eliminata con successo</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">Il file non aveva alcuna directory delle icone associata</string>
+  <string name="buttons_presets_unsuccessful_delete">Non è stato possibile eliminare il file</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Errore: impossibile connettersi a Internet</string>
+  <string name="available_layouts_response_null_exception">Errore: impossibile connettersi al repository predefinito dei formati personalizzati</string>
+  <string name="available_layouts_connecting_message">(Connessione in corso...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Scarica</string>
+  <string name="available_layouts_not_available_language">La tua lingua non è disponibile, selezionane una dalla lista</string>
+  <string name="available_layouts_language_dialog_title">Lingue disponibili</string>
+  <string name="available_layouts_checking_language_dialog">Controllo delle versioni della lingua locale</string>
+  <string name="available_layouts_downloading_dialog">Scaricamento in corso...</string>
+  <string name="available_layouts_successful_download">Il formato è stato scaricato con successo</string>
+  <string name="available_layouts_unsuccessful_download">Non è stato possibile scaricare il formato, riprovare più tardi</string>
+  <string name="available_layouts_null_response_received">Errore durante il trasferimento dei dati dal server</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">Predefinito</string>
+  <string name="github_repository_settings_custom_checkbox">Personalizzato</string>
+  <string name="github_repository_settings_username">Utente Github:</string>
+  <string name="github_repository_settings_repository_name">Nome repository:</string>
+  <string name="github_repository_settings_branch_name">Nome branch:</string>
+  <string name="github_repository_settings_valid_server">Repository Github valido</string>
+  <string name="github_repository_settings_invalid_server">Repository Github non valido</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml
index 64b60a19a..7da352df5 100644
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">設定</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1624783ed..b2aaca863 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -31,7 +31,10 @@
   <string name="trackmgr_waypoints_count">ウェイポイント: </string>
   <string name="trackmgr_trackpoints_count">トラックポイント: </string>
   <string name="trackmgr_empty">トラックデータがありません。</string>
+  <string name="trackmgr_newtrack_hint">トラックを記録するには、\n<b>メニュー</b>、<b>新規トラック</b>を押してください</string>
   <string name="trackmgr_newtrack_error">新しいトラックが作成できません: {0}</string>
+  <string name="trackmgr_continuetrack_hint">現在<b>トラック #{0}</b>を記録中
+続行するにはリストから選択して下さい。</string>
   <string name="trackmgr_contextmenu_stop">トラッキングの停止</string>
   <string name="trackmgr_contextmenu_resume">トラッキングの再開</string>
   <string name="trackmgr_contextmenu_delete">削除</string>
@@ -43,6 +46,7 @@
   <string name="trackmgr_delete_confirm">トラック #{0} を削除します</string>
   <string name="trackmgr_deleteall_confirm">全てのトラックを削除します。よろしいですか？</string>
   <string name="trackmgr_exporting">トラック #{0} をエクスポート中…</string>
+  <string name="trackmgr_exporting_prepare">エクスポートの準備中です...</string>
   <string name="trackmgr_export_error">トラック {0} をエクスポートできません</string>
   <string name="trackmgr_exportall_confirm">全てのトラックをエクスポートします。時間がかかる可能性があります。よろしいですか？</string>
   <!--Track Detail-->
@@ -109,6 +113,9 @@
   <string name="about_text">詳細情報,ドキュメント,議論については、ホームページを参照してください:</string>
   <string name="about_translate_text">OSMTrackerの翻訳を支援してください。</string>
   <string name="about_debug_info">デバッグ情報</string>
+  <string name="about_export_db">データベースをエクスポート</string>
+  <string name="about_exporting_db">データベースをエクスポート中...</string>
+  <string name="about_export_db_result">データベースのエクスポート結果: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker トラッキング中</string>
   <string name="notification_title">OSMTracker トラッキング中 (#{0})</string>
@@ -132,4 +139,7 @@
   <string name="various_heading_unknown">方位が特定できませんでした</string>
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap トラック表示</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-km/strings-preferences.xml b/app/src/main/res/values-km/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-km/strings-preferences.xml
+++ b/app/src/main/res/values-km/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index f769800bd..e779edd5e 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -19,4 +19,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-kn/strings-preferences.xml b/app/src/main/res/values-kn/strings-preferences.xml
index e83b9b85f..eb85695b2 100644
--- a/app/src/main/res/values-kn/strings-preferences.xml
+++ b/app/src/main/res/values-kn/strings-preferences.xml
@@ -1,5 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
+  <string name="prefs">‍‍‍‍‍ಸೆಟ್ಟಿಂಗ್ಸ್ ‍‍</string>
+  <string name="prefs_gps">‍ಜಿಪಿಎಸ್</string>
+  <string name="prefs_gps_os_settings">‍‍‍‍‍ಜಿಪಿಎಸ್ ಸೆಟ್ಟಿಂಗ್ಸ್ </string>
+  <string name="prefs_check_gps_startup">‍</string>
+  <string name="prefs_gps_logging_interval_seconds">‍ಸೆಕೆಂಡ್ಸ್</string>
+  <string name="prefs_output">‍ಜಿಪಿಎಕ್ಸ್ ಸೆಟ್ಟಿಂಗ್ಸ್</string>
+  <string name="prefs_sound_enabled">‍‍ದ್ವನಿ ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
+  <string name="prefs_map_tile">‍‍</string>
   <string name="prefs_map_tile_summary"></string>
 </resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index f769800bd..e779edd5e 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -19,4 +19,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-ko/strings-preferences.xml b/app/src/main/res/values-ko/strings-preferences.xml
index 10aebb5a4..e13c12126 100644
--- a/app/src/main/res/values-ko/strings-preferences.xml
+++ b/app/src/main/res/values-ko/strings-preferences.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">설정</string>
   <string name="prefs_gps">GPS</string>
   <string name="prefs_gps_os_settings">GPS 설정</string>
-  <string name="prefs_gps_os_settings_summary">시스템 GPS 설정 화면을 보여줍니다</string>
+  <string name="prefs_gps_os_settings_summary">시스템 GPS 설정 화면을 표시합니다</string>
   <string name="prefs_check_gps_startup">시작할 때 GPS 확인</string>
   <string name="prefs_check_gps_startup_summary">GPS가 시작할 때 비활성화되어 있는지 확인하고 활성화할 수 있도록 제공합니다</string>
   <string name="prefs_gps_ignore_clock">GPS 시계 무시</string>
@@ -21,7 +21,7 @@
     <item>항상 묻기</item>
   </string-array>
   <string name="prefs_ui_buttons_layout">버튼 프리셋</string>
-  <string name="prefs_ui_buttons_layout_summary">사용자 지정 버튼 셋을 선택합니다 (설명문서를 참고하세요)</string>
+  <string name="prefs_ui_buttons_layout_summary">사용자 지정 버튼 셋을 선택합니다 (설명문서를 보세요)</string>
   <string name="prefs_ui_buttons_layout_defaut">기본값</string>
   <string name="prefs_ui_orientation">화면 방향</string>
   <string name="prefs_ui_orientation_summary">버튼 화면의 선호하는 방향</string>
@@ -43,8 +43,8 @@
   <string name="prefs_display_always_on">화면 항상 켜기</string>
   <string name="prefs_display_always_on_summary">화면이 트래킹하는 동안 항상 유지됩니다. 배터리를 절약하려면 비활성화하세요</string>
   <string name="prefs_displaytrack_osm">배경 지도</string>
-  <string name="prefs_displaytrack_osm_summary">트랙 아래에 OpenStreetMap 지도를 보여줍니다. 데이터 연결이 필요합니다</string>
-  <string name="prefs_displaytrack_osm_summary_ask">OpenStreetMap 배경을 항상 보이겠습니까? 데이터 연결이 필요합니다.</string>
+  <string name="prefs_displaytrack_osm_summary">트랙 아래에 OpenStreetMap 지도를 표시합니다. 데이터 연결이 필요합니다</string>
+  <string name="prefs_displaytrack_osm_summary_ask">OpenStreetMap 배경을 항상 표시하겠습니까? 데이터 연결이 필요합니다.</string>
   <string name="prefs_output">GPX 설정</string>
   <string name="prefs_storage_dir">외부 저장소 (SD) 디렉터리</string>
   <string name="prefs_storage_dir_hint">다음 트랙에 반영됩니다 (현재 것은 안됨)</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 84001366f..ccce5803b 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -31,18 +31,21 @@
   <string name="trackmgr_waypoints_count">웨이포인트:</string>
   <string name="trackmgr_trackpoints_count">트랙포인트:</string>
   <string name="trackmgr_empty">어떠한 트랙도 없습니다.</string>
+  <string name="trackmgr_newtrack_hint">트랙을 기록하려면,\n <b>메뉴</b>를 누르고 <b>새 트랙</b>을 누르세요</string>
   <string name="trackmgr_newtrack_error">새 트랙을 만들 수 없습니다: {0}</string>
+  <string name="trackmgr_continuetrack_hint">현재  <b>트랙 #{0}</b>을 기록하고 있습니다\n계속하려면 목록에서 그것을 선택하세요</string>
   <string name="trackmgr_contextmenu_stop">트래킹 멈춤</string>
   <string name="trackmgr_contextmenu_resume">트래킹 재개</string>
   <string name="trackmgr_contextmenu_delete">삭제</string>
   <string name="trackmgr_contextmenu_export">GPX로 내보내기</string>
   <string name="trackmgr_contextmenu_osm_upload">OpenStreetMap으로 올리기</string>
-  <string name="trackmgr_contextmenu_display">보기</string>
+  <string name="trackmgr_contextmenu_display">표시</string>
   <string name="trackmgr_contextmenu_details">자세한 정보</string>
   <string name="trackmgr_contextmenu_title">트랙 #{0}</string>
   <string name="trackmgr_delete_confirm">트랙 #{0}이 삭제됩니다</string>
   <string name="trackmgr_deleteall_confirm">모든 트랙이 삭제됩니다. 삭제하겠습니까?</string>
   <string name="trackmgr_exporting">트랙 #{0}을 내보내는 중…</string>
+  <string name="trackmgr_exporting_prepare">내보내기 준비 중…</string>
   <string name="trackmgr_export_error">트랙을 내보낼 수 없습니다: {0}</string>
   <string name="trackmgr_exportall_confirm">모든 트랙을 내보내며, 시간이 오래 걸릴 수 있습니다. 내보내겠습니까?</string>
   <!--Track Detail-->
@@ -56,7 +59,7 @@
   <string name="trackdetail_btn_export">GPX로 내보내기</string>
   <string name="trackdetail_export_notyet">(아직 내보내지 않았습니다)</string>
   <string name="trackdetail_osm_upload_notyet">(아직 올리지 않았습니다)</string>
-  <string name="trackdetail_export_display">보기</string>
+  <string name="trackdetail_export_display">표시</string>
   <string name="trackdetail_description">설명</string>
   <string name="trackdetail_tags">태그 (쉼표로 구분)</string>
   <string name="trackdetail_description_mandatory">설명을 입력해야 합니다</string>
@@ -83,7 +86,7 @@
   <string name="menu_settings">설정</string>
   <string name="menu_waypointlist">웨이포인트</string>
   <string name="menu_about">정보</string>
-  <string name="menu_displaytrack">트랙 보기</string>
+  <string name="menu_displaytrack">트랙 표시</string>
   <string name="menu_stoptracking">멈춤 &amp; 저장</string>
   <string name="menu_newtrack">새 트랙</string>
   <string name="menu_deletetracks">모든 트랙 삭제</string>
@@ -109,13 +112,16 @@
   <string name="about_text">자세한 정보와 설명문서, 문제 보고서에 대해서는 프로젝트 홈 페이지를 방문하세요:</string>
   <string name="about_translate_text">OSMTracker 번역을 도와주세요:</string>
   <string name="about_debug_info">디버그 정보</string>
+  <string name="about_export_db">데이터베이스 내보내기</string>
+  <string name="about_exporting_db">데이터베이스를 내보내는 중…</string>
+  <string name="about_export_db_result">데이터베이스 내보내기 결과: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker가 트랙 중입니다</string>
   <string name="notification_title">OSMTracker가 트랙 중입니다 (#{0})</string>
-  <string name="notification_text">주 화면을 보려면 여기를 탭하세요</string>
+  <string name="notification_text">주 화면을 표시하려면 여기를 탭하세요</string>
   <!--Display track-->
-  <string name="displaytrack">트랙 보기</string>
-  <string name="displaytrack_map">배경 지도 보기</string>
+  <string name="displaytrack">트랙 표시</string>
+  <string name="displaytrack_map">배경 지도 표시</string>
   <string name="displaytrack_north">북</string>
   <!--Track detail-->
   <string name="trackdetail_save">저장</string>
@@ -131,5 +137,8 @@
   <string name="various_heading">방위 측정을 기다리는 중…</string>
   <string name="various_heading_unknown">방위를 결정할 수 없습니다</string>
   <!--OSM map view-->
-  <string name="displaytrackmap">OpenStreetMap 트랙 보기</string>
+  <string name="displaytrackmap">OpenStreetMap 트랙 표시</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-lt/strings-preferences.xml b/app/src/main/res/values-lt/strings-preferences.xml
index e83b9b85f..4cc8b5fec 100644
--- a/app/src/main/res/values-lt/strings-preferences.xml
+++ b/app/src/main/res/values-lt/strings-preferences.xml
@@ -1,5 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
+  <string name="prefs">Nustatymai</string>
+  <string name="prefs_gps">GPS</string>
+  <string name="prefs_gps_os_settings">GPS nustatymai</string>
+  <string name="prefs_ui_picture_source">Numatytasis nuotraukų šaltinis</string>
+  <string name="prefs_voicerec_duration">Balso įrašo trukmė</string>
+  <string-array name="prefs_theme_keys">
+    <item>OS numatytoji</item>
+    <item>OS numatytoji (tamsi)</item>
+    <item>OS numatytoji  (šviesi)</item>
+    <item>Raiški</item>
+  </string-array>
+  <string name="prefs_output">GPX nustatymai</string>
+  <string name="prefs_sound_enabled">Įjungti garsą</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f769800bd..c49fb9262 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,22 +1,58 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Generic strings-->
+  <string name="app_name">OSMTracker for Android™</string>
+  <string name="app_short_name">OSMTracker</string>
   <!--TrackLogger-->
+  <string name="tracklogger_voicerec_title">Balso įrašymas</string>
+  <string name="tracklogger_voicerec_stop">Stabdyti</string>
+  <string name="tracklogger_btnBack">Atgal</string>
+  <string name="tracklogger_gps_disabled">GPS išjungtas</string>
+  <string name="tracklogger_gps_disabled_hint">GPS išjungtas.Ar norite įjungti?</string>
+  <string name="tracklogger_choose_gallery_camera">Galerija ar kamera?</string>
+  <string name="tracklogger_camera">Fotografuoti</string>
+  <string name="tracklogger_gallery">Pasirinkti nuotrauką iš galerijos</string>
   <!--Waypoint List-->
+  <string name="wplist_latitude">Plat.</string>
+  <string name="wplist_longitude">Ilg.</string>
   <!--Track Manager-->
+  <string name="trackmgr_contextmenu_delete">Ištrinti</string>
+  <string name="trackmgr_contextmenu_export">Eksportuoti kaip GPX</string>
+  <string name="trackmgr_contextmenu_osm_upload">Siųsti į OpenStreetMap</string>
   <!--Track Detail-->
+  <string name="trackdetail_osm_upload_date">Nusiųsta į OpenStreetMap:</string>
+  <string name="trackdetail_btn_export">Eksportuoti kaip GPX</string>
+  <string name="trackdetail_tags">Žymos (atskirtos kableliu)</string>
+  <string name="trackdetail_description_mandatory">Pridėkite aprašymą</string>
+  <string name="osm_visibility_public">Viešas</string>
   <!--OSM upload-->
+  <string name="osm_upload_oauth_failed">Nepavyksta prisijungti prie OSM</string>
+  <string name="osm_upload_waiting_response">Laukiama OpenStreetMap serverio atsakymo…</string>
   <!--GPS Status & record bar-->
+  <string name="gpsstatus_record_voicerec">Balso įrašymas</string>
+  <string name="gpsstatus_record_stillimage">Fotografuoti</string>
   <!--Menu-->
+  <string name="menu_settings">Nustatymai</string>
+  <string name="menu_about">Apie</string>
+  <string name="menu_save">Išsaugoti</string>
+  <string name="menu_cancel">Atšaukti</string>
+  <string name="menu_export">Eksportuoti kaip GPX</string>
   <!--Errors-->
   <!--GPX-->
   <!--About screen-->
+  <string name="about">Apie</string>
+  <string name="about_translate_text">Pagelbėkite išversti OSMTracker:</string>
   <!--Notification-->
   <!--Display track-->
   <!--Track detail-->
+  <string name="trackdetail_save">Išsaugoti</string>
   <!--Various-->
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
   <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-lv/accessibility.xml b/app/src/main/res/values-lv/accessibility.xml
index 04735b1b5..080977382 100644
--- a/app/src/main/res/values-lv/accessibility.xml
+++ b/app/src/main/res/values-lv/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">OSMTracker logo</string>
diff --git a/app/src/main/res/values-lv/strings-preferences.xml b/app/src/main/res/values-lv/strings-preferences.xml
index a4504b99e..75a217692 100644
--- a/app/src/main/res/values-lv/strings-preferences.xml
+++ b/app/src/main/res/values-lv/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Uzsādijumi</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index f769800bd..e779edd5e 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -19,4 +19,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-my/strings-preferences.xml b/app/src/main/res/values-my/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-my/strings-preferences.xml
+++ b/app/src/main/res/values-my/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index f769800bd..e779edd5e 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -19,4 +19,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-nb/strings-preferences.xml b/app/src/main/res/values-nb/strings-preferences.xml
index b13a5dc4b..bfde659e9 100644
--- a/app/src/main/res/values-nb/strings-preferences.xml
+++ b/app/src/main/res/values-nb/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Innstillinger</string>
@@ -44,7 +44,7 @@
   <string name="prefs_display_always_on_summary">Skjermen blir stående på under sporing. Slå av for å spare batteri</string>
   <string name="prefs_displaytrack_osm">Bakgrunnskart</string>
   <string name="prefs_displaytrack_osm_summary">Vis OpenStreetMap-kartet under sporet. Bruker datatilkobling</string>
-  <string name="prefs_displaytrack_osm_summary_ask">Vis alltid OpenStreetMap bakgrunn?  Krever en nettverksforbindelse</string>
+  <string name="prefs_displaytrack_osm_summary_ask">Vis alltid bakgrunn fra OpenStreetMap?  Krever en nettverksforbindelse.</string>
   <string name="prefs_output">GPX-innstillinger</string>
   <string name="prefs_storage_dir">Mappe på ekstern lagringsenhet (SD)</string>
   <string name="prefs_storage_dir_hint">Blir aktivert for neste spor</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index f29bb7abb..5d2f701a8 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Rutepunkt: </string>
   <string name="trackmgr_trackpoints_count">Sporpunkt: </string>
   <string name="trackmgr_empty">Du har ingen spor.</string>
+  <string name="trackmgr_newtrack_hint">For å spore,\npress <b>Meny</b> og så <b>Nytt spor</b></string>
   <string name="trackmgr_newtrack_error">Kan ikke lage spor: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Du tar nå opp <b>spor #{0}</b>\nVelg det i listen for å fortsette med sporingen|</string>
   <string name="trackmgr_contextmenu_stop">Stopp sporing</string>
   <string name="trackmgr_contextmenu_resume">Fortsett sporing</string>
   <string name="trackmgr_contextmenu_delete">Slett</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Spor nr. {0} vil bli slettet</string>
   <string name="trackmgr_deleteall_confirm">Alle spor vil bli slettet. Er du sikker?</string>
   <string name="trackmgr_exporting">Eksporterer spor nr. {0}…</string>
+  <string name="trackmgr_exporting_prepare">Forbereder eksport... </string>
   <string name="trackmgr_export_error">Kan ikke eksportere spor nr.: {0}</string>
   <string name="trackmgr_exportall_confirm">Alle spor vil bli eksportert, noe som kan ta lang tid. Er du sikker?</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">Besøk prosjekthjemmesiden for mer informasjon, dokumentasjon og feilrapportering:</string>
   <string name="about_translate_text">Hjelp med oversettelse av OSMTracker:</string>
   <string name="about_debug_info">Feilsøkingsinfo</string>
+  <string name="about_export_db">Eksporter database</string>
+  <string name="about_exporting_db">Eksporterer database...</string>
+  <string name="about_export_db_result">Resultat av database eksport: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker sporer</string>
   <string name="notification_title">OSMTracker sporer (nr. {0})</string>
@@ -132,4 +138,7 @@
   <string name="various_heading_unknown">Kurs kan ikke fastslås.</string>
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap sporvising</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-nl/accessibility.xml b/app/src/main/res/values-nl/accessibility.xml
index a3e41e47f..2d4ce6035 100644
--- a/app/src/main/res/values-nl/accessibility.xml
+++ b/app/src/main/res/values-nl/accessibility.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
-  <string name="acc.osmtracker_logo">OSMTracker logo</string>
+  <string name="acc.osmtracker_logo">OSMTracker-logo</string>
   <!--Zoom in/out in map view-->
   <string name="acc.zoom_in">Inzoomen</string>
   <string name="acc.zoom_out">Uitzoomen</string>
   <!--GPS status bar-->
-  <string name="acc.sat_indicator">Satelliet-signaalsterkte</string>
+  <string name="acc.sat_indicator">Aanduiding satelliet-signaalsterkte</string>
   <string name="acc.record_indicator">Aanduiding opname bezig</string>
   <!--Track list-->
   <string name="acc.track_status">Aanduiding trajectstatus</string>
diff --git a/app/src/main/res/values-nl/strings-preferences.xml b/app/src/main/res/values-nl/strings-preferences.xml
index 03d316a4a..e04e484ea 100644
--- a/app/src/main/res/values-nl/strings-preferences.xml
+++ b/app/src/main/res/values-nl/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Instellingen</string>
@@ -22,7 +22,12 @@
   </string-array>
   <string name="prefs_ui_buttons_layout">Knop-voorinstellingen</string>
   <string name="prefs_ui_buttons_layout_summary">Een aangepaste set knoppen kiezen (zie documenten)</string>
+  <string name="prefs_ui_buttons_layout_default_section">STANDAARD LAY-OUT</string>
   <string name="prefs_ui_buttons_layout_defaut">Standaard</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">GEDOWNLOADE LAY-OUT</string>
+  <string name="prefs_ui_buttons_layout_empty_section">U heeft geen gedownloade lay-outbestanden</string>
+  <string name="prefs_ui_available_layout">Beschikbare lay-outs</string>
+  <string name="prefs_ui_github_repository_settings">Instellingen van Github-Repository</string>
   <string name="prefs_ui_orientation">Oriëntatie</string>
   <string name="prefs_ui_orientation_summary">Voorkeursoriëntatie van het knoppenscherm</string>
   <string-array name="prefs_ui_orientation_options_keys">
@@ -58,11 +63,11 @@
     <item>Begindatum en -tijd</item>
   </string-array>
   <string name="prefs_output_accuracy">Nauwkeurigheid in GPX-bestand</string>
-  <string name="prefs_output_accuracy_summary">Nauwkeurigheid toevoegen in GPX-bestand, met naam van routepunt of in routepunt-opmerking</string>
+  <string name="prefs_output_accuracy_summary">Nauwkeurigheid toevoegen in GPX-bestand, met naam van referentiepunt of in referentiepunt-opmerking</string>
   <string-array name="prefs_output_accuracy_keys">
     <item>Geen</item>
-    <item>Met naam van routepunt</item>
-    <item>In routepunt-opmerking</item>
+    <item>Met naam van referentiepunt</item>
+    <item>In referentiepunt-opmerking</item>
   </string-array>
   <string name="prefs_output_gpx_hdop_approximation">HDOP-benadering gebruiken</string>
   <string name="prefs_output_gpx_hdop_approximation_summary">HDOP in GPX vullen met een benaderingswaarde van nauwkeurigheid</string>
@@ -84,5 +89,5 @@
     <item>in extensie</item>
   </string-array>
   <string name="prefs_compass_heading">Kompasrichting exporteren</string>
-  <string name="prefs_compass_heading_summary">Definieert of en hoe de kompas-data geëxporteerd moet worden naar het GPX-bestand</string>
+  <string name="prefs_compass_heading_summary">Bepaalt of en hoe de kompas-data geëxporteerd moet worden naar het GPX-bestand</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings-tags.xml b/app/src/main/res/values-nl/strings-tags.xml
index 16ffca740..e1d0e53fb 100644
--- a/app/src/main/res/values-nl/strings-tags.xml
+++ b/app/src/main/res/values-nl/strings-tags.xml
@@ -4,16 +4,19 @@
   <string name="tag.restriction">Beperking</string>
   <string name="tag.car">Auto</string>
   <string name="tag.tourism">Toerisme</string>
-  <string name="tag.amenity">Voorziening</string>
+  <string name="tag.amenity">Voor-
+ziening</string>
   <string name="tag.amenity_more">Voorziening (+)</string>
   <string name="tag.way">Weg</string>
-  <string name="tag.track">Traject</string>
-  <string name="tag.landuse">Landgebruik</string>
+  <string name="tag.track">Pad</string>
+  <string name="tag.landuse">Land-
+gebruik</string>
   <string name="tag.misc_bus_stop">Bushalte</string>
   <string name="tag.misc_railway">Spoorweg</string>
   <string name="tag.misc_telephone">Telefoon</string>
   <string name="tag.misc_post_box">Postbus</string>
-  <string name="tag.misc_atm">Geldautomaat</string>
+  <string name="tag.misc_atm">Geld-
+automaat</string>
   <string name="tag.misc_bollard">Inzinkbare paal</string>
   <string name="tag.misc_toilets">Toiletten</string>
   <string name="tag.misc_shelter">Onderdak</string>
@@ -30,17 +33,25 @@
   <string name="tag.restriction_110">Max 110</string>
   <string name="tag.restriction_120">Max 120</string>
   <string name="tag.restriction_130">Max 130</string>
-  <string name="tag.restriction_no_exit">Doodlopend</string>
-  <string name="tag.restriction_traffic_light">Verkeerslicht</string>
-  <string name="tag.restriction_one_way">Eénrichtingsverkeer</string>
-  <string name="tag.car_fuel_station">Tankstation</string>
-  <string name="tag.car_parking">Parkeerplaats</string>
-  <string name="tag.car_emergency_phone">Noodtelefoon</string>
-  <string name="tag.car_turning_circle">Draaicirkel</string>
+  <string name="tag.restriction_no_exit">Dood-
+lopend</string>
+  <string name="tag.restriction_traffic_light">Verkeers-
+licht</string>
+  <string name="tag.restriction_one_way">Eén
+richting</string>
+  <string name="tag.car_fuel_station">Tank-
+station</string>
+  <string name="tag.car_parking">Parkeer-
+plaats</string>
+  <string name="tag.car_emergency_phone">Nood-
+telefoon</string>
+  <string name="tag.car_turning_circle">Draai-
+cirkel</string>
   <string name="tag.car_speed_camera">Flitspaal</string>
-  <string name="tag.tourism_view_point">Uitkijkupunt</string>
+  <string name="tag.tourism_view_point">Uitkijk-
+punt</string>
   <string name="tag.tourism_information">Informatie</string>
-  <string name="tag.tourism_picnic">Picknickplaats</string>
+  <string name="tag.tourism_picnic">Picknick-site</string>
   <string name="tag.tourism_attraction">Attractie</string>
   <string name="tag.tourism_theme_park">Pretpark</string>
   <string name="tag.tourism_castle">Kasteel</string>
@@ -54,8 +65,13 @@
   <string name="tag.amenity_marina">Jachthaven</string>
   <string name="tag.amenity_sport">Sport</string>
   <string name="tag.amenity_taxi">Taxi</string>
-  <string name="tag.amenity_recycling">Recycling</string>
-  <string name="tag.amenity_post_office">Postkantoor</string>
+  <string name="tag.amenity_doctors">Hospitaal,
+dokters</string>
+  <string name="tag.amenity_recycling">Recyclage</string>
+  <string name="tag.amenity_place_of_worship">Plaats van
+aanbidding</string>
+  <string name="tag.amenity_post_office">Post-
+kantoor</string>
   <string name="tag.amenity_library">Bibliotheek</string>
   <string name="tag.amenitymore_school">School</string>
   <string name="tag.amenitymore_police">Politie</string>
@@ -96,5 +112,8 @@
   <string name="tag.landuse_reservoir">Reservoir</string>
   <string name="tag.landuse_forest">Bos</string>
   <string name="tag.landuse_allotments">Percelen</string>
-  <string name="tag.landuse_cemetery">Begraafplaats</string>
+  <string name="tag.landuse_cemetery">Begraaf-
+plaats</string>
+  <string name="tag.landuse_recreation_ground">Ontspannings-
+gebied</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c65241dba..e5e74762f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -3,7 +3,7 @@
   <!--Generic strings-->
   <string name="app_name">OSMTracker voor Android™</string>
   <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">Geïnspireerd door OSMTracker op Windows Mobile, stelt OSMTracker u in staat om uw routes op te nemen, belangrijke punten te markeren (geluidsopname, foto\'s), en alles te exporteren in GPX-formaat voor later gebruik met Open Street Map toools zoals JOSM.</string>
+  <string name="app_description">Geïnspireerd door OSMTracker op Windows Mobile, stelt OSMTracker u in staat om uw routes op te nemen, belangrijke referentiepunten te markeren (geluidsopname, foto\'s), en alles te exporteren in GPX-formaat voor later gebruik met Open Street Map tools zoals JOSM.</string>
   <!--TrackLogger-->
   <string name="tracklogger">Traject-logger</string>
   <string name="tracklogger_waiting_gps">Wachten op gps-fix om knoppen in te schakelen...</string>
@@ -13,12 +13,12 @@
   <string name="tracklogger_btnBack">Terug</string>
   <string name="tracklogger_tracked">Opgenomen:</string>
   <string name="tracklogger_gps_disabled">Gps uitgeschakeld</string>
-  <string name="tracklogger_gps_disabled_hint">Gps is uitgeschakeld. Wilt u het inschakelen?</string>
+  <string name="tracklogger_gps_disabled_hint">Gps is uitgeschakeld. Inschakelen?</string>
   <string name="tracklogger_choose_gallery_camera">Galerij of camera?</string>
   <string name="tracklogger_camera">Foto nemen met camera</string>
   <string name="tracklogger_gallery">Foto selecteren uit galerij</string>
   <!--Waypoint List-->
-  <string name="wplist">Lijst van routepunten</string>
+  <string name="wplist">Lijst van referentiepunten</string>
   <string name="wplist_latitude">Breedte:</string>
   <string name="wplist_longitude">Lengte:</string>
   <string name="wplist_elevation">Hoogte:</string>
@@ -28,10 +28,14 @@
   <!--Track Manager-->
   <string name="trackmgr">Trajectbeheerder</string>
   <string name="trackmgr_tracklist">Traject-lijst:</string>
-  <string name="trackmgr_waypoints_count">Routepunten:</string>
+  <string name="trackmgr_waypoints_count">Referentiepunten:</string>
   <string name="trackmgr_trackpoints_count">Trajectpunten:</string>
   <string name="trackmgr_empty">U hebt geen trajecten.</string>
+  <string name="trackmgr_newtrack_hint">Druk op <b>Menu</b> en <b>Nieuw traject</b> 
+om een traject op te nemen</string>
   <string name="trackmgr_newtrack_error">Kan geen nieuw traject aanmaken: {0}</string>
+  <string name="trackmgr_continuetrack_hint">U bent nu <b>traject #{0}</b> aan het opnemen.
+Selecteer het in de lijst om door te gaan.</string>
   <string name="trackmgr_contextmenu_stop">Opnemen stoppen</string>
   <string name="trackmgr_contextmenu_resume">Opnemen hervatten</string>
   <string name="trackmgr_contextmenu_delete">Verwijderen</string>
@@ -43,6 +47,7 @@
   <string name="trackmgr_delete_confirm">Traject #{0} zal verwijderd worden</string>
   <string name="trackmgr_deleteall_confirm">Alle trajecten zullen verwijderd worden. Bent u zeker?</string>
   <string name="trackmgr_exporting">Traject #{0} exporteren…</string>
+  <string name="trackmgr_exporting_prepare">Exporteren voorbereiden...</string>
   <string name="trackmgr_export_error">Kan traject niet exporteren: {0}</string>
   <string name="trackmgr_exportall_confirm">Alle trajecten zullen geëxporteerd worden, wat lang kan duren. Bent u zeker?</string>
   <!--Track Detail-->
@@ -81,7 +86,7 @@
   <string name="gpsstatus_record_textnote">Notitie</string>
   <!--Menu-->
   <string name="menu_settings">Instellingen</string>
-  <string name="menu_waypointlist">Routepunten</string>
+  <string name="menu_waypointlist">Referentiepunten</string>
   <string name="menu_about">Over</string>
   <string name="menu_displaytrack">Traject weergeven</string>
   <string name="menu_stoptracking">Stoppen &amp; opslaan</string>
@@ -109,6 +114,9 @@
   <string name="about_text">Bezoek de project-webpagina voor meer informatie, documenten en melden van problemen.</string>
   <string name="about_translate_text">Help OSMTracker vertalen:</string>
   <string name="about_debug_info">Debug-info</string>
+  <string name="about_export_db">Database exporteren</string>
+  <string name="about_exporting_db">Database exporteren...</string>
+  <string name="about_export_db_result">Resultaat exporteren database: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker is aan het opnemen</string>
   <string name="notification_title">OSMTracker is (#{0}) aan het opnemen</string>
@@ -129,7 +137,39 @@
   <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
   <string name="various_heading">Wachten voor richting...</string>
-  <string name="various_heading_unknown">De richting kan niet bepaald worden</string>
+  <string name="various_heading_unknown">Richting kan niet bepaald worden</string>
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap trajectweergave</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Bijwerken en installeren</string>
+  <string name="buttons_presets_context_menu_delete">Verwijderen</string>
+  <string name="buttons_presets_updating_layout">Bijwerken...</string>
+  <string name="buttons_presets_successful_update">Lay-out werd succesvol bijgewerkt</string>
+  <string name="buttons_presets_unsuccessful_update">Lay-out werd niet bijgewerkt, probeer het later opnieuw</string>
+  <string name="buttons_presets_delete_message">Weet u zeker dat u lay-out {0} wilt verwijderen?</string>
+  <string name="buttons_presets_delete_positive_confirmation">Ja</string>
+  <string name="buttons_presets_successful_delete">Het bestand werd succesvol verwijderd</string>
+  <string name="buttons_presets_icon_directory_deleted">De pictogram-map werd succesvol verwijderd</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">Dit bestand was niet verbonden aan een pictogram-map</string>
+  <string name="buttons_presets_unsuccessful_delete">Het bestand kon niet verwijderd worden</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Fout: kon niet verbinden met het Internet</string>
+  <string name="available_layouts_response_null_exception">Fout: kon niet verbinden met de standaard aangepaste lay-outs repository</string>
+  <string name="available_layouts_connecting_message">(Verbinden...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Downloaden</string>
+  <string name="available_layouts_not_available_language">Uw taal is niet beschikbaar. Selecteer een uit de lijst</string>
+  <string name="available_layouts_language_dialog_title">Beschikbare talen</string>
+  <string name="available_layouts_checking_language_dialog">Lokale taalversies controleren</string>
+  <string name="available_layouts_downloading_dialog">Downloaden...</string>
+  <string name="available_layouts_successful_download">De lay-out werd succesvol gedownload</string>
+  <string name="available_layouts_unsuccessful_download">De lay-out kan niet gedownload worden, probeer het later opnieuw</string>
+  <string name="available_layouts_null_response_received">Fout bij ophalen van data van server</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">Standaard</string>
+  <string name="github_repository_settings_custom_checkbox">Aangepast</string>
+  <string name="github_repository_settings_username">Github-gebruikersnaam:</string>
+  <string name="github_repository_settings_repository_name">Repository-naam:</string>
+  <string name="github_repository_settings_branch_name">Branch-naam</string>
+  <string name="github_repository_settings_valid_server">Github-repository geldig</string>
+  <string name="github_repository_settings_invalid_server">Github-repository ongeldig</string>
 </resources>
diff --git a/app/src/main/res/values-nl/waypoints.xml b/app/src/main/res/values-nl/waypoints.xml
index 2ce70670b..c62bb7bdd 100644
--- a/app/src/main/res/values-nl/waypoints.xml
+++ b/app/src/main/res/values-nl/waypoints.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">Stemopname</string>
   <string name="wpt_stillimage">Foto</string>
diff --git a/app/src/main/res/values-nn/strings-preferences.xml b/app/src/main/res/values-nn/strings-preferences.xml
index b30992900..3495266a1 100644
--- a/app/src/main/res/values-nn/strings-preferences.xml
+++ b/app/src/main/res/values-nn/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Innstillingar</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 1ac6f5fd6..aa252fbb8 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -117,4 +117,7 @@
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap sporvising</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-pl/strings-preferences.xml b/app/src/main/res/values-pl/strings-preferences.xml
index ee613f88c..585e27135 100644
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Ustawienia</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f2ecef102..12fc0b9f8 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Pkt nawigacji: </string>
   <string name="trackmgr_trackpoints_count">Pkt śladu: </string>
   <string name="trackmgr_empty">Nie masz żadnych śladów.</string>
+  <string name="trackmgr_newtrack_hint">Aby nagrać ślad, naciśnij <b>Menu</b> następnie <b>Nowy ślad</b></string>
   <string name="trackmgr_newtrack_error">Nie można utworzyć nowego śladu: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Właśnie tworzysz <b>ślad #{0}</b> Wybierz go z listy, aby kontynuować</string>
   <string name="trackmgr_contextmenu_stop">Zakończ rejestrację</string>
   <string name="trackmgr_contextmenu_resume">Wznów rejestrację</string>
   <string name="trackmgr_contextmenu_delete">Usuń</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Ślad #{0} zostanie usunięty</string>
   <string name="trackmgr_deleteall_confirm">Wszystkie dane zostaną usunięte. Czy na pewno?</string>
   <string name="trackmgr_exporting">Eksport śladu #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Przygotowanie eksportu...</string>
   <string name="trackmgr_export_error">Nie można eksportować śladu: {0}</string>
   <string name="trackmgr_exportall_confirm">Wszystkie ślady zostaną wysłane, może to zająć dużo czasu. Jesteś pewien?</string>
   <!--Track Detail-->
@@ -110,6 +113,9 @@ głosową</string>
   <string name="about_text">Więcej informacji, dokumentacja i zgłaszanie błędów, na stronie domowej projektu:</string>
   <string name="about_translate_text">Pomóż przetłumaczyć OSMTracker!</string>
   <string name="about_debug_info">Debug info</string>
+  <string name="about_export_db">Eksportuj bazę danych</string>
+  <string name="about_exporting_db">Eksportuję bazę danych...</string>
+  <string name="about_export_db_result">Rezultat eksportu bazy danych: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker zapisuje ślad</string>
   <string name="notification_title">OSMTracker zapisuje ślad (#{0})</string>
@@ -133,4 +139,7 @@ głosową</string>
   <string name="various_heading_unknown">Kierunek nie może zostać określony</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Podgląd śladu w OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings-preferences.xml b/app/src/main/res/values-pt-rBR/strings-preferences.xml
index ec66afa61..16c94f069 100644
--- a/app/src/main/res/values-pt-rBR/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Configurações</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9d8d55fd5..4249a8c2b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -7,11 +7,11 @@
   <!--TrackLogger-->
   <string name="tracklogger">Registro da trilha</string>
   <string name="tracklogger_waiting_gps">Aguardando estabilização do GPS para ativar botões...</string>
-  <string name="tracklogger_voicerec_title">Gravação de voz</string>
+  <string name="tracklogger_voicerec_title">Gravar voz</string>
   <string name="tracklogger_voicerec_text">Gravando um {0}s trecho de áudio.</string>
   <string name="tracklogger_voicerec_stop">Parar</string>
   <string name="tracklogger_btnBack">Voltar</string>
-  <string name="tracklogger_tracked">Gravada:</string>
+  <string name="tracklogger_tracked">Gravado:</string>
   <string name="tracklogger_gps_disabled">GPS desativado</string>
   <string name="tracklogger_gps_disabled_hint">O GPS está desativado. Deseja ativá-lo?</string>
   <string name="tracklogger_choose_gallery_camera">Galeria ou câmera?</string>
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Pontos de referência:</string>
   <string name="trackmgr_trackpoints_count">Trajeto:</string>
   <string name="trackmgr_empty">Você não tem nenhuma trilha.</string>
+  <string name="trackmgr_newtrack_hint">Para gravar uma trilha,\npressione <b>Menu</b> e então <b>Nova trilha</b></string>
   <string name="trackmgr_newtrack_error">Impossível criar uma nova trilha: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Você está gravando a <b>trilha #{0}</b>\nSelecione ela na lista para continuar</string>
   <string name="trackmgr_contextmenu_stop">Parar gravação</string>
   <string name="trackmgr_contextmenu_resume">Continuar gravação</string>
   <string name="trackmgr_contextmenu_delete">Apagar</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">A trilha #{0} será apagada</string>
   <string name="trackmgr_deleteall_confirm">Todas as trilhas serão apagadas. Tem certeza?</string>
   <string name="trackmgr_exporting">Exportando trilha #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Preparando para exportar...</string>
   <string name="trackmgr_export_error">Não foi possível exportar trilha: {0}</string>
   <string name="trackmgr_exportall_confirm">Todas as trilhas serão exportadas, o que poderá levar muito tempo. Tem certeza?</string>
   <!--Track Detail-->
@@ -76,7 +79,7 @@
   <string name="osm_upload_unauthorized">Erro de autorização. Gostaria de limpar as credencias do OpenStreetMaps salvas?</string>
   <string name="osm_upload_sucess">Enviado com sucesso para o OpenStreetMap</string>
   <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">Gravação de voz</string>
+  <string name="gpsstatus_record_voicerec">Gravar voz</string>
   <string name="gpsstatus_record_stillimage">Tirar foto</string>
   <string name="gpsstatus_record_textnote">Nota</string>
   <!--Menu-->
@@ -109,6 +112,9 @@
   <string name="about_text">Para maiores informações, documentação e relatório de problemas, por favor visite o site:</string>
   <string name="about_translate_text">Ajudar na tradução do OSMTracker:</string>
   <string name="about_debug_info">Informação de depuração</string>
+  <string name="about_export_db">Exportar banco de dados</string>
+  <string name="about_exporting_db">Exportando banco de dados...</string>
+  <string name="about_export_db_result">Resultado da exportação do banco de dados: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker está gravando trilha</string>
   <string name="notification_title">OSMTracker está gravando trilha (#{0})</string>
@@ -132,4 +138,7 @@
   <string name="various_heading_unknown">O rumo não pôde ser determinado</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Exibindo trilhas do OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/accessibility.xml b/app/src/main/res/values-pt-rPT/accessibility.xml
index c92c346c3..9e73d1b00 100644
--- a/app/src/main/res/values-pt-rPT/accessibility.xml
+++ b/app/src/main/res/values-pt-rPT/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">Logotipo OSMTracker</string>
@@ -6,9 +6,9 @@
   <string name="acc.zoom_in">Ampliar</string>
   <string name="acc.zoom_out">Diminuir</string>
   <!--GPS status bar-->
-  <string name="acc.sat_indicator">Indicador de força de sinal de satélite</string>
+  <string name="acc.sat_indicator">Indicador de força do sinal de satélite</string>
   <string name="acc.record_indicator">Indicador de gravação em curso</string>
   <!--Track list-->
-  <string name="acc.track_status">Indicador de estado do caminho</string>
+  <string name="acc.track_status">Indicador de estado do trilho</string>
   <string name="acc.upload_status">Indicador de envio para o OpenStreetMap</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings-preferences.xml b/app/src/main/res/values-pt-rPT/strings-preferences.xml
index 4d8cbacd5..052ef0a38 100644
--- a/app/src/main/res/values-pt-rPT/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rPT/strings-preferences.xml
@@ -1,31 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
-  <string name="prefs">Definições</string>
+  <string name="prefs">Configurações</string>
   <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">Definições de GPS</string>
-  <string name="prefs_gps_os_settings_summary">Apresentar ecrã de definições de GPS do sistema</string>
-  <string name="prefs_check_gps_startup">Verificar GPS no arranque</string>
-  <string name="prefs_check_gps_startup_summary">Verificar se o GPS está inactivo no arranque e oferecer-se para o activar</string>
+  <string name="prefs_gps_os_settings">Configurações de GPS</string>
+  <string name="prefs_gps_os_settings_summary">Ver configurações do GPS do sistema</string>
+  <string name="prefs_check_gps_startup">Verificar GPS ao iniciar</string>
+  <string name="prefs_check_gps_startup_summary">Verificar se o GPS está inativo no arranque e perguntar se quero ativá-lo</string>
   <string name="prefs_gps_ignore_clock">Ignorar o relógio do GPS</string>
-  <string name="prefs_gps_ignore_clock_summary">Ignorar o relógio do GPS e usar o relógio do Android para registo de hora</string>
-  <string name="prefs_gps_logging_interval">Intervalo de registo de GPS</string>
-  <string name="prefs_gps_logging_interval_summary">Use 0 para o valor mais pequeno possível (afecta a vida da bateria)</string>
+  <string name="prefs_gps_ignore_clock_summary">Ignorar o relógio do GPS e usar o relógio do Android para registo da hora</string>
+  <string name="prefs_gps_logging_interval">Intervalo de registo do GPS</string>
+  <string name="prefs_gps_logging_interval_summary">Usar 0 para o valor mais pequeno possível (diminui a duração da bateria)</string>
   <string name="prefs_gps_logging_interval_seconds">segundos</string>
   <string name="prefs_ui">Interface do utilizador</string>
+  <string name="prefs_ui_picture_source">Origem das fotografias</string>
+  <string name="prefs_ui_picture_source_summary">Tirar fotos com a câmara ou da galeria?</string>
   <string-array name="prefs_ui_picture_source_keys">
     <item>Câmara</item>
     <item>Galeria</item>
     <item>Perguntar sempre</item>
   </string-array>
-  <string name="prefs_ui_buttons_layout">Prédefinições dos botões</string>
-  <string name="prefs_ui_buttons_layout_summary">Escolha um conjunto de botões personalizado (confira docs)</string>
-  <string name="prefs_ui_buttons_layout_defaut">Por omissão</string>
+  <string name="prefs_ui_buttons_layout">Predefinições de botões</string>
+  <string name="prefs_ui_buttons_layout_summary">Escolha um conjunto de botões personalizado (veja a documentação)</string>
+  <string name="prefs_ui_buttons_layout_default_section">LAYOUT PADRÃO</string>
+  <string name="prefs_ui_buttons_layout_defaut">Padrão</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">LAYOUT DESCARREGADO</string>
+  <string name="prefs_ui_buttons_layout_empty_section">Não tem ficheiros de layout descarregados</string>
+  <string name="prefs_ui_available_layout">Layouts disponíveis</string>
+  <string name="prefs_ui_github_repository_settings">Configurações do Repositório do Github</string>
   <string name="prefs_ui_orientation">Orientação</string>
   <string name="prefs_ui_orientation_summary">Orientação preferida para o ecrã dos botões</string>
   <string-array name="prefs_ui_orientation_options_keys">
     <item>Automático</item>
-    <item>Retrato</item>
+    <item>Retrato (ao alto)</item>
     <item>Paisagem</item>
   </string-array>
   <string name="prefs_voicerec_duration">Duração da gravação de voz</string>
@@ -33,30 +40,30 @@
   <string name="prefs_theme">Tema gráfico do ecrã principal</string>
   <string name="prefs_theme_summary">É necessário reiniciar a aplicação para que as alterações tenham efeito</string>
   <string-array name="prefs_theme_keys">
-    <item>Tema por omissão do SO</item>
-    <item>Tema por omissão do SO (escuro)</item>
-    <item>Tema por omissão do SO (claro)</item>
+    <item>Tema original do SO</item>
+    <item>Tema original do SO (escuro)</item>
+    <item>Tema original do SO (claro)</item>
     <item>Alto contraste</item>
   </string-array>
   <string name="prefs_display_always_on">Ecrã sempre ligado</string>
-  <string name="prefs_display_always_on_summary">O ecrão manter-se-á ligado enquanto estiver a registrar. Desactive para poupar bateria</string>
+  <string name="prefs_display_always_on_summary">O ecrã manter-se-á ligado enquanto estiver a registar. Desative para poupar bateria</string>
   <string name="prefs_displaytrack_osm">Mapa de fundo</string>
-  <string name="prefs_displaytrack_osm_summary">Apresentar o mapa OpenStreetMap sob o caminho. Necessita de ligação de dados</string>
-  <string name="prefs_displaytrack_osm_summary_ask">Apresentar sempre o fundo OpenStreetMap? Exige uma ligação de dados.</string>
-  <string name="prefs_output">Definições de GPX</string>
-  <string name="prefs_storage_dir">Directoria de armazenamento externo (SD)</string>
-  <string name="prefs_storage_dir_hint">Aplicável apenas ao próximo caminho (não ao actual)</string>
-  <string name="prefs_output_one_dir_per_track">Uma directoria por caminho</string>
-  <string name="prefs_output_one_dir_per_track_summary">Guardar cada caminho e os ficheiros relacionados numa directoria dedicada</string>
-  <string name="prefs_output_filename">Nome de ficheiro para caminhos com nome</string>
-  <string name="prefs_output_filename_summary">Padrão para o nome de ficheiro se o caminho tiver um nome</string>
+  <string name="prefs_displaytrack_osm_summary">Mostrar o mapa OpenStreetMap por baixo do trilho. Necessita de ligação de dados</string>
+  <string name="prefs_displaytrack_osm_summary_ask">Mostrar sempre o fundo OpenStreetMap? Exige uma ligação de dados.</string>
+  <string name="prefs_output">Configurações de GPX</string>
+  <string name="prefs_storage_dir">Pasta de armazenamento externo (SD)</string>
+  <string name="prefs_storage_dir_hint">Aplicável apenas no próximo trilho (não ao atual)</string>
+  <string name="prefs_output_one_dir_per_track">Uma pasta por trilho</string>
+  <string name="prefs_output_one_dir_per_track_summary">Guardar cada trilho e os ficheiros relacionados numa pasta dedicada</string>
+  <string name="prefs_output_filename">Nome do ficheiro para trilhos com nome</string>
+  <string name="prefs_output_filename_summary">Padrão para o nome do ficheiro se o trilho tiver um nome</string>
   <string-array name="prefs_output_filename_keys">
-    <item>Nome do caminho</item>
+    <item>Nome do trilho</item>
     <item>Nome, data e hora de início</item>
     <item>Data e hora de início</item>
   </string-array>
   <string name="prefs_output_accuracy">Precisão no ficheiro GPX</string>
-  <string name="prefs_output_accuracy_summary">Adicionar informação de precisão no ficheiro GPX, com nome do ponto de referência ou no seu comentário</string>
+  <string name="prefs_output_accuracy_summary">Adicionar informação de precisão no ficheiro GPX, com nome do ponto de referência ou no comentário</string>
   <string-array name="prefs_output_accuracy_keys">
     <item>Nenhum</item>
     <item>Com nome do ponto de referência</item>
@@ -64,18 +71,23 @@
   </string-array>
   <string name="prefs_output_gpx_hdop_approximation">Usar aproximação HDOP</string>
   <string name="prefs_output_gpx_hdop_approximation_summary">Preencher HDOP no GPX com uma aproximação da precisão</string>
-  <string name="prefs_sound_enabled">Activar som</string>
-  <string name="prefs_sound_enabled_summary">Tocar som quando a gravação de voz começa e termina</string>
-  <string name="prefs_osm_clear_oauth_data">Restabelecer a autenticação OSM</string>
-  <string name="prefs_osm_clear_oauth_data_summary">Esquecer as credenciais e permissões OSM e forçar o OSMTracker a pedi-las novamente</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">Terá de autorizar, novamente, o OSMTracker a enviar informações de caminhos. Tem a certeza?</string>
-  <string name="prefs_map_tile">Fornecedor de Map Tile</string>
+  <string name="prefs_sound_enabled">Ativar som</string>
+  <string name="prefs_sound_enabled_summary">Reproduzir som quando a gravação de voz começa e termina</string>
+  <string name="prefs_osm_clear_oauth_data">Eliminar a autenticação OSM</string>
+  <string name="prefs_osm_clear_oauth_data_summary">Esquecer as credenciais e permissões do OpenStreetMap e forçar o OSMTracker a requisitá-las novamente</string>
+  <string name="prefs_osm_clear_oauth_data_dialog">Terá de autorizar novamente o OSMTracker para poder enviar trilhos para o OpenStreetMap. Quer continuar?</string>
+  <string name="prefs_map_tile">Fornecedor de Telas do Mapa</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
   <string-array name="prefs_compass_heading_keys">
-    <item>Nenhum</item>
-    <item>no comentário</item>
-    <item>na extensão</item>
+    <item>Não exportar</item>
+    <item>No comentário</item>
+    <item>Na extensão</item>
   </string-array>
-  <string name="prefs_compass_heading">Exportar direcção da Bússola</string>
+  <string name="prefs_compass_heading">Exportar direção da Bússola</string>
   <string name="prefs_compass_heading_summary">Define se e como os dados da bússola devem ser exportados para o ficheiro GPX</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings-tags.xml b/app/src/main/res/values-pt-rPT/strings-tags.xml
index 6142e170e..00d99c87d 100644
--- a/app/src/main/res/values-pt-rPT/strings-tags.xml
+++ b/app/src/main/res/values-pt-rPT/strings-tags.xml
@@ -1,46 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tag.misc">Misc</string>
+  <string name="tag.misc">Vários</string>
   <string name="tag.restriction">Restrição</string>
   <string name="tag.car">Carro</string>
   <string name="tag.tourism">Turismo</string>
-  <string name="tag.amenity">Amenidade</string>
-  <string name="tag.amenity_more">Amenidade(+)</string>
+  <string name="tag.amenity">Infraestrutura</string>
+  <string name="tag.amenity_more">Infraestrutura (+)</string>
   <string name="tag.way">Via</string>
   <string name="tag.track">Caminho</string>
   <string name="tag.landuse">Uso do solo</string>
   <string name="tag.misc_bus_stop">Paragem de autocarro</string>
-  <string name="tag.misc_railway">Caminho de ferro</string>
+  <string name="tag.misc_railway">Ferrovia</string>
   <string name="tag.misc_telephone">Telefone</string>
   <string name="tag.misc_post_box">Caixa de Correio</string>
   <string name="tag.misc_atm">Multibanco</string>
-  <string name="tag.misc_bollard">Poste (barreira)</string>
+  <string name="tag.misc_bollard">Pilar (barreira)</string>
   <string name="tag.misc_toilets">Casa de Banho</string>
   <string name="tag.misc_shelter">Abrigo</string>
   <string name="tag.misc_surveillance">Vigilância</string>
   <string name="tag.restriction_20">Máx. 20</string>
-  <string name="tag.restriction_30">Max 30</string>
+  <string name="tag.restriction_30">Máx 30</string>
   <string name="tag.restriction_40">Máx. 40</string>
-  <string name="tag.restriction_50">Max 50</string>
+  <string name="tag.restriction_50">Máx 50</string>
   <string name="tag.restriction_60">Máx. 60</string>
   <string name="tag.restriction_70">Máx 70</string>
-  <string name="tag.restriction_80">Max 80</string>
+  <string name="tag.restriction_80">Máx 80</string>
   <string name="tag.restriction_90">Máx 90</string>
-  <string name="tag.restriction_100">Max 100</string>
-  <string name="tag.restriction_110">Max 110</string>
-  <string name="tag.restriction_120">Max 120</string>
+  <string name="tag.restriction_100">Máx 100</string>
+  <string name="tag.restriction_110">Máx 110</string>
+  <string name="tag.restriction_120">Máx 120</string>
   <string name="tag.restriction_130">Máx 130</string>
   <string name="tag.restriction_no_exit">Sem saída</string>
-  <string name="tag.restriction_one_way">Um sentido</string>
-  <string name="tag.car_fuel_station">Bombas de combustível</string>
+  <string name="tag.restriction_traffic_light">Semáforo</string>
+  <string name="tag.restriction_one_way">Sentido único</string>
+  <string name="tag.car_fuel_station">Posto de combustível</string>
   <string name="tag.car_parking">Estacionamento</string>
   <string name="tag.car_emergency_phone">Telefone de Emergência</string>
-  <string name="tag.car_turning_circle">Inversão de marcha</string>
+  <string name="tag.car_turning_circle">Círculo de viragem</string>
   <string name="tag.car_speed_camera">Radar</string>
   <string name="tag.tourism_view_point">Miradouro</string>
   <string name="tag.tourism_information">Informação</string>
   <string name="tag.tourism_picnic">Zona de piquenique</string>
-  <string name="tag.tourism_attraction">Atracção</string>
+  <string name="tag.tourism_attraction">Atração</string>
   <string name="tag.tourism_theme_park">Parque de diversões</string>
   <string name="tag.tourism_castle">Castelo</string>
   <string name="tag.tourism_monument">Monumento</string>
@@ -53,7 +54,9 @@
   <string name="tag.amenity_marina">Marina</string>
   <string name="tag.amenity_sport">Desporto</string>
   <string name="tag.amenity_taxi">Táxi</string>
+  <string name="tag.amenity_doctors">Hospital,\nMédico</string>
   <string name="tag.amenity_recycling">Reciclagem</string>
+  <string name="tag.amenity_place_of_worship">Local de\nculto</string>
   <string name="tag.amenity_post_office">Correios</string>
   <string name="tag.amenity_library">Biblioteca</string>
   <string name="tag.amenitymore_school">Escola</string>
@@ -67,20 +70,20 @@
   <string name="tag.amenitymore_hostel">Albergue (Hostel)</string>
   <string name="tag.amenitymore_restaurant">Restaurante</string>
   <string name="tag.amenitymore_fastfood">Fast-food</string>
-  <string name="tag.amenitymore_camp_site">Campismo</string>
+  <string name="tag.amenitymore_camp_site">Parque de campismo</string>
   <string name="tag.way_bridge">Ponte</string>
   <string name="tag.way_zebra_crossing">Passadeira</string>
-  <string name="tag.way_motorway">Auto-estrada</string>
+  <string name="tag.way_motorway">Autoestrada</string>
   <string name="tag.way_trunk">Via rápida (IP, IC)</string>
   <string name="tag.way_primary">Estrada Nacional</string>
-  <string name="tag.way_secondary">Estrada regional</string>
-  <string name="tag.way_tertiary">Estrada municipal</string>
+  <string name="tag.way_secondary">Estrada Regional</string>
+  <string name="tag.way_tertiary">Estrada Municipal</string>
   <string name="tag.way_residential">Residencial</string>
   <string name="tag.way_service">Serviço</string>
-  <string name="tag.track_track">Caminho (sem revestimento)</string>
+  <string name="tag.track_track">Carreiro florestal / agrícola</string>
   <string name="tag.track_cycleway">Ciclovia</string>
-  <string name="tag.track_footway">Caminho pedestre</string>
-  <string name="tag.track_bridleway">Caminho de cavalos</string>
+  <string name="tag.track_footway">Via pedonal exclusiva</string>
+  <string name="tag.track_bridleway">Caminho exclusivo para cavalos</string>
   <string name="tag.track_steps">Degraus</string>
   <string name="tag.track_living_street">Living street</string>
   <string name="tag.track_pedestrian">Pedonal</string>
@@ -96,4 +99,5 @@
   <string name="tag.landuse_forest">Floresta</string>
   <string name="tag.landuse_allotments">Horta urbana</string>
   <string name="tag.landuse_cemetery">Cemitério</string>
+  <string name="tag.landuse_recreation_ground">Zona de\nrecreio</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index d1824c01b..56186139c 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -3,17 +3,20 @@
   <!--Generic strings-->
   <string name="app_name">OSMTracker para Android™</string>
   <string name="app_short_name">OSMTracker</string>
+  <string name="app_description">Inspirado pelo OSMTracker no Windows Mobile, permite registar as viagens, marcar pontos importantes (gravações de voz, fotos), exportar no formato GPX para ser utilizado posteriormente em programas como o JOSM.</string>
   <!--TrackLogger-->
-  <string name="tracklogger">Registo de caminhos</string>
-  <string name="tracklogger_waiting_gps">À espera de ligação GPS para activar os botões...</string>
+  <string name="tracklogger">Registo de trilhos</string>
+  <string name="tracklogger_waiting_gps">À espera do sinal GPS para ativar os botões...</string>
   <string name="tracklogger_voicerec_title">Gravação de voz</string>
   <string name="tracklogger_voicerec_text">A gravar um clip áudio de {0}s</string>
   <string name="tracklogger_voicerec_stop">Parar</string>
   <string name="tracklogger_btnBack">Voltar</string>
   <string name="tracklogger_tracked">Registados:</string>
-  <string name="tracklogger_gps_disabled">GPS inactivo</string>
-  <string name="tracklogger_gps_disabled_hint">O GPS está inactivo. Quer activá-lo?</string>
+  <string name="tracklogger_gps_disabled">GPS desativado</string>
+  <string name="tracklogger_gps_disabled_hint">O GPS está desativado. Quer ativá-lo?</string>
   <string name="tracklogger_choose_gallery_camera">Galeria ou câmara?</string>
+  <string name="tracklogger_camera">Fotografar com a câmara</string>
+  <string name="tracklogger_gallery">Selecionar fotografia na galeria</string>
   <!--Waypoint List-->
   <string name="wplist">Lista de pontos de referência</string>
   <string name="wplist_latitude">Lat:</string>
@@ -23,27 +26,30 @@
   <string name="wplist_compass">Rumo Bússo.:</string>
   <string name="wplist_compass_accuracy">Precis. Bússo.:</string>
   <!--Track Manager-->
-  <string name="trackmgr">Gestor de caminhos</string>
-  <string name="trackmgr_tracklist">Lista de caminhos</string>
+  <string name="trackmgr">Gestor de trilhos</string>
+  <string name="trackmgr_tracklist">Lista de trilhos</string>
   <string name="trackmgr_waypoints_count">Pontos de referência:</string>
-  <string name="trackmgr_trackpoints_count">Pontos de caminhos:</string>
-  <string name="trackmgr_empty">Não tem nenhum caminho.</string>
-  <string name="trackmgr_newtrack_error">Não foi possível criar o novo caminho: {0}</string>
+  <string name="trackmgr_trackpoints_count">Pontos de trilhos:</string>
+  <string name="trackmgr_empty">Não tem nenhum trilho.</string>
+  <string name="trackmgr_newtrack_hint">Para gravar um trilho,\npressione <b>Menu</b> e depois <b>Novo trilho</b></string>
+  <string name="trackmgr_newtrack_error">Não foi possível criar o novo trilho: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Está neste momento a gravar o <b>trilho #{0}</b>\nEscolha-o na lista para continuar</string>
   <string name="trackmgr_contextmenu_stop">Parar registo</string>
-  <string name="trackmgr_contextmenu_resume">Retomar registo</string>
-  <string name="trackmgr_contextmenu_delete">Apagar</string>
+  <string name="trackmgr_contextmenu_resume">Continuar registo</string>
+  <string name="trackmgr_contextmenu_delete">Eliminar</string>
   <string name="trackmgr_contextmenu_export">Exportar como GPX</string>
   <string name="trackmgr_contextmenu_osm_upload">Enviar para OpenStreetMap</string>
-  <string name="trackmgr_contextmenu_display">Apresentar</string>
+  <string name="trackmgr_contextmenu_display">Ver</string>
   <string name="trackmgr_contextmenu_details">Detalhes</string>
-  <string name="trackmgr_contextmenu_title">Caminho #{0}</string>
-  <string name="trackmgr_delete_confirm">O caminho #{0} será apagado</string>
-  <string name="trackmgr_deleteall_confirm">Todos os caminhos serão apagados. Tem a certeza?</string>
-  <string name="trackmgr_exporting">Exportar o caminho #{0}...</string>
-  <string name="trackmgr_export_error">Não foi possível exportar o caminho: {0}</string>
-  <string name="trackmgr_exportall_confirm">Todos os caminhos serão exportados, o que poderá demorar algum tempo. Tem a certeza?</string>
+  <string name="trackmgr_contextmenu_title">Trilho #{0}</string>
+  <string name="trackmgr_delete_confirm">O trilho #{0} será eliminado</string>
+  <string name="trackmgr_deleteall_confirm">Todos os trilhos serão eliminados. Tem a certeza?</string>
+  <string name="trackmgr_exporting">A exportar o trilho #{0}...</string>
+  <string name="trackmgr_exporting_prepare">A preparar a exportação...</string>
+  <string name="trackmgr_export_error">Não foi possível exportar o trilho: {0}</string>
+  <string name="trackmgr_exportall_confirm">Todos os trilhos serão exportados, o que poderá demorar algum tempo. Quer continuar?</string>
   <!--Track Detail-->
-  <string name="trackdetail">Detalhes do Caminho</string>
+  <string name="trackdetail">Detalhes do Trilho</string>
   <string name="trackdetail_startdate">Hora de início:</string>
   <string name="trackdetail_enddate">Hora de fim:</string>
   <string name="trackdetail_startloc">Começa em:</string>
@@ -53,38 +59,39 @@
   <string name="trackdetail_btn_export">Exportar como GPX</string>
   <string name="trackdetail_export_notyet">(Ainda não foi exportado)</string>
   <string name="trackdetail_osm_upload_notyet">(Ainda não foi enviado)</string>
-  <string name="trackdetail_export_display">Apresentar</string>
+  <string name="trackdetail_export_display">Ver</string>
   <string name="trackdetail_description">Descrição</string>
   <string name="trackdetail_tags">Etiquetas (separadas por vírgulas)</string>
   <string name="trackdetail_description_mandatory">Tem de escrever uma descrição</string>
   <string name="osm_visibility_private">Privado</string>
   <string name="osm_visibility_public">Público</string>
-  <string name="osm_visibility_trackable">Registável</string>
+  <string name="osm_visibility_trackable">Acompanhável</string>
   <string name="osm_visibility_identifiable">Identificável</string>
   <!--OSM upload-->
   <string name="osm_upload">Enviar para OpenStreetMap</string>
   <string name="osm_upload_ok">Gravar e enviar</string>
-  <string name="osm_upload_tmpfile_failed">Não foi possível exportar o caminho para um ficheiro temporário</string>
-  <string name="osm_upload_oauth_failed">Não foi possível a autenticação no OSM</string>
-  <string name="osm_upload_sending">A enviar o caminho #{0}...</string>
+  <string name="osm_upload_tmpfile_failed">Não foi possível exportar o trilho para um ficheiro temporário</string>
+  <string name="osm_upload_oauth_failed">Não foi possível autenticar no OSM</string>
+  <string name="osm_upload_sending">A enviar o trilho #{0}...</string>
   <string name="osm_upload_waiting_response">À espera de resposta do servidor OpenStreetMap...</string>
-  <string name="osm_upload_error">Erro ao enviar caminho</string>
+  <string name="osm_upload_error">Erro ao enviar trilho</string>
   <string name="osm_upload_bad_response">O servidor OSM devolveu um erro: ({0}) mensagem {1}</string>
-  <string name="osm_upload_unauthorized">Erro de autorização. Deseja limpar as credenciais guardadas do OpenStreetMap?</string>
+  <string name="osm_upload_unauthorized">Erro de autorização. Deseja eliminar as credenciais guardadas do OpenStreetMap?</string>
   <string name="osm_upload_sucess">Envio para o OpenStreetMap bem sucedido</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Gravar voz</string>
+  <string name="gpsstatus_record_stillimage">Fotografar</string>
   <string name="gpsstatus_record_textnote">Nota de texto</string>
   <!--Menu-->
-  <string name="menu_settings">Definições</string>
+  <string name="menu_settings">Configurações</string>
   <string name="menu_waypointlist">Pontos de referência</string>
   <string name="menu_about">Sobre</string>
-  <string name="menu_displaytrack">Apresentar caminho</string>
+  <string name="menu_displaytrack">Mostrar trilho</string>
   <string name="menu_stoptracking">Parar e gravar</string>
-  <string name="menu_newtrack">Novo caminho</string>
-  <string name="menu_deletetracks">Apagar todos os caminhos</string>
-  <string name="menu_continue">Continuar caminho</string>
-  <string name="menu_stopcurrenttrack">Parar caminho actual</string>
+  <string name="menu_newtrack">Novo trilho</string>
+  <string name="menu_deletetracks">Eliminar todos os trilhos</string>
+  <string name="menu_continue">Continuar trilho</string>
+  <string name="menu_stopcurrenttrack">Parar trilho atual</string>
   <string name="menu_save">Gravar</string>
   <string name="menu_cancel">Cancelar</string>
   <string name="menu_export">Exportar como GPX</string>
@@ -92,39 +99,75 @@
   <string name="menu_center_to_gps">Centrar no GPS</string>
   <string name="menu_exportall">Exportar tudo como GPX</string>
   <!--Errors-->
-  <string name="error_externalstorage_not_writable">Não foi possível escrever para o armazenamento externo.</string>
-  <string name="error_create_track_dir">Não foi possível criar pasta de caminho %s</string>
-  <string name="error_externalstorage_not_writable_hint">Por favor, verifique se o armaz. externo está inserido e montado correctamente.</string>
+  <string name="error_externalstorage_not_writable">Não foi possível gravar no armazenamento externo.</string>
+  <string name="error_create_track_dir">Não foi possível criar a pasta do trilho %s</string>
+  <string name="error_externalstorage_not_writable_hint">Por favor, verifique se o armazenamento externo está inserido e montado corretamente.</string>
   <string name="error_voicerec_failed">A gravação de voz falhou</string>
-  <string name="error_userlayout_parsing">Ocorreu um erro ao processar o ficheiro de layout XML. Por favor, reverta para o layout por omissão.</string>
+  <string name="error_userlayout_parsing">Ocorreu um erro ao processar o ficheiro de layout XML. Por favor, reverta para o layout padrão.</string>
   <!--GPX-->
   <string name="gpx_track_name">Registado com o OSMTracker para Android™</string>
-  <string name="gpx_hdop_approximation_cmt">Aviso: Os valores HDOP não são os valores HDOP indicados pelo GPS. São aproximações dadas pela exatidão da localização em metros.</string>
+  <string name="gpx_hdop_approximation_cmt">Aviso: os valores HDOP não são os valores HDOP indicados pelo GPS. São aproximações dadas pela exatidão da localização em metros.</string>
   <!--About screen-->
   <string name="about">Sobre</string>
-  <string name="about_text">Para mais informação, documentos e relatório de problemas, visite a página do projecto:</string>
+  <string name="about_text">Para mais informação, documentos e relatório de problemas, visite a página do projeto:</string>
   <string name="about_translate_text">Ajude a traduzir o OSMTracker:</string>
   <string name="about_debug_info">Informação de Debug</string>
+  <string name="about_export_db">Exportar base de dados</string>
+  <string name="about_exporting_db">A exportar a base de dados...</string>
+  <string name="about_export_db_result">Resultado da exportação da base de dados: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">O OSMTracker está a registar</string>
   <string name="notification_title">O OSMTracker está a registar ({0})</string>
-  <string name="notification_text">Toque aqui para apresentar o ecrã principal</string>
+  <string name="notification_text">Toque aqui para ver o ecrã principal</string>
   <!--Display track-->
-  <string name="displaytrack">Apresentar caminho</string>
-  <string name="displaytrack_map">Visualizar mapa de fundo</string>
+  <string name="displaytrack">Mostrar trilho</string>
+  <string name="displaytrack_map">Mostrar mapa de fundo</string>
   <string name="displaytrack_north">N</string>
   <!--Track detail-->
   <string name="trackdetail_save">Gravar</string>
   <!--Various-->
   <string name="various_unit_meters">m</string>
-  <string name="various_accuracy">Exatidão</string>
+  <string name="various_accuracy">Precisão</string>
   <string name="various_accuracy_with_sats">Precisão {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <string name="various_waiting_gps_fix">A esperar pela fixação do GPS... ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
   <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
   <string name="various_heading">Aguarde pelo rumo...</string>
   <string name="various_heading_unknown">O rumo não pode ser determinado</string>
   <!--OSM map view-->
-  <string name="displaytrackmap">Apresentação de caminho OpenStreetMap</string>
+  <string name="displaytrackmap">Trilho OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Atualizar e Instalar</string>
+  <string name="buttons_presets_context_menu_delete">Eliminar</string>
+  <string name="buttons_presets_updating_layout">A atualizar…</string>
+  <string name="buttons_presets_successful_update">O layout foi atualizado com sucesso</string>
+  <string name="buttons_presets_unsuccessful_update">O layout não foi atualizado, tente novamente mais tarde</string>
+  <string name="buttons_presets_delete_message">Tem a certeza que quer eliminar o layout {0}?</string>
+  <string name="buttons_presets_delete_positive_confirmation">Sim</string>
+  <string name="buttons_presets_successful_delete">O ficheiro foi eliminado com sucesso</string>
+  <string name="buttons_presets_icon_directory_deleted">O diretório do ícone foi eliminado com sucesso</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">O ficheiro não tinha nenhum diretório de ícone associado</string>
+  <string name="buttons_presets_unsuccessful_delete">Não foi possível eliminar o ficheiro</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Erro: não foi possível ligar à Internet</string>
+  <string name="available_layouts_response_null_exception">Erro: não foi possível estabelecer a ligação ao repositório padrão de layouts personalizados</string>
+  <string name="available_layouts_connecting_message">(A estabelecer a ligação…)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Descarregar</string>
+  <string name="available_layouts_not_available_language">O seu idioma não está disponível, selecione um da lista</string>
+  <string name="available_layouts_language_dialog_title">Idiomas Disponíveis</string>
+  <string name="available_layouts_checking_language_dialog">A verificar as versões de idiomas locais</string>
+  <string name="available_layouts_downloading_dialog">A descarregar…</string>
+  <string name="available_layouts_successful_download">O layout foi descarregado com sucesso</string>
+  <string name="available_layouts_unsuccessful_download">Não foi possível descarregar o layout, tente novamente mais tarde</string>
+  <string name="available_layouts_null_response_received">Erro ao obter os dados do servidor</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">Padrão</string>
+  <string name="github_repository_settings_custom_checkbox">Personalizado</string>
+  <string name="github_repository_settings_username">Nome de utilizador no Github:</string>
+  <string name="github_repository_settings_repository_name">Nome do repositório:</string>
+  <string name="github_repository_settings_branch_name">Nome do ramo:</string>
+  <string name="github_repository_settings_valid_server">Repositório do Github válido</string>
+  <string name="github_repository_settings_invalid_server">O repositório do Github não é válido</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings-preferences.xml b/app/src/main/res/values-pt/strings-preferences.xml
index 070566231..f955108f2 100644
--- a/app/src/main/res/values-pt/strings-preferences.xml
+++ b/app/src/main/res/values-pt/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Configurações</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f0b128459..13f5316ec 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -129,4 +129,7 @@
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
   <string name="displaytrackmap">Exibir trilha do OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings-preferences.xml b/app/src/main/res/values-ro-rRO/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-ro-rRO/strings-preferences.xml
+++ b/app/src/main/res/values-ro-rRO/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index f769800bd..e779edd5e 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -19,4 +19,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-ru/accessibility.xml b/app/src/main/res/values-ru/accessibility.xml
index 2e2fc5bbf..dcef63295 100644
--- a/app/src/main/res/values-ru/accessibility.xml
+++ b/app/src/main/res/values-ru/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">Логотип OSMTracker</string>
@@ -9,6 +9,6 @@
   <string name="acc.sat_indicator">Индикатор уровня спутникового сигнала</string>
   <string name="acc.record_indicator">Индикатор записи</string>
   <!--Track list-->
-  <string name="acc.track_status">Индикатор статуса трека</string>
+  <string name="acc.track_status">Индикатор отслеживания</string>
   <string name="acc.upload_status">Индикатор загрузки на OpenStreetMap</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings-preferences.xml b/app/src/main/res/values-ru/strings-preferences.xml
index 980879dd7..b588c678f 100644
--- a/app/src/main/res/values-ru/strings-preferences.xml
+++ b/app/src/main/res/values-ru/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Настройки</string>
@@ -11,7 +11,7 @@
   <string name="prefs_gps_ignore_clock_summary">Игнорировать время GPS и использовать время телефона для временных меток</string>
   <string name="prefs_gps_logging_interval">Интервал сохранения GPS</string>
   <string name="prefs_gps_logging_interval_summary">Установите 0 для минимально возможного (ускоряет разряд батереи)</string>
-  <string name="prefs_gps_logging_interval_seconds">секунд(ы)</string>
+  <string name="prefs_gps_logging_interval_seconds">секунд</string>
   <string name="prefs_ui">Интерфейс</string>
   <string name="prefs_ui_picture_source">Источник фото по-умолчанию</string>
   <string name="prefs_ui_picture_source_summary">Сделать снимок или выбрать фото из галереи?</string>
@@ -23,6 +23,7 @@
   <string name="prefs_ui_buttons_layout">Расположение кнопок</string>
   <string name="prefs_ui_buttons_layout_summary">Выбрать вариант расположения кнопок (См. документацию)</string>
   <string name="prefs_ui_buttons_layout_defaut">По умолчанию</string>
+  <string name="prefs_ui_github_repository_settings">Настройки репозитория Github</string>
   <string name="prefs_ui_orientation">Ориентация</string>
   <string name="prefs_ui_orientation_summary">Предпочтительная ориентация экрана с кнопками</string>
   <string-array name="prefs_ui_orientation_options_keys">
@@ -31,7 +32,7 @@
     <item>Ладншафтная</item>
   </string-array>
   <string name="prefs_voicerec_duration">Длительность записи аудио</string>
-  <string name="prefs_voicerec_duration_seconds">секунд(ы)</string>
+  <string name="prefs_voicerec_duration_seconds">секунд</string>
   <string name="prefs_theme">Основная тема оформления</string>
   <string name="prefs_theme_summary">Изменения будут действовать после перезагрузки программы</string>
   <string-array name="prefs_theme_keys">
@@ -44,7 +45,7 @@
   <string name="prefs_display_always_on_summary">Экран всегда будет включен во время записи трека. Отключите для экономии заряда батареи</string>
   <string name="prefs_displaytrack_osm">Картооснова OSM</string>
   <string name="prefs_displaytrack_osm_summary">Отображать картооснову OpenStreetMap при отображении трека. Требует интернет-соединения</string>
-  <string name="prefs_displaytrack_osm_summary_ask">Всегда показывать OpenStreetMap на фоне? Требуется подключение к сети.</string>
+  <string name="prefs_displaytrack_osm_summary_ask">Отображать картооснову OpenStreetMap при отображении трека? Требует интернет-соединения</string>
   <string name="prefs_output">Настройки GPX файлов</string>
   <string name="prefs_storage_dir">Сохранять в каталоге</string>
   <string name="prefs_storage_dir_hint">Будет использоваться для записи следующего трека (не для текущего)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 34cdbb7cf..063f08410 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -16,7 +16,7 @@
   <string name="tracklogger_gps_disabled_hint">GPS отключен. Вы хотите включить его?</string>
   <string name="tracklogger_choose_gallery_camera">Галерея или камера? </string>
   <string name="tracklogger_camera">Сделать фото</string>
-  <string name="tracklogger_gallery">выбрать фото из галереи</string>
+  <string name="tracklogger_gallery">Выбрать фото из галереи</string>
   <!--Waypoint List-->
   <string name="wplist">Список путевых точек</string>
   <string name="wplist_latitude">Шир.: </string>
@@ -31,9 +31,11 @@
   <string name="trackmgr_waypoints_count">Путевые точки: </string>
   <string name="trackmgr_trackpoints_count">Точки трека: </string>
   <string name="trackmgr_empty">У вас нет треков.</string>
+  <string name="trackmgr_newtrack_hint">Чтобы записать трек,\nнажмите <b>Меню</b> затем <b>Новый трек</b></string>
   <string name="trackmgr_newtrack_error">Невозможно создать новый трек: {0}</string>
-  <string name="trackmgr_contextmenu_stop">Остановить запись</string>
-  <string name="trackmgr_contextmenu_resume">Продолжить запись</string>
+  <string name="trackmgr_continuetrack_hint">В данный момент вы записываете <b>трек #{0}</b>\nДля продолжения выберите его в списке</string>
+  <string name="trackmgr_contextmenu_stop">Остановить запись трека</string>
+  <string name="trackmgr_contextmenu_resume">Продолжить запись трека</string>
   <string name="trackmgr_contextmenu_delete">Удалить</string>
   <string name="trackmgr_contextmenu_export">Экспортировать в GPX</string>
   <string name="trackmgr_contextmenu_osm_upload">Загрузить на OpenStreetMap</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Трек #{0} будет удалён</string>
   <string name="trackmgr_deleteall_confirm">Все треки будут удалены. Вы уверены?</string>
   <string name="trackmgr_exporting">Экспорт трека #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Подготовка экспорта...</string>
   <string name="trackmgr_export_error">Невозможно экспортировать трек: {0}</string>
   <string name="trackmgr_exportall_confirm">Будут экспортированы все треки, что может занять продолжительное время. Вы уверены?</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">Подробная информация, сообщения об ошибках находятся на официальном сайте проекта:</string>
   <string name="about_translate_text">Помочь с переводом OSMTracker:</string>
   <string name="about_debug_info">Отладочная информация</string>
+  <string name="about_export_db">Экспорт базы данных</string>
+  <string name="about_exporting_db">Экспорт базы данных...</string>
+  <string name="about_export_db_result">Результат экспорта базы данных: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker запущен</string>
   <string name="notification_title">OSMTracker запущен (#{0})</string>
@@ -132,4 +138,26 @@
   <string name="various_heading_unknown">Направление не может быть определено</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Отображение трека (OSM)</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Обновить &amp; Установить</string>
+  <string name="buttons_presets_context_menu_delete">Удалить</string>
+  <string name="buttons_presets_updating_layout">Обновление...</string>
+  <string name="buttons_presets_delete_positive_confirmation">Да</string>
+  <string name="buttons_presets_successful_delete">Файл успешно удалён</string>
+  <string name="buttons_presets_icon_directory_deleted">Иконка каталога успешно удалена</string>
+  <string name="buttons_presets_unsuccessful_delete">Файл нельзя удалить</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Ошибка: нет подключения к интернету</string>
+  <string name="available_layouts_connecting_message">(Соединение...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Скачать</string>
+  <string name="available_layouts_not_available_language">Ваш язык недоступен, выберите один из списка</string>
+  <string name="available_layouts_language_dialog_title">Доступные Языки</string>
+  <string name="available_layouts_checking_language_dialog">Проверка доступности языка</string>
+  <string name="available_layouts_downloading_dialog">Загрузка...</string>
+  <string name="available_layouts_null_response_received">Ошибка получения данных с сервера</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">По-умолчанию</string>
+  <string name="github_repository_settings_custom_checkbox">Пользовательские</string>
+  <string name="github_repository_settings_username">Логин Github:</string>
+  <string name="github_repository_settings_repository_name">Имя репозитория:</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings-preferences.xml b/app/src/main/res/values-sk/strings-preferences.xml
index 3e6278f61..091ec3770 100644
--- a/app/src/main/res/values-sk/strings-preferences.xml
+++ b/app/src/main/res/values-sk/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Nastavenia</string>
@@ -13,6 +13,8 @@
   <string name="prefs_gps_logging_interval_summary">Použite 0 pre najkratší možný (Ovplyvní výdrž batérie)</string>
   <string name="prefs_gps_logging_interval_seconds">sekundy</string>
   <string name="prefs_ui">Užívateľské rozhranie</string>
+  <string name="prefs_ui_picture_source">Predvolený zdroj fotografií</string>
+  <string name="prefs_ui_picture_source_summary">Zachytiť fotografie fotoaparátom alebo vybrať z galérie?</string>
   <string-array name="prefs_ui_picture_source_keys">
     <item>Fotoaparát</item>
     <item>Galéria</item>
@@ -20,7 +22,12 @@
   </string-array>
   <string name="prefs_ui_buttons_layout">Rozloženie tlačidiel</string>
   <string name="prefs_ui_buttons_layout_summary">Povoliť určenie vlastného rozloženia tlačidiel (Viď dokumenty)</string>
+  <string name="prefs_ui_buttons_layout_default_section">PREDVOLENÉ ROZLOŽENIE</string>
   <string name="prefs_ui_buttons_layout_defaut">Štandardné</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">STIAHNUTÉ ROZLOŽENIE</string>
+  <string name="prefs_ui_buttons_layout_empty_section">Nemáte stiahnuté žiadne súbory s rozloženiami.</string>
+  <string name="prefs_ui_available_layout">Dostupné rozloženia</string>
+  <string name="prefs_ui_github_repository_settings">Nastavenia repozitára Github</string>
   <string name="prefs_ui_orientation">Orientácia</string>
   <string name="prefs_ui_orientation_summary">Preferovaná orientácia pre obrazovku s tlačidlami</string>
   <string-array name="prefs_ui_orientation_options_keys">
@@ -71,4 +78,16 @@
   <string name="prefs_osm_clear_oauth_data_dialog">Znova sa pokúšate autorizovať OSMTracker, aby mohol nahrávať záznamy stôp. Ste si istý?</string>
   <string name="prefs_map_tile">Poskytovateľ mapových podkladov</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>Žiadne</item>
+    <item>V komentári</item>
+    <item>V rozšírení</item>
+  </string-array>
+  <string name="prefs_compass_heading">Exportovať smerovanie kompasu</string>
+  <string name="prefs_compass_heading_summary">Určiť, či a ako sa majú exportovať údaje kompasu do súboru GPX</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index a0fa08d02..41218ba5e 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -3,41 +3,49 @@
   <!--Generic strings-->
   <string name="app_name">OSMTracker pre Android™</string>
   <string name="app_short_name">OSMTracker</string>
+  <string name="app_description">Inšpirovaný OSMTrackerom pre Windows Mobile vám umožňuje stopovať vaše výlety, označiť významné body (hlasovým záznamom, fotografiami), exportovať ich do formátu GPX na neskoršie použitie s nástrojmi pre Open Street Map, ako je JOSM.</string>
   <!--TrackLogger-->
   <string name="tracklogger">Záznam prejdených trás</string>
   <string name="tracklogger_waiting_gps">Čaká sa na GPS polohu pre povolenie tlačidiel…</string>
   <string name="tracklogger_voicerec_title">Hlasový záznam</string>
-  <string name="tracklogger_voicerec_text">Nahráva sa zvuková stopa pre {0}.</string>
+  <string name="tracklogger_voicerec_text">Zaznamenáva sa zvuková stopa pre {0}.</string>
   <string name="tracklogger_voicerec_stop">Zastaviť</string>
   <string name="tracklogger_btnBack">Späť</string>
   <string name="tracklogger_tracked">Zaznamenané trasy: </string>
   <string name="tracklogger_gps_disabled">GPS vypnuté</string>
   <string name="tracklogger_gps_disabled_hint">GPS je vypnuté. Chcete ho zapnúť ?</string>
   <string name="tracklogger_choose_gallery_camera">Z galérie alebo fotoaparátu?</string>
+  <string name="tracklogger_camera">Zachytiť fotografiu fotoaparátom</string>
+  <string name="tracklogger_gallery">Vybrať fotografiu z galérie</string>
   <!--Waypoint List-->
   <string name="wplist">Zoznam cestovných bodov</string>
   <string name="wplist_latitude">Z. šírka: </string>
   <string name="wplist_longitude">Z. dĺžka: </string>
   <string name="wplist_elevation">Výška: </string>
   <string name="wplist_accuracy">Presnosť: </string>
+  <string name="wplist_compass">Smerovanie kompasu:</string>
+  <string name="wplist_compass_accuracy">Presnosť kompasu:</string>
   <!--Track Manager-->
   <string name="trackmgr">Správca prejdených trás</string>
   <string name="trackmgr_tracklist">Zoznam prejdených trás:</string>
   <string name="trackmgr_waypoints_count">Body trasy: </string>
   <string name="trackmgr_trackpoints_count">Trasové body: </string>
   <string name="trackmgr_empty">Nemáte zaznamenané žiadne prejdené trasy.</string>
+  <string name="trackmgr_newtrack_hint">Pre zaznamenanie trasy,\nstlačte <b>Ponuka</b> potom <b>Nová trasa</b></string>
   <string name="trackmgr_newtrack_error">Nedá sa vytvoriť nový záznam trasy: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Práve zaznamenávate <b>stopu #{0}</b>\nPre pokračovanie ju zvoľte v zozname</string>
   <string name="trackmgr_contextmenu_stop">Zastaviť záznam</string>
   <string name="trackmgr_contextmenu_resume">Pokračovať v zázname</string>
-  <string name="trackmgr_contextmenu_delete">Vymazať</string>
+  <string name="trackmgr_contextmenu_delete">Odstrániť</string>
   <string name="trackmgr_contextmenu_export">Exportovať ako GPX</string>
   <string name="trackmgr_contextmenu_osm_upload">Odoslať na OpenStreetMap</string>
   <string name="trackmgr_contextmenu_display">Zobraziť</string>
   <string name="trackmgr_contextmenu_details">Podrobnosti</string>
   <string name="trackmgr_contextmenu_title">Záznam #{0}</string>
-  <string name="trackmgr_delete_confirm">Záznam #{0} bude vymazaný</string>
+  <string name="trackmgr_delete_confirm">Záznam #{0} bude odstránený</string>
   <string name="trackmgr_deleteall_confirm">Všetky stopy budú zmazané. Pokračovať?</string>
   <string name="trackmgr_exporting">Exportuje sa stopa #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Pripravuje sa export...</string>
   <string name="trackmgr_export_error">Nedá sa exportovať stopa: {0}</string>
   <string name="trackmgr_exportall_confirm">Všetky stop budú exportované, čo môže chvíľu trvať. Pokračovať?</string>
   <!--Track Detail-->
@@ -50,7 +58,7 @@
   <string name="trackdetail_osm_upload_date">Odoslané na OpenStreetMap:</string>
   <string name="trackdetail_btn_export">Exportovať ako GPX</string>
   <string name="trackdetail_export_notyet">(Zatiaľ neexportovaná)</string>
-  <string name="trackdetail_osm_upload_notyet">(Zatiaľ nenahraté)</string>
+  <string name="trackdetail_osm_upload_notyet">(Zatiaľ neodovzdané)</string>
   <string name="trackdetail_export_display">Zobraziť</string>
   <string name="trackdetail_description">Popis</string>
   <string name="trackdetail_tags">Tagy (oddelené čiarkou)</string>
@@ -66,12 +74,13 @@
   <string name="osm_upload_oauth_failed">Nemôžem overiť pripojenie k OSM</string>
   <string name="osm_upload_sending">Posielam stopu #{0}…</string>
   <string name="osm_upload_waiting_response">Čakám na odpoveď OpenStreetMap servera...</string>
-  <string name="osm_upload_error">Počas nahrávania záznamu trasy došlo k chybe</string>
+  <string name="osm_upload_error">Počas odovzdávania záznamu trasy nastala chyba</string>
   <string name="osm_upload_bad_response">Server OSM vrátil chybu: ({0}) správa o chybe {1}</string>
-  <string name="osm_upload_unauthorized">Chyba autorizácie. Chcete vymazať údaje z OpenStreetMap uložené v zariadení?</string>
-  <string name="osm_upload_sucess">Nahrávanie OpenStreetMap bolo úspešné</string>
+  <string name="osm_upload_unauthorized">Chyba autorizácie. Chcete odstrániť poverenia pre OpenStreetMap uložené v zariadení?</string>
+  <string name="osm_upload_sucess">Odovzdávanie do OpenStreetMap bolo úspešné</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Hlasový záznam</string>
+  <string name="gpsstatus_record_stillimage">Zachytiť fotografiu</string>
   <string name="gpsstatus_record_textnote">Písomná poznámka</string>
   <!--Menu-->
   <string name="menu_settings">Nastavenia</string>
@@ -86,7 +95,7 @@
   <string name="menu_save">Uložiť</string>
   <string name="menu_cancel">Zrušiť</string>
   <string name="menu_export">Exportovať ako GPX</string>
-  <string name="menu_osm_upload">Nahrávanie do OpenStreetMap</string>
+  <string name="menu_osm_upload">Odovzdávanie do OpenStreetMap</string>
   <string name="menu_center_to_gps">Centrovať na GPS polohu</string>
   <string name="menu_exportall">Exportovať všetko ako GPX</string>
   <!--Errors-->
@@ -103,6 +112,9 @@
   <string name="about_text">Pre viac informácií, dokumentov a nahlásenie problému, navštívte domovskú stránku projektu:</string>
   <string name="about_translate_text">Pomôžte preložiť OSMTracker:</string>
   <string name="about_debug_info">Ladiace info</string>
+  <string name="about_export_db">Exportovať databázu</string>
+  <string name="about_exporting_db">Exportuje sa databáza...</string>
+  <string name="about_export_db_result">Výsledok exportu databázy: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker stopuje</string>
   <string name="notification_title">OSMTracker stopuje (#{0})</string>
@@ -116,9 +128,46 @@
   <!--Various-->
   <string name="various_unit_meters">m</string>
   <string name="various_accuracy">Presnosť</string>
+  <string name="various_accuracy_with_sats">Presnosť {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <string name="various_waiting_gps_fix">Čaká sa na pozíciu GPS… ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
+  <string name="various_heading">Čaká sa na smerovanie...</string>
+  <string name="various_heading_unknown">Nedá sa zistiť smerovanie</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Zobrazenie OpenStreetMap stopy</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Aktualizovať &amp; Inštalovať</string>
+  <string name="buttons_presets_context_menu_delete">Vymazať</string>
+  <string name="buttons_presets_updating_layout">Aktualizujem...</string>
+  <string name="buttons_presets_successful_update">Rozloženie bolo úspešne aktualizované</string>
+  <string name="buttons_presets_unsuccessful_update">Rozloženie nebolo aktualizované, skúste inokedy</string>
+  <string name="buttons_presets_delete_message">Naozaj chcete vymazať rozloženie {0} ?</string>
+  <string name="buttons_presets_delete_positive_confirmation">Áno</string>
+  <string name="buttons_presets_successful_delete">Súbor bol úspešne vymazaný</string>
+  <string name="buttons_presets_icon_directory_deleted">Priečinok piktogramov bol úspešne vymazaný</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">Tento súbor nemal priradený žiadny priečinok pre priktogramy</string>
+  <string name="buttons_presets_unsuccessful_delete">Súbor nemohol byť vymazaný</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Chyba: nepodarilo sa pripojiť na Internet</string>
+  <string name="available_layouts_response_null_exception">Chyba: nepodarilo sa pripojiť na predvolený repozitár s prisposobenými rozloženiami tlačidiel</string>
+  <string name="available_layouts_connecting_message">(Pripájanie...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Stiahnuť</string>
+  <string name="available_layouts_not_available_language">Váš jazyk nie je dostupný. Vyberte jeden zo zoznamu</string>
+  <string name="available_layouts_language_dialog_title">Dostupné jazyky</string>
+  <string name="available_layouts_checking_language_dialog">Kontrolujú sa miestne verzie jazykov</string>
+  <string name="available_layouts_downloading_dialog">Sťahovanie...</string>
+  <string name="available_layouts_successful_download">Rozloženie bolo úspešne stiahnuté</string>
+  <string name="available_layouts_unsuccessful_download">Rozloženie sa nedá stiahnuť, skúste inokedy</string>
+  <string name="available_layouts_null_response_received">Nastala chyba pri sťahovaní údajov zo servera</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">Predvolené</string>
+  <string name="github_repository_settings_custom_checkbox">Prispôsobené</string>
+  <string name="github_repository_settings_username">Meno používateľa na Githube:</string>
+  <string name="github_repository_settings_repository_name">Názov repozitára:</string>
+  <string name="github_repository_settings_branch_name">Názov vetvy:</string>
+  <string name="github_repository_settings_valid_server">Platný názov Github repozitára</string>
+  <string name="github_repository_settings_invalid_server">Neplatný názov Github repozitára</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings-preferences.xml b/app/src/main/res/values-sl/strings-preferences.xml
index bd21a2cea..9de9be26e 100644
--- a/app/src/main/res/values-sl/strings-preferences.xml
+++ b/app/src/main/res/values-sl/strings-preferences.xml
@@ -10,7 +10,7 @@
   <string name="prefs_gps_ignore_clock">Prezri uro GPS</string>
   <string name="prefs_gps_ignore_clock_summary">Prezri uro GPS in uporabi Androidovo uro za časovne žige</string>
   <string name="prefs_gps_logging_interval">Razmik beleženja GPS</string>
-  <string name="prefs_gps_logging_interval_summary">Uporabite 0 za najmanjši možni (vpliva na porabo energije)</string>
+  <string name="prefs_gps_logging_interval_summary">Uporabite 0 za najmanjši možni razmik (vpliva na porabo energije)</string>
   <string name="prefs_gps_logging_interval_seconds">sekund</string>
   <string name="prefs_ui">Uporabniški vmesnik</string>
   <string name="prefs_ui_picture_source">Privzeti vir fotografij</string>
@@ -21,7 +21,7 @@
     <item>Vedno vprašaj</item>
   </string-array>
   <string name="prefs_ui_buttons_layout">Prednastavitve gumbov</string>
-  <string name="prefs_ui_buttons_layout_summary">Izberi nabor gumbov po meri (glej dokum.)</string>
+  <string name="prefs_ui_buttons_layout_summary">Izberite nabor gumbov po meri (glejte dokumentacijo)</string>
   <string name="prefs_ui_buttons_layout_defaut">Privzeto</string>
   <string name="prefs_ui_orientation">Usmerjenost</string>
   <string name="prefs_ui_orientation_summary">Priljubljena usmerjenost za zaslon z gumbi</string>
@@ -46,11 +46,11 @@
   <string name="prefs_displaytrack_osm_summary">Prikaži zemljevid OpenStreetMap pod sledjo. Zahteva podatkovno povezavo</string>
   <string name="prefs_displaytrack_osm_summary_ask">Vedno prikaži ozadje OpenStreetMap? Zahteva podatkovno povezavo.</string>
   <string name="prefs_output">Nastavitve GPX</string>
-  <string name="prefs_storage_dir">Mapa zunanje pomnilniške naprave (SD)</string>
+  <string name="prefs_storage_dir">Mapa zunanje pom. naprave (SD)</string>
   <string name="prefs_storage_dir_hint">Uveljavljeno za naslednjo sled (ne trenutno)</string>
   <string name="prefs_output_one_dir_per_track">Ena mapa na sled</string>
   <string name="prefs_output_one_dir_per_track_summary">Shrani vsako sled in povezane datoteke v svojo mapo</string>
-  <string name="prefs_output_filename">Ime datoteke za poimenivane sledi</string>
+  <string name="prefs_output_filename">Ime datoteke za poimen. sledi</string>
   <string name="prefs_output_filename_summary">Vzorec imena datoteke, če ima sled ime</string>
   <string-array name="prefs_output_filename_keys">
     <item>Ime sledi</item>
@@ -58,13 +58,13 @@
     <item>Začetni datum in čas</item>
   </string-array>
   <string name="prefs_output_accuracy">Natančnost v datoteki GPX</string>
-  <string name="prefs_output_accuracy_summary">Dodaj podatke o natančnosti v datoteko GPX z imenom točke sledi ali v pripombi točke sledi</string>
+  <string name="prefs_output_accuracy_summary">Dodaj podatke o natančnosti z imenom točke ali v njeni pripombi v datoteko GPX</string>
   <string-array name="prefs_output_accuracy_keys">
     <item>Brez</item>
-    <item>Z imenom točke sledi</item>
-    <item>V pripombi točke sledi</item>
+    <item>Z imenom točke</item>
+    <item>V pripombi točke</item>
   </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">Uporabi probližek HDOP</string>
+  <string name="prefs_output_gpx_hdop_approximation">Uporabi približek HDOP</string>
   <string name="prefs_output_gpx_hdop_approximation_summary">Zapolni HDOP v GPX-u z vrednostjo približka iz natančnosti</string>
   <string name="prefs_sound_enabled">Omogoči zvok</string>
   <string name="prefs_sound_enabled_summary">Predvajaj zvok, ko se snemanje glasu začne in konča</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 0010fe6fb..683884815 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -3,7 +3,7 @@
   <!--Generic strings-->
   <string name="app_name">OSMTracker za Android™</string>
   <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">Ta program, ki ga je navdihnil OSMTracker na sistemu Windows Mobile, vam  omogoča slediti svojim potovanjem, označiti pomembne točke sledi (glasovni posnetek, fotografije) in jih izvozizi v obliko GPX za kasnejšo uporabo z orodji Open Street Map, kot je JOSM.</string>
+  <string name="app_description">Ta program, ki ga je navdihnil OSMTracker na sistemu Windows Mobile, vam  omogoča slediti svojim potovanjem, označiti pomembne točke (glasovni posnetek, fotografije) in jih izvoziti v obliko GPX za kasnejšo uporabo z orodji Open Street Map, kot je JOSM.</string>
   <!--TrackLogger-->
   <string name="tracklogger">Beležnik sledi</string>
   <string name="tracklogger_waiting_gps">Počakajte na določitev lokacije GPS, da omogočite gumbe …</string>
@@ -18,7 +18,7 @@
   <string name="tracklogger_camera">Posnemi fotografijo s fotoaparatom</string>
   <string name="tracklogger_gallery">Izberi fotografijo iz galerije</string>
   <!--Waypoint List-->
-  <string name="wplist">Seznam točk sledi</string>
+  <string name="wplist">Seznam točk</string>
   <string name="wplist_latitude">Zemlj. šir.:</string>
   <string name="wplist_longitude">Zemlj. dol.:</string>
   <string name="wplist_elevation">Nadm. viš.:</string>
@@ -28,10 +28,10 @@
   <!--Track Manager-->
   <string name="trackmgr">Upravitelj sledi</string>
   <string name="trackmgr_tracklist">Seznam sledi:</string>
-  <string name="trackmgr_waypoints_count">Točke poti:</string>
+  <string name="trackmgr_waypoints_count">Točke:</string>
   <string name="trackmgr_trackpoints_count">Točke sledi:</string>
   <string name="trackmgr_empty">Nimate sledi.</string>
-  <string name="trackmgr_newtrack_hint">Ta snemanje sledi\npritisnite <b>Meni</b> in potem <b>Nova sled</b></string>
+  <string name="trackmgr_newtrack_hint">Za snemanje sledi\npritisnite <b>Meni</b> in potem <b>Nova sled</b></string>
   <string name="trackmgr_newtrack_error">Ustvarjanje nove sledi ni mogoče: [0]</string>
   <string name="trackmgr_continuetrack_hint">Trenutno snemate <b>sled št. {0}</b>\nIzberite jo na seznamu, da nadaljujete</string>
   <string name="trackmgr_contextmenu_stop">Ustavi sledenje</string>
@@ -84,7 +84,7 @@
   <string name="gpsstatus_record_textnote">Besedilna opomba</string>
   <!--Menu-->
   <string name="menu_settings">Nastavitve</string>
-  <string name="menu_waypointlist">Točke poti</string>
+  <string name="menu_waypointlist">Točke</string>
   <string name="menu_about">O programu</string>
   <string name="menu_displaytrack">Prikaži sled</string>
   <string name="menu_stoptracking">Ustavi in shrani</string>
@@ -109,7 +109,7 @@
   <string name="gpx_hdop_approximation_cmt">Opozorilo: vrednosti HDOP niso HDOP, kot jih vrne naprava GPS. Približane so iz natančnosti lokacije v metrih.</string>
   <!--About screen-->
   <string name="about">O programu</string>
-  <string name="about_text">Za več podatkov, dokumentacijo in poročila o vprašanjih obiščite domačo stran projekta:</string>
+  <string name="about_text">Za več podatkov, dokumentacijo in poročil o težavah obiščite domačo stran projekta:</string>
   <string name="about_translate_text">Pomagajte prevesti OSMTracker:</string>
   <string name="about_debug_info">Podatki o razhroščevanju</string>
   <string name="about_export_db">Izvozi podatkovno zbirko</string>
@@ -117,8 +117,8 @@
   <string name="about_export_db_result">Rezultat izvoza podatkovne zbirke: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker sledi</string>
-  <string name="notification_title">OSMTracker seldi (#{0})</string>
-  <string name="notification_text">Tapnite tukaj, da prikažete glavni zaslon</string>
+  <string name="notification_title">OSMTracker sledi (št. {0})</string>
+  <string name="notification_text">Tapnite tukaj, da prikažete gl. zaslon</string>
   <!--Display track-->
   <string name="displaytrack">Prikaži sled</string>
   <string name="displaytrack_map">Prikaži zemljevid ozadja</string>
@@ -138,4 +138,7 @@
   <string name="various_heading_unknown">Smeri ni mogoče določiti</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Prikaz sledi OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-sq/accessibility.xml b/app/src/main/res/values-sq/accessibility.xml
new file mode 100644
index 000000000..73a5275c2
--- /dev/null
+++ b/app/src/main/res/values-sq/accessibility.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About screen-->
+  <string name="acc.osmtracker_logo">Logo e OSMGjurmues-it</string>
+  <!--Zoom in/out in map view-->
+  <string name="acc.zoom_in">Zmadho pamjen</string>
+  <string name="acc.zoom_out">Zvogëlo pamjen</string>
+  <!--GPS status bar-->
+  <string name="acc.sat_indicator">Treguesi \"Fortësia e sinjalit satelitorë\"</string>
+  <string name="acc.record_indicator">Treguesi \"Duke inçizuar\"</string>
+  <!--Track list-->
+  <string name="acc.track_status">Treguesi \"Gjëndja e gjurmës\"</string>
+  <string name="acc.upload_status">Treguesi \"Gjëndja e ngarkimit në OpenStreetMap\"</string>
+</resources>
diff --git a/app/src/main/res/values-sq/strings-preferences.xml b/app/src/main/res/values-sq/strings-preferences.xml
new file mode 100644
index 000000000..cc2bd985b
--- /dev/null
+++ b/app/src/main/res/values-sq/strings-preferences.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Preferences-->
+  <string name="prefs_map_tile_summary"></string>
+</resources>
diff --git a/app/src/main/res/values-sq/strings-tags.xml b/app/src/main/res/values-sq/strings-tags.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/app/src/main/res/values-sq/strings-tags.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
new file mode 100644
index 000000000..e779edd5e
--- /dev/null
+++ b/app/src/main/res/values-sq/strings.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Generic strings-->
+  <!--TrackLogger-->
+  <!--Waypoint List-->
+  <!--Track Manager-->
+  <!--Track Detail-->
+  <!--OSM upload-->
+  <!--GPS Status & record bar-->
+  <!--Menu-->
+  <!--Errors-->
+  <!--GPX-->
+  <!--About screen-->
+  <!--Notification-->
+  <!--Display track-->
+  <!--Track detail-->
+  <!--Various-->
+  <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <!--parameters: (used sats, visible sats)-->
+  <!--parameters: (heading in degrees)-->
+  <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
+</resources>
diff --git a/app/src/main/res/values-sq/waypoints.xml b/app/src/main/res/values-sq/waypoints.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/app/src/main/res/values-sq/waypoints.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/app/src/main/res/values-sr/strings-preferences.xml b/app/src/main/res/values-sr/strings-preferences.xml
index 8274a7129..52c40bed1 100644
--- a/app/src/main/res/values-sr/strings-preferences.xml
+++ b/app/src/main/res/values-sr/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Поставке</string>
@@ -11,7 +11,7 @@
   <string name="prefs_gps_ignore_clock_summary">Занемари GPS часовник и користи Андроидов за времена</string>
   <string name="prefs_gps_logging_interval">Учестаност GPS записа</string>
   <string name="prefs_gps_logging_interval_summary">Користи 0 за најкраће могуће (утиче на батерију)</string>
-  <string name="prefs_gps_logging_interval_seconds">сек.</string>
+  <string name="prefs_gps_logging_interval_seconds">сек</string>
   <string name="prefs_ui">Сучеље</string>
   <string name="prefs_ui_picture_source">Подразумевани извор слика</string>
   <string name="prefs_ui_picture_source_summary">Слике са камере или из галерије?</string>
@@ -47,7 +47,7 @@
   <string name="prefs_displaytrack_osm_summary_ask">Увек да прикажем мапу у позадини? Морате бити повезани.</string>
   <string name="prefs_output">GPX поставке</string>
   <string name="prefs_storage_dir">Директоријум спољног складишта</string>
-  <string name="prefs_storage_dir_hint">Има утицаја на следеће праћење (не на текуће)</string>
+  <string name="prefs_storage_dir_hint">Односи се на наредно праћење (не на текуће)</string>
   <string name="prefs_output_one_dir_per_track">Један директоријум по праћењу</string>
   <string name="prefs_output_one_dir_per_track_summary">Сачувај свако праћење и његове фајлове у сопствени директоријум</string>
   <string name="prefs_output_filename">Назив фајла за праћења</string>
@@ -79,9 +79,9 @@
     <item>MapQuest Open</item>
   </string-array>
   <string-array name="prefs_compass_heading_keys">
-    <item>без</item>
-    <item>у коментару</item>
-    <item>у проширењу</item>
+    <item>Без усмерења</item>
+    <item>У коментару</item>
+    <item>У проширењу</item>
   </string-array>
   <string name="prefs_compass_heading">Извоз усмерења компаса</string>
   <string name="prefs_compass_heading_summary">Одређује да ли ће и како подаци компаса бити извезени у GPX фајл</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 8a2fcdbd5..9ad831ee8 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Тачки пролаза:</string>
   <string name="trackmgr_trackpoints_count">Тачки праћења:</string>
   <string name="trackmgr_empty">Нема праћења.</string>
+  <string name="trackmgr_newtrack_hint">Да снимите путању,\nпритисните <b>Мени</b> и онда <b>Нова путања</b></string>
   <string name="trackmgr_newtrack_error">Не могу да направим ново праћење: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Тренутно снимате <b>путању #{0}</b>\nИзаберите је у листи да наставите</string>
   <string name="trackmgr_contextmenu_stop">Заустави праћење</string>
   <string name="trackmgr_contextmenu_resume">Настави праћење</string>
   <string name="trackmgr_contextmenu_delete">Обриши</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Праћење #{0} биће избрисано</string>
   <string name="trackmgr_deleteall_confirm">Сва праћења биће обрисана. Сигурни сте?</string>
   <string name="trackmgr_exporting">Извозим праћење #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Припремам извоз...</string>
   <string name="trackmgr_export_error">Не могу да извезем праћење: {0}</string>
   <string name="trackmgr_exportall_confirm">Биће извезена сва праћења. То може да потраје. Сигурни сте?</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">За више информација, документацију и пријаве проблема, посетите страницу пројекта:</string>
   <string name="about_translate_text">Помогли у превођењу:</string>
   <string name="about_debug_info">Подаци за отклањање грешака</string>
+  <string name="about_export_db">Извоз базе података</string>
+  <string name="about_exporting_db">Извозим базу података...</string>
+  <string name="about_export_db_result">Резултат извоза: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSM пратилац ради</string>
   <string name="notification_title">OSM пратилац прати (#{0})</string>
@@ -132,4 +138,7 @@
   <string name="various_heading_unknown">Правац се не може одредити</string>
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap приказ праћења</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-sv/strings-preferences.xml b/app/src/main/res/values-sv/strings-preferences.xml
index abd9b2c74..209e185be 100644
--- a/app/src/main/res/values-sv/strings-preferences.xml
+++ b/app/src/main/res/values-sv/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Inställningar</string>
@@ -22,16 +22,21 @@
   </string-array>
   <string name="prefs_ui_buttons_layout">Knapplayout</string>
   <string name="prefs_ui_buttons_layout_summary">Tillåt egendefinierade knapplayouter (se dokumentationen).</string>
+  <string name="prefs_ui_buttons_layout_default_section">STANDARDLAYOUT</string>
   <string name="prefs_ui_buttons_layout_defaut">Standard</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">NEDLADDAD LAYOUT</string>
+  <string name="prefs_ui_buttons_layout_empty_section">Du har inga nedladdade layoutfiler</string>
+  <string name="prefs_ui_available_layout">Tillgängliga layouter</string>
+  <string name="prefs_ui_github_repository_settings">Inställningar för Github Repository</string>
   <string name="prefs_ui_orientation">Orientering</string>
   <string name="prefs_ui_orientation_summary">Orientering av knappskärmen du föredrar</string>
   <string-array name="prefs_ui_orientation_options_keys">
     <item>Automatisk</item>
-    <item>Porträtt</item>
-    <item>Landskap</item>
+    <item>Stående</item>
+    <item>Liggande</item>
   </string-array>
   <string name="prefs_voicerec_duration">Längd på röstnoteringar</string>
-  <string name="prefs_voicerec_duration_seconds">sekunder.</string>
+  <string name="prefs_voicerec_duration_seconds">sekunder</string>
   <string name="prefs_theme">Utseende/tema</string>
   <string name="prefs_theme_summary">Applikationen måste startas om innan ändringarna syns.</string>
   <string-array name="prefs_theme_keys">
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c73f35df8..f5dc56eb1 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -27,15 +27,17 @@
   <string name="wplist_compass_accuracy">Ber. noggr.:</string>
   <!--Track Manager-->
   <string name="trackmgr">Spårhantering</string>
-  <string name="trackmgr_tracklist">Spårlista</string>
+  <string name="trackmgr_tracklist">Spårlista:</string>
   <string name="trackmgr_waypoints_count">Vägpunkter: </string>
   <string name="trackmgr_trackpoints_count">Spårpunkter: </string>
-  <string name="trackmgr_empty">Du har inga spår</string>
+  <string name="trackmgr_empty">Du har inga spår.</string>
+  <string name="trackmgr_newtrack_hint">För att spela in ett nytt spår,\ntryck <b>Meny</b> och sedan <b>Nytt spår</b></string>
   <string name="trackmgr_newtrack_error">Kan inte skapa nytt spår: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Du spelar just nu in <b>spår #{0}</b>\nVälj det i listan för att fortsätta</string>
   <string name="trackmgr_contextmenu_stop">Stoppa inspelning</string>
   <string name="trackmgr_contextmenu_resume">Återuppta inspelning</string>
   <string name="trackmgr_contextmenu_delete">Radera</string>
-  <string name="trackmgr_contextmenu_export">Export till GPX</string>
+  <string name="trackmgr_contextmenu_export">Exportera som GPX</string>
   <string name="trackmgr_contextmenu_osm_upload">Ladda upp till OpenStreetMap</string>
   <string name="trackmgr_contextmenu_display">Visa spår på skärm</string>
   <string name="trackmgr_contextmenu_details">Visa detaljer</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Spår #{0} kommer att raderas</string>
   <string name="trackmgr_deleteall_confirm">Alla spår kommer att tas bort. Är du säker?</string>
   <string name="trackmgr_exporting">Exporterar spår #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Förbereder export...</string>
   <string name="trackmgr_export_error">Kan inte exportera spår: {0}</string>
   <string name="trackmgr_exportall_confirm">Alla spår kommer att exporteras vilket kan ta lång tid. Är du säker?</string>
   <!--Track Detail-->
@@ -52,8 +55,8 @@
   <string name="trackdetail_startloc">Startpunkt:</string>
   <string name="trackdetail_endloc">Slutpunkt:</string>
   <string name="trackdetail_exportdate">Exporterad:</string>
-  <string name="trackdetail_osm_upload_date">Ladda upp till OpenStreetMap</string>
-  <string name="trackdetail_btn_export">Exportera GPX</string>
+  <string name="trackdetail_osm_upload_date">Uppladdad till OpenStreetMap</string>
+  <string name="trackdetail_btn_export">Exportera som GPX</string>
   <string name="trackdetail_export_notyet">(Inte exporterad ännu)</string>
   <string name="trackdetail_osm_upload_notyet">(inte uppladdad än)</string>
   <string name="trackdetail_export_display">Visa</string>
@@ -73,7 +76,7 @@
   <string name="osm_upload_waiting_response">Väntar på att OpenStreetMap-servern ska svara...</string>
   <string name="osm_upload_error">Fel vid uppladdning av spår</string>
   <string name="osm_upload_bad_response">OSM-servern returnerade ett fel: ({0}) meddelande {1}</string>
-  <string name="osm_upload_unauthorized">Inloggningsfel. Vill du ta bort sparas inloggningsdata till OpenStreetMap</string>
+  <string name="osm_upload_unauthorized">Inloggningsfel. Vill du ta bort sparade inloggningsdata till OpenStreetMap</string>
   <string name="osm_upload_sucess">Uppladdning till OpenStreetMap klar</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Röstnotering</string>
@@ -91,12 +94,12 @@
   <string name="menu_stopcurrenttrack">Stoppa aktuellt spår</string>
   <string name="menu_save">Spara</string>
   <string name="menu_cancel">Avbryt</string>
-  <string name="menu_export">Exportera GPX</string>
+  <string name="menu_export">Exportera som GPX</string>
   <string name="menu_osm_upload">OpenStreetMap-uppladdning</string>
   <string name="menu_center_to_gps">Centrera till GPS</string>
   <string name="menu_exportall">Exportera alla som GPX</string>
   <!--Errors-->
-  <string name="error_externalstorage_not_writable">Det gick inte att skriva till lagringsutrymmet.</string>
+  <string name="error_externalstorage_not_writable">Det gick inte att skriva till det minneskortet.</string>
   <string name="error_create_track_dir">Kunde inte skapa spårmapp %s</string>
   <string name="error_externalstorage_not_writable_hint">Kontrollera att minneskortet är korrekt isatt och fungerar.</string>
   <string name="error_voicerec_failed">Röstinspelningen misslyckades</string>
@@ -109,9 +112,12 @@
   <string name="about_text">För mer information, dokumentation och felrapportering, besök projektets hemsida:</string>
   <string name="about_translate_text">Hjälp till att översätta OSMTracker:</string>
   <string name="about_debug_info">Felsökningsinfo</string>
+  <string name="about_export_db">Exportera databas</string>
+  <string name="about_exporting_db">Exporterar databas...</string>
+  <string name="about_export_db_result">Resultat av databasexport: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker körs fortfarande</string>
-  <string name="notification_title">OSMTracker körs fortfarande</string>
+  <string name="notification_title">OSMTracker körs fortfarande  (#{0})</string>
   <string name="notification_text">Tryck för att visa startskärmen</string>
   <!--Display track-->
   <string name="displaytrack">Visa spår</string>
@@ -132,4 +138,36 @@
   <string name="various_heading_unknown">Riktning kan inte bestämmas</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Spårvisning med OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">Uppdatera &amp; installera</string>
+  <string name="buttons_presets_context_menu_delete">Ta bort</string>
+  <string name="buttons_presets_updating_layout">Uppdaterar...</string>
+  <string name="buttons_presets_successful_update">Layout har uppdaterats</string>
+  <string name="buttons_presets_unsuccessful_update">Layout uppdaterades ej, försök igen senare</string>
+  <string name="buttons_presets_delete_message">Är du säker på att du vill ta bort layouten {0}?</string>
+  <string name="buttons_presets_delete_positive_confirmation">Ja</string>
+  <string name="buttons_presets_successful_delete">Filen har tagits bort</string>
+  <string name="buttons_presets_icon_directory_deleted">ikon-katalog har tagits bort</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">Denna fil har inte någon ikon-katalog associerad</string>
+  <string name="buttons_presets_unsuccessful_delete">Filen kunde inte tas bort</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">Fel: kunde inte ansluta till internet</string>
+  <string name="available_layouts_response_null_exception">Fel: kunde inte ansluta till standard-repository för anpassade layouter</string>
+  <string name="available_layouts_connecting_message">(Ansluter...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">Ladda ned</string>
+  <string name="available_layouts_not_available_language">Ditt språk finns inte tillgängligt, välj ett från listan</string>
+  <string name="available_layouts_language_dialog_title">Tillgängliga språk</string>
+  <string name="available_layouts_checking_language_dialog">Kontrollerar lokal språkversioner</string>
+  <string name="available_layouts_downloading_dialog">Laddar ned...</string>
+  <string name="available_layouts_successful_download">Layouten har laddats ned</string>
+  <string name="available_layouts_unsuccessful_download">Layouten kan inte laddas ned, försök igen senare</string>
+  <string name="available_layouts_null_response_received">Fel vid hämtning av data från server</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">Standard</string>
+  <string name="github_repository_settings_custom_checkbox">Anpassad</string>
+  <string name="github_repository_settings_username">Github-användare: </string>
+  <string name="github_repository_settings_repository_name">Repository-namn:</string>
+  <string name="github_repository_settings_branch_name">Branch-namn: </string>
+  <string name="github_repository_settings_valid_server">Github Repository giltigt</string>
+  <string name="github_repository_settings_invalid_server">Github Repository felaktigt</string>
 </resources>
diff --git a/app/src/main/res/values-ta/strings-preferences.xml b/app/src/main/res/values-ta/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-ta/strings-preferences.xml
+++ b/app/src/main/res/values-ta/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index a276dfca4..24ea9d93a 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -78,4 +78,7 @@
   <!--parameters: (used sats, visible sats)-->
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-th/strings-preferences.xml b/app/src/main/res/values-th/strings-preferences.xml
index e83b9b85f..cc2bd985b 100644
--- a/app/src/main/res/values-th/strings-preferences.xml
+++ b/app/src/main/res/values-th/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs_map_tile_summary"></string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 6f771cdaf..9a1ff9f57 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -71,4 +71,7 @@
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
   <string name="displaytrackmap">OpenStreetMap แสดงเส้นทาง</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings-preferences.xml b/app/src/main/res/values-tr-rTR/strings-preferences.xml
index 26dbd1231..717c93a4e 100644
--- a/app/src/main/res/values-tr-rTR/strings-preferences.xml
+++ b/app/src/main/res/values-tr-rTR/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Tercihler</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 39fc49f63..4c07342b0 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -100,4 +100,7 @@
   <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
   <!--OSM map view-->
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-uk/strings-preferences.xml b/app/src/main/res/values-uk/strings-preferences.xml
index c90f4f1cb..ea0c63ca2 100644
--- a/app/src/main/res/values-uk/strings-preferences.xml
+++ b/app/src/main/res/values-uk/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Налаштування</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2a01aacfb..033c762bb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Дорожні точки:</string>
   <string name="trackmgr_trackpoints_count">Точки шляху:</string>
   <string name="trackmgr_empty">У вас не має  шляхів.</string>
+  <string name="trackmgr_newtrack_hint">Для запису доріжки\nнатисніть <b>Меню</b>, а потім <b>Нова доріжка</b></string>
   <string name="trackmgr_newtrack_error">Неможливо створити новий шлях:{0}</string>
+  <string name="trackmgr_continuetrack_hint">Наразі ви записуєте <b>доріжку #{0}</b>\nВиберіть її у списку для продовження</string>
   <string name="trackmgr_contextmenu_stop">Зупинити запис</string>
   <string name="trackmgr_contextmenu_resume">Продовжити запис</string>
   <string name="trackmgr_contextmenu_delete">Вилучити</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Шлях #{0} буде видалено</string>
   <string name="trackmgr_deleteall_confirm">Усі шляхи буде вилучено. Ви впевнені?</string>
   <string name="trackmgr_exporting">Експорт шляху #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Підготовка експорту…</string>
   <string name="trackmgr_export_error">Неможливо експортувати шлях:{0}…</string>
   <string name="trackmgr_exportall_confirm">Буде експортовано усі шляхи, що може зайняти тривалий час.</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">Детальна інформація, повідомлення про помилки знаходяться на офіційному сайті проекту:</string>
   <string name="about_translate_text">Допомогти з перекладом OSMTracker:</string>
   <string name="about_debug_info">Налагоджувальна інформація</string>
+  <string name="about_export_db">Експортувати базу даних</string>
+  <string name="about_exporting_db">Експортується база даних…</string>
+  <string name="about_export_db_result">Результат експорту бази даних: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker запущено</string>
   <string name="notification_title">OSMTracker запущено (#{0})</string>
@@ -132,4 +138,7 @@
   <string name="various_heading_unknown">Напрямок не можна визначити</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Відображення шляху OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-v11/strings.xml b/app/src/main/res/values-v11/strings.xml
index e27844d4c..a21951043 100644
--- a/app/src/main/res/values-v11/strings.xml
+++ b/app/src/main/res/values-v11/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="trackmgr_newtrack_hint">To record a track,\npress <b>New track</b></string>
+    <string name="trackmgr_newtrack_hint">To record a track, press </string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings-preferences.xml b/app/src/main/res/values-vi/strings-preferences.xml
index 6f03bf3a9..43adc4686 100644
--- a/app/src/main/res/values-vi/strings-preferences.xml
+++ b/app/src/main/res/values-vi/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">Tùy chọn</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 9f28a8662..bb5d7d7e3 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -31,7 +31,9 @@
   <string name="trackmgr_waypoints_count">Tọa độ điểm:</string>
   <string name="trackmgr_trackpoints_count">Điểm tuyến đường:</string>
   <string name="trackmgr_empty">Bạn chưa có tuyến đường.</string>
+  <string name="trackmgr_newtrack_hint">Để ghi tuyến đường mới,\nbấm <b>Trình đơn</b> rồi <b>Tuyến đường mới</b></string>
   <string name="trackmgr_newtrack_error">Không thể tạo tuyến đường mới: {0}</string>
+  <string name="trackmgr_continuetrack_hint">Bạn hiện đang ghi <b>tuyến đường #{0}</b>\nChọn nó trong danh sách để tiếp tục</string>
   <string name="trackmgr_contextmenu_stop">Dừng theo dõi</string>
   <string name="trackmgr_contextmenu_resume">Tiếp tục theo dõi</string>
   <string name="trackmgr_contextmenu_delete">Xóa</string>
@@ -43,6 +45,7 @@
   <string name="trackmgr_delete_confirm">Tuyến đường #{0} sẽ bị xóa</string>
   <string name="trackmgr_deleteall_confirm">Bạn có chắc chắn muốn xóa tất cả các tuyến đường?</string>
   <string name="trackmgr_exporting">Đang xuất tuyến đường #{0}…</string>
+  <string name="trackmgr_exporting_prepare">Đang chuẩn bị xuất…</string>
   <string name="trackmgr_export_error">Không thể xuất tuyến đường: {0}</string>
   <string name="trackmgr_exportall_confirm">Việc xuất tất cả các tuyến đường sẽ được xuất có thể mất nhiều thời gian. Bạn có chắc chắn muốn tiếp tục?</string>
   <!--Track Detail-->
@@ -109,6 +112,9 @@
   <string name="about_text">Để biết thêm thông tin, đọc tài liệu, và báo cáo lỗi, xin vui lòng ghé vào trang chủ dự án:</string>
   <string name="about_translate_text">Giúp biên dịch OSMTracker:</string>
   <string name="about_debug_info">Thông tin gỡ lỗi</string>
+  <string name="about_export_db">Xuất cơ sở dữ liệu</string>
+  <string name="about_exporting_db">Đang xuất cơ sở dữ liệu…</string>
+  <string name="about_export_db_result">Kết quả xuất cơ sở dữ liệu: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker đang theo dõi</string>
   <string name="notification_title">OSMTracker đang theo dõi (#{0})</string>
@@ -132,4 +138,7 @@
   <string name="various_heading_unknown">Không thể xác định hướng</string>
   <!--OSM map view-->
   <string name="displaytrackmap">Hiển thị tuyến đường OpenStreetMap</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings-preferences.xml b/app/src/main/res/values-zh-rCN/strings-preferences.xml
index c997e390d..cc94a1fb1 100644
--- a/app/src/main/res/values-zh-rCN/strings-preferences.xml
+++ b/app/src/main/res/values-zh-rCN/strings-preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">设置</string>
@@ -13,6 +13,13 @@
   <string name="prefs_gps_logging_interval_summary">填0代表最小的可能时间间隔(会影响电池续航时长)</string>
   <string name="prefs_gps_logging_interval_seconds">秒</string>
   <string name="prefs_ui">用户界面</string>
+  <string name="prefs_ui_picture_source">默认图片源</string>
+  <string name="prefs_ui_picture_source_summary">拍照还是从相册中选择图片？</string>
+  <string-array name="prefs_ui_picture_source_keys">
+    <item>相机</item>
+    <item>图库</item>
+    <item>总是询问</item>
+  </string-array>
   <string name="prefs_ui_buttons_layout">按钮预设</string>
   <string name="prefs_ui_buttons_layout_summary">选择一套自定义按钮(参见文档)</string>
   <string name="prefs_ui_buttons_layout_defaut">默认</string>
@@ -37,6 +44,7 @@
   <string name="prefs_display_always_on_summary">记录轨迹时屏幕常亮。关闭以节约电量</string>
   <string name="prefs_displaytrack_osm">背景地图</string>
   <string name="prefs_displaytrack_osm_summary">在轨迹下显示OpenStreetMap。需要数据连接</string>
+  <string name="prefs_displaytrack_osm_summary_ask">总是显示 OpenStreetMap 背景？需要数据连接。</string>
   <string name="prefs_output">GPX设置</string>
   <string name="prefs_storage_dir">外部存储设备(SD卡)路径</string>
   <string name="prefs_storage_dir_hint">下次追踪生效(本次无效)</string>
@@ -58,6 +66,14 @@
   </string-array>
   <string name="prefs_output_gpx_hdop_approximation">使用HDOP估算</string>
   <string name="prefs_sound_enabled">开启声音</string>
+  <string name="prefs_sound_enabled_summary">在录音开始、结束时发出声响</string>
   <string name="prefs_osm_clear_oauth_data">重设 OSM 验证</string>
+  <string name="prefs_osm_clear_oauth_data_dialog">你将要再次授权 OSMTracker 来上传轨迹。确定吗？</string>
+  <string name="prefs_map_tile">地图提供商</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a96dd91c0..f8d7b77b9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -23,13 +23,17 @@
   <string name="wplist_longitude">经度：</string>
   <string name="wplist_elevation">海拔：</string>
   <string name="wplist_accuracy">精度：</string>
+  <string name="wplist_compass">指南针朝向：</string>
+  <string name="wplist_compass_accuracy">指南针精度：</string>
   <!--Track Manager-->
   <string name="trackmgr">轨迹管理器</string>
   <string name="trackmgr_tracklist">轨迹列表：</string>
   <string name="trackmgr_waypoints_count">路点：</string>
   <string name="trackmgr_trackpoints_count">追踪点：</string>
   <string name="trackmgr_empty">您没有任何轨迹。</string>
+  <string name="trackmgr_newtrack_hint">要录制轨迹，\n按下 <b>菜单</b> 然后 <b>新建轨迹</b></string>
   <string name="trackmgr_newtrack_error">无法创建踪迹: {0}</string>
+  <string name="trackmgr_continuetrack_hint">你正在录制 <b>轨迹 #{0}</b>\n在列表中选择它以继续</string>
   <string name="trackmgr_contextmenu_stop">停止记录</string>
   <string name="trackmgr_contextmenu_resume">恢复追踪</string>
   <string name="trackmgr_contextmenu_delete">删除</string>
@@ -41,6 +45,7 @@
   <string name="trackmgr_delete_confirm">踪迹#{0}将被删除</string>
   <string name="trackmgr_deleteall_confirm">确定删除所有踪迹吗?</string>
   <string name="trackmgr_exporting">导出踪迹#{0}…</string>
+  <string name="trackmgr_exporting_prepare">正准备导出…</string>
   <string name="trackmgr_export_error">不能导出踪迹: {0}</string>
   <string name="trackmgr_exportall_confirm">所有已录制的轨迹都将被导出，这要花费较长的时间。您确定要这样做？</string>
   <!--Track Detail-->
@@ -107,6 +112,9 @@
   <string name="about_text">更多详细信息、文档和报告，请参阅项目主页：</string>
   <string name="about_translate_text">帮助翻译 OSMTracker:</string>
   <string name="about_debug_info">调试信息</string>
+  <string name="about_export_db">导出数据库</string>
+  <string name="about_exporting_db">正导出数据库…</string>
+  <string name="about_export_db_result">数据库导出结果：%s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker 正在记录轨迹</string>
   <string name="notification_title">OSMTracker 正在记录踪迹 (#{0})</string>
@@ -130,4 +138,7 @@
   <string name="various_heading_unknown">前进方向无法确定</string>
   <!--OSM map view-->
   <string name="displaytrackmap">以 OpenStreetMap 显示轨迹</string>
+  <!--Buttons presets messages-->
+  <!--Available Layouts messages-->
+  <!--Github Repository Settings-->
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings-preferences.xml b/app/src/main/res/values-zh-rTW/strings-preferences.xml
index 03466a471..cbb92a7b0 100644
--- a/app/src/main/res/values-zh-rTW/strings-preferences.xml
+++ b/app/src/main/res/values-zh-rTW/strings-preferences.xml
@@ -1,18 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Preferences-->
   <string name="prefs">設定</string>
   <string name="prefs_gps">GPS</string>
   <string name="prefs_gps_os_settings">GPS 設定</string>
-  <string name="prefs_gps_os_settings_summary">顯示系統 GPS 設定功能頁</string>
+  <string name="prefs_gps_os_settings_summary">顯示系統 GPS 設定畫面</string>
   <string name="prefs_check_gps_startup">在啟動時檢查 GPS 狀態</string>
-  <string name="prefs_check_gps_startup_summary">在程式啟動時檢查 GPS 是否關閉，並提示啟用它。</string>
-  <string name="prefs_gps_ignore_clock">忽略從 GPS 得到的時鐘數值</string>
-  <string name="prefs_gps_ignore_clock_summary">忽略從 GPS 得到的時鐘數值，改用 Android 系統本身的時鐘數值來計算時間戳記</string>
+  <string name="prefs_check_gps_startup_summary">啟動時檢查 GPS 是否關閉並提示開啟。</string>
+  <string name="prefs_gps_ignore_clock">忽略 GPS 的時間</string>
+  <string name="prefs_gps_ignore_clock_summary">忽略 GPS 的時間，改用 Android 系統時間</string>
   <string name="prefs_gps_logging_interval">GPS 記錄頻率</string>
-  <string name="prefs_gps_logging_interval_summary">若使用 0 則會盡可能頻繁地記錄資料 (同時會影響電池續航時間)</string>
+  <string name="prefs_gps_logging_interval_summary">使用 0 會盡可能的記錄資料 (會影響電池續航力)</string>
   <string name="prefs_gps_logging_interval_seconds">秒</string>
-  <string name="prefs_ui">使用介面</string>
+  <string name="prefs_ui">使用者介面</string>
+  <string name="prefs_ui_picture_source">預設照片來源</string>
+  <string name="prefs_ui_picture_source_summary">拍張照或從相簿挑選？</string>
   <string-array name="prefs_ui_picture_source_keys">
     <item>相機</item>
     <item>相簿</item>
@@ -20,9 +22,14 @@
   </string-array>
   <string name="prefs_ui_buttons_layout">按鍵配置</string>
   <string name="prefs_ui_buttons_layout_summary">選擇自訂的按鍵配置 (參見文件)</string>
-  <string name="prefs_ui_buttons_layout_defaut">預設配置</string>
+  <string name="prefs_ui_buttons_layout_default_section">預設樣式</string>
+  <string name="prefs_ui_buttons_layout_defaut">預設</string>
+  <string name="prefs_ui_buttons_layout_downloaded_section">下載樣式</string>
+  <string name="prefs_ui_buttons_layout_empty_section">你沒有下載樣式檔</string>
+  <string name="prefs_ui_available_layout">可用的樣式</string>
+  <string name="prefs_ui_github_repository_settings">Github 程式庫設定</string>
   <string name="prefs_ui_orientation">排列方向</string>
-  <string name="prefs_ui_orientation_summary">喜好的功能鈕介面排列方向</string>
+  <string name="prefs_ui_orientation_summary">偏好的功能鈕介面排列方向</string>
   <string-array name="prefs_ui_orientation_options_keys">
     <item>自動</item>
     <item>直立</item>
@@ -62,7 +69,7 @@
     <item>於航點名稱內</item>
     <item>於航點註解中</item>
   </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">使用 HDOP （水平2D坐標精度因子）近似值</string>
+  <string name="prefs_output_gpx_hdop_approximation">使用 HDOP 近似值</string>
   <string name="prefs_output_gpx_hdop_approximation_summary">在 GPX 檔中填入 HDOP 近似值</string>
   <string name="prefs_sound_enabled">使用聲音</string>
   <string name="prefs_sound_enabled_summary">當錄製語音期間可播放聲音</string>
@@ -71,4 +78,16 @@
   <string name="prefs_osm_clear_oauth_data_dialog">您必須重新認證 OSMTracker 方能繼續上傳軌跡資料，確定嗎？</string>
   <string name="prefs_map_tile">地圖圖塊的提供來源</string>
   <string name="prefs_map_tile_summary"></string>
+  <string-array name="prefs_map_tile_keys">
+    <item>Mapnik</item>
+    <item>Cycle Map</item>
+    <item>MapQuest Open</item>
+  </string-array>
+  <string-array name="prefs_compass_heading_keys">
+    <item>無</item>
+    <item>於註解</item>
+    <item>於副檔名</item>
+  </string-array>
+  <string name="prefs_compass_heading">匯出羅盤方位</string>
+  <string name="prefs_compass_heading_summary">定義羅盤資料要如何匯出到 GPX 檔案</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 44acbc032..605ee6948 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -3,27 +3,37 @@
   <!--Generic strings-->
   <string name="app_name">OSMTracker for Android™</string>
   <string name="app_short_name">OSMTracker</string>
+  <string name="app_description">受到 Windows Mobile 的啟發，此 APP 可讓您記錄您的旅程，標記明顯的地標 (透過錄音、照片)，並匯出成為 GPX 格式供 Open Streep Map 工具使用，如：JOSM。</string>
   <!--TrackLogger-->
   <string name="tracklogger">軌跡記錄器</string>
-  <string name="tracklogger_voicerec_title">錄製語音</string>
-  <string name="tracklogger_voicerec_text">錄製一段{0}秒的聲音片段。</string>
+  <string name="tracklogger_waiting_gps">等待 GPS 修正以開啟按鈕...</string>
+  <string name="tracklogger_voicerec_title">錄音</string>
+  <string name="tracklogger_voicerec_text">錄製一段 {0} 秒的聲音片段。</string>
   <string name="tracklogger_voicerec_stop">停止</string>
   <string name="tracklogger_btnBack">返回</string>
   <string name="tracklogger_tracked">記錄了：</string>
   <string name="tracklogger_gps_disabled">GPS 目前是關閉的</string>
-  <string name="tracklogger_gps_disabled_hint">GPS 目前是關閉的，您想要啟用它嗎？</string>
+  <string name="tracklogger_gps_disabled_hint">GPS 目前是關閉的，您想要開啟它嗎？</string>
   <string name="tracklogger_choose_gallery_camera">使用相簿或相機？</string>
+  <string name="tracklogger_camera">使用相機拍照</string>
+  <string name="tracklogger_gallery">從相簿中選擇照片</string>
   <!--Waypoint List-->
-  <string name="wplist">航點(Waypoint)列表</string>
+  <string name="wplist">航點清單</string>
   <string name="wplist_latitude">緯度：</string>
   <string name="wplist_longitude">經度：</string>
+  <string name="wplist_elevation">海拔：</string>
+  <string name="wplist_accuracy">精確度：</string>
+  <string name="wplist_compass">羅盤方位：</string>
+  <string name="wplist_compass_accuracy">羅盤精確度：</string>
   <!--Track Manager-->
   <string name="trackmgr">軌跡管理</string>
-  <string name="trackmgr_tracklist">軌跡列表：</string>
+  <string name="trackmgr_tracklist">軌跡清單：</string>
   <string name="trackmgr_waypoints_count">航點：</string>
   <string name="trackmgr_trackpoints_count">軌跡點：</string>
   <string name="trackmgr_empty">您尚未有任何的軌跡紀錄資料。</string>
+  <string name="trackmgr_newtrack_hint">要錄製軌跡請點選<b>選單</b>，然後點選<b>新軌跡</b></string>
   <string name="trackmgr_newtrack_error">無法開始記錄新軌跡： {0}</string>
+  <string name="trackmgr_continuetrack_hint">您目前正在錄製 <b>軌跡 #{0}</b>\n請於清單中選擇該軌跡以繼續</string>
   <string name="trackmgr_contextmenu_stop">停止記錄</string>
   <string name="trackmgr_contextmenu_resume">繼續記錄</string>
   <string name="trackmgr_contextmenu_delete">刪除</string>
@@ -35,6 +45,7 @@
   <string name="trackmgr_delete_confirm">軌跡 #{0} 將被刪除</string>
   <string name="trackmgr_deleteall_confirm">所有的軌跡都會被刪除，您確定嗎？</string>
   <string name="trackmgr_exporting">匯出軌跡 #{0}…</string>
+  <string name="trackmgr_exporting_prepare">準備輸出...</string>
   <string name="trackmgr_export_error">無法匯出軌跡： {0}</string>
   <string name="trackmgr_exportall_confirm">將匯出所有軌跡，可能會耗費不少時間。您確定嗎？</string>
   <!--Track Detail-->
@@ -52,8 +63,8 @@
   <string name="trackdetail_description">描述</string>
   <string name="trackdetail_tags">標籤 (以半形逗號分隔)</string>
   <string name="trackdetail_description_mandatory">您必須填寫描述欄</string>
-  <string name="osm_visibility_private">私人的</string>
-  <string name="osm_visibility_public">公開的</string>
+  <string name="osm_visibility_private">私人</string>
+  <string name="osm_visibility_public">公開</string>
   <string name="osm_visibility_trackable">可追蹤的</string>
   <string name="osm_visibility_identifiable">可辨識的</string>
   <!--OSM upload-->
@@ -69,6 +80,7 @@
   <string name="osm_upload_sucess">成功上傳至 OpenStreetMap</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">錄製語音</string>
+  <string name="gpsstatus_record_stillimage">拍照</string>
   <string name="gpsstatus_record_textnote">文字筆記</string>
   <!--Menu-->
   <string name="menu_settings">設定</string>
@@ -77,10 +89,14 @@
   <string name="menu_displaytrack">顯示軌跡</string>
   <string name="menu_stoptracking">停止並儲存</string>
   <string name="menu_newtrack">新軌跡</string>
-  <string name="menu_deletetracks">刪除全部軌跡資料</string>
+  <string name="menu_deletetracks">刪除全部軌跡</string>
+  <string name="menu_continue">繼續軌跡</string>
+  <string name="menu_stopcurrenttrack">停止目前軌跡</string>
   <string name="menu_save">儲存</string>
   <string name="menu_cancel">取消</string>
   <string name="menu_export">匯出為 GPX 檔</string>
+  <string name="menu_osm_upload">上傳到 OpenStreetMap</string>
+  <string name="menu_center_to_gps">以 GPS 為中心</string>
   <string name="menu_exportall">全部匯出為 GPX 檔</string>
   <!--Errors-->
   <string name="error_externalstorage_not_writable">無法寫入外部儲存媒體。</string>
@@ -90,11 +106,15 @@
   <string name="error_userlayout_parsing">解析 XML 外觀配置檔時發生錯誤。請改用預設外觀。</string>
   <!--GPX-->
   <string name="gpx_track_name">使用 OSMTracker for Android™ 記錄</string>
+  <string name="gpx_hdop_approximation_cmt">警告：HDOP值並非GPS裝置回報的HDOP，HDOP值會與實際地點差大約幾公尺。</string>
   <!--About screen-->
   <string name="about">關於</string>
   <string name="about_text">更多資訊、文件與問題回報，請洽本專案首頁：</string>
   <string name="about_translate_text">請幫忙翻譯 OSMTracker：</string>
   <string name="about_debug_info">除錯資訊</string>
+  <string name="about_export_db">匯出資料庫</string>
+  <string name="about_exporting_db">匯出資料庫中...</string>
+  <string name="about_export_db_result">資料庫匯出結果：%s</string>
   <!--Notification-->
   <string name="notification_ticker_text">OSMTracker 記錄中</string>
   <string name="notification_title">OSMTracker 記錄中 (#{0})</string>
@@ -102,12 +122,52 @@
   <!--Display track-->
   <string name="displaytrack">顯示軌跡</string>
   <string name="displaytrack_map">顯示地圖背景</string>
+  <string name="displaytrack_north">北</string>
   <!--Track detail-->
   <string name="trackdetail_save">儲存</string>
   <!--Various-->
+  <string name="various_unit_meters">公尺</string>
   <string name="various_accuracy">精確度</string>
+  <string name="various_accuracy_with_sats">精準度 {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
+  <string name="various_waiting_gps_fix">等待 GPS 修正… ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
+  <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
+  <string name="various_heading">等待方位…</string>
+  <string name="various_heading_unknown">無法偵測方位</string>
   <!--OSM map view-->
+  <string name="displaytrackmap">OpenStreetMap 軌跡畫面</string>
+  <!--Buttons presets messages-->
+  <string name="buttons_presets_context_menu_update_install">更新與安裝</string>
+  <string name="buttons_presets_context_menu_delete">刪除</string>
+  <string name="buttons_presets_updating_layout">更新中...</string>
+  <string name="buttons_presets_successful_update">樣式已經成功更新</string>
+  <string name="buttons_presets_unsuccessful_update">樣式還未更新，請稍後再試一次</string>
+  <string name="buttons_presets_delete_message">你確定要刪除 {0} 樣式嗎？</string>
+  <string name="buttons_presets_delete_positive_confirmation">是</string>
+  <string name="buttons_presets_successful_delete">檔案已經成功刪除</string>
+  <string name="buttons_presets_icon_directory_deleted">圖標目錄已經成功刪除</string>
+  <string name="buttons_presets_icon_directory_does_not_exist">檔案並沒有與任何圖標目錄相關</string>
+  <string name="buttons_presets_unsuccessful_delete">檔案無法被刪除</string>
+  <!--Available Layouts messages-->
+  <string name="available_layouts_connection_error">錯誤：無法連線到網路</string>
+  <string name="available_layouts_response_null_exception">錯誤：無法連線到預設客製樣式庫</string>
+  <string name="available_layouts_connecting_message">(連線中...)</string>
+  <string name="available_layouts_description_dialog_positive_confirmation">下載</string>
+  <string name="available_layouts_not_available_language">你使用的語言並不能用，請從清單選擇一個</string>
+  <string name="available_layouts_language_dialog_title">可用語言</string>
+  <string name="available_layouts_checking_language_dialog">檢查本地語言版本</string>
+  <string name="available_layouts_downloading_dialog">下載中...</string>
+  <string name="available_layouts_successful_download">樣式已經成功下載</string>
+  <string name="available_layouts_unsuccessful_download">樣式無法下載，請稍後再試一次</string>
+  <string name="available_layouts_null_response_received">從伺服器取得資料出現錯誤</string>
+  <!--Github Repository Settings-->
+  <string name="github_repository_settings_default_checkbox">預設</string>
+  <string name="github_repository_settings_custom_checkbox">客製</string>
+  <string name="github_repository_settings_username">Github 使用者名稱：</string>
+  <string name="github_repository_settings_repository_name">程式庫名稱：</string>
+  <string name="github_repository_settings_branch_name">分支名稱：</string>
+  <string name="github_repository_settings_valid_server">Github 程式庫有效</string>
+  <string name="github_repository_settings_invalid_server">Github 程式庫無效</string>
 </resources>
diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml
index bd4df8334..ed6b6c458 100644
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@@ -19,6 +19,10 @@
 	<string name="prefs_gps_logging_interval_summary">Use 0 for the shortest possible (affects battery life)</string>
 	<string name="prefs_gps_logging_interval_seconds">seconds</string>
 
+	<string name="prefs_gps_logging_min_distance">GPS logging distance</string>
+	<string name="prefs_gps_logging_min_distance_summary">Min. distance between track points in meters, use 0 for the shortest possible</string>
+	<string name="prefs_gps_logging_min_distance_meters">meters</string>
+
 	<string name="prefs_ui">User interface</string>
 	
 	<string name="prefs_ui_picture_source">Default photo source</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74cb3aaaa..3f528daab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
 	<string name="trackmgr_waypoints_count">Waypoints: </string>
 	<string name="trackmgr_trackpoints_count">Trackpoints: </string>
 	<string name="trackmgr_empty">You don\'t have any tracks.</string>
-	<string name="trackmgr_newtrack_hint">To record a track,\npress <b>Menu</b> then <b>New track</b></string>
+	<string name="trackmgr_newtrack_hint">To record a track, press </string>
 	<string name="trackmgr_newtrack_error">Unable to create a new track: {0}</string>
 	<string name="trackmgr_continuetrack_hint">You are currently recording <b>track #{0}</b>\nChoose it in the list to continue</string>
 	<string name="trackmgr_contextmenu_stop">Stop tracking</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f7ec5fbd7..6f55061a6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -21,6 +21,9 @@
 		<EditTextPreference android:key="gps.logging.interval"
 			android:title="@string/prefs_gps_logging_interval" android:summary="@string/prefs_gps_logging_interval_summary"
 			android:defaultValue="0" android:inputType="number"></EditTextPreference>
+		<EditTextPreference android:key="gps.logging.min_distance"
+			android:title="@string/prefs_gps_logging_min_distance" android:summary="@string/prefs_gps_logging_min_distance_summary"
+			android:defaultValue="0" android:inputType="number"></EditTextPreference>
 	</PreferenceCategory>
 	
 	<PreferenceCategory android:title="@string/prefs_output">
diff --git a/build.gradle b/build.gradle
index b32f870af..2b29ba252 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6b85d4a13..b5a7e36b2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
+#Tue Jan 08 15:58:36 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
-distributionSha256Sum=6ac2f8f9302f50241bf14cc5f4a3d88504ad20e61bb98c5fd048f7723b61397e
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionSha256Sum=6ac2f8f9302f50241bf14cc5f4a3d88504ad20e61bb98c5fd048f7723b61397e