From 27386bb4f045ecb302758287ded22ec1656cbed2 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 17 Sep 2020 23:44:37 +0200
Subject: [PATCH] Localization: update via Transifex CLI.

---
 src/main/res/values-ar/strings.xml | 55 ++++++++++++++++++++++++++++--
 src/main/res/values-bg/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-ca/strings.xml | 54 ++++++++++++++++++++++++++++-
 src/main/res/values-cs/strings.xml |  4 +--
 src/main/res/values-da/strings.xml |  4 +--
 src/main/res/values-de/strings.xml |  4 +--
 src/main/res/values-el/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-es/strings.xml |  6 ++--
 src/main/res/values-et/strings.xml |  4 +--
 src/main/res/values-eu/strings.xml |  4 +--
 src/main/res/values-fa/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-fi/strings.xml |  4 +--
 src/main/res/values-fr/strings.xml |  4 +--
 src/main/res/values-gl/strings.xml | 11 ++++++
 src/main/res/values-hi/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-hr/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-hu/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-it/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-ja/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-ko/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-lt/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-lv/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-ms/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-nb/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-nl/strings.xml |  4 +--
 src/main/res/values-no/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-pl/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-pt/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-ro/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-ru/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-sk/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-sl/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-sr/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-sv/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-th/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-tl/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-tr/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-uk/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-vi/strings.xml | 53 +++++++++++++++++++++++++++-
 src/main/res/values-zh/strings.xml | 53 +++++++++++++++++++++++++++-
 40 files changed, 1591 insertions(+), 51 deletions(-)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 3d9b3a314..80000723d 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">طائرة</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">ركوب الدراجات</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">مَشْي</string>
     <string name="activity_type_water_skiing">التزلج على الماء</string>
     <string name="activity_type_wind_surfing">ركوب الأمواج</string>
+    <!-- Description -->
     <string name="description_activity_type">نوع النشاط: %1$s</string>
     <string name="description_average_moving_pace_in_minute">متوسط سرعة التحرك:‏ %1$s‏ دقيقة/كم‏ (%2$s‏ دقيقة/ميل)‏</string>
     <string name="description_average_moving_speed">متوسط سرعة التحرك: %1$.2f كم/ساعة (%2$.1f ميل/ساعة)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">السرعة (دقيقة/ميل)</string>
     <string name="description_pace_metric">السرعة (دقيقة/كم)</string>
     <string name="description_recorded_time">مسجّل في: %1$s</string>
+    <string name="description_speed_ms">السرعة (متر/ثانية)</string>
     <string name="description_sensor_cadence">الإيقاع (دورة في الدقيقة)</string>
     <string name="description_sensor_heart_rate">معدل ضربات القلب (نبضة في الدقيقة)</string>
     <string name="description_sensor_power">الطاقة (واط)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">الوقت الإجمالي: %1$s</string>
     <string name="description_track_point">نقطة</string>
     <string name="description_track_segment">جزء</string>
+    <!-- Export -->
     <string name="export_all_option">الكل كـ ‏%1$s‏</string>
     <string name="export_all_title">تصدير إلى وحدة التخزين الخارجية</string>
     <string name="export_error">تم تصدير %1$d‏ من %2$s‏ إلى %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">جارٍ التصدير إلى‏ %1$s‏…</string>
     <string name="export_success">تم تصدير‏ %1$s‏ إلى‏ %2$s</string>
     <string name="export_title">تصدير إلى…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d‏ ملفات</string>
     <string name="files_many">%1$d‏ ملفًا</string>
     <string name="files_one">1 ملف</string>
     <string name="files_other">%1$d‏ من الملفات</string>
     <string name="files_two">2 ملفان</string>
     <string name="files_zero">0 ملفات</string>
+    <!-- Generic -->
     <string name="generic_add">إضافة</string>
     <string name="generic_cancel">إلغاء</string>
     <string name="generic_delete_all_confirm_title">حذف الكل؟</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">تم بنجاح</string>
     <string name="generic_tracks">المسارات</string>
     <string name="generic_yes">نعم</string>
+    <!-- Gps -->
     <string name="gps_location_access">\"الدخول إلى الموقع\"</string>
     <string name="gps_disabled">نظام تحديد المواقع العالمي (GPS) غير ممكّن. انقر هنا للانتقال إلى %1$s. اضغط على زر الرجوع للعودة.</string>
     <string name="gps_disabled_my_location">لا يمكن تحديد الموقع الحالي. تستطيع تمكين مصادر أكثر للموقع على‏ ‏%1$s‏ ‏وتأكد من أنك في مكان مفتوح. حاول مرة أخرى في وقت لاحق.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">بدء نظام تحديد المواقع العالمي (GPS)</string>
     <string name="gps_wait_for_better_signal">في انتظار إشارة أفضل ‏‫لنظام تحديد المواقع العالمي (GPS)‬</string>
     <string name="gps_wait_for_signal">في انتظار إشارة نظام تحديد المواقع العالمي (GPS)‬</string>
+    <!-- Image -->
     <string name="image_application">تطبيق</string>
     <string name="image_arrow">سهم</string>
     <string name="image_marker">علامة</string>
@@ -148,6 +171,7 @@
     <string name="image_record">تسجيل</string>
     <string name="image_stop">إيقاف</string>
     <string name="image_track">مسار</string>
+    <!-- Import -->
     <string name="import_error">تم استيراد‏ %1$d‏ من‏ %2$s‏ من‏ %3$s</string>
     <string name="import_no_directory">%1$s‏ غير موجود</string>
     <string name="import_no_file">لا توجد ملفات للاستيراد. وصّل جهازك إلى جهاز الكمبيوتر واحفظ الملفات للاستيراد في %1$s.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">كل‏ %1$s‏</string>
     <string name="import_selection_title">استيراد من وحدة التخزين الخارجية</string>
     <string name="import_success">تم استيراد‏ %1$s‏ من‏ %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">يتعذر إدراج مُحدد. ليس هناك إشارة لنظام تحديد المواقع العالمي (GPS). حاول مرة أخرى.</string>
     <string name="marker_add_success">تم إدراج علامة</string>
     <string name="marker_add_canceled">تم الإلغاء، لم تتم إضافة أية علامة</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">مُحدد %1$d</string>
     <string name="marker_split_name_format">تقسيم %1$d</string>
     <string name="marker_title">%1$d‏ من‏ %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">من آخر مُحدد تقسيم:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">نوع المُحدد (على سبيل المثال شلال)</string>
     <string name="marker_edit_marker_type_hint">نوع المُحدد</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">ليس لديك أية علامات</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">الإحصاءات المجمعة</string>
     <string name="menu_delete">حذف</string>
     <string name="menu_edit">تعديل</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">إيقاف GPS</string>
     <string name="menu_view_photo">عرض الصورة</string>
     <string name="menu_voice_frequency">معدل الصوت</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">خدمة التسجيل</string>
+    <!-- Search -->
     <string name="search_global_description">المسارات والمحددات</string>
     <string name="search_list_empty_message">لم يطابق بحثك أي مسارات أو علامات</string>
     <string name="search_list_marker_track_location">في المسار ‘%1$s’.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">مستوى شحن البطارية</string>
     <string name="sensor_state_cadence">الإيقاع</string>
     <string name="sensor_state_cadence_value">%1$d دورة في الدقيقة</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d واط</string>
     <string name="settings_not_while_recording">غير متاح أثناء تسجيل مسار</string>
     <string name="settings_show">إظهار</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">خيارات متقدمة</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">بحسب المسافة</string>
     <string name="settings_chart_by_time">بحسب الوقت</string>
     <string name="settings_chart_x_axis">المحور س</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">التاريخ (المحلي)</string>
     <string name="settings_recording_track_name_number_option">عدد</string>
     <string name="settings_recording_track_name_title">اسم المسار الافتراضي</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">إعادة تعيين</string>
     <string name="settings_reset_confirm_message">ستتم إعادة جميع الإعدادات إلى القيم الافتراضية.</string>
     <string name="settings_reset_confirm_title">إعادة التعيين الآن؟</string>
     <string name="settings_reset_done">لقد تمت إعادة جميع الإعدادات إلى القيم الافتراضية</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">المستشعر</string>
     <string name="settings_sensor_bluetooth">البلوتوث</string>
     <string name="settings_sensor_bluetooth_sensor">مستشعر بلوتوث</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">خط العرض/خط الطول</string>
     <string name="settings_stats_rate_title">المعدل المفضل</string>
     <string name="settings_stats_units_imperial">وحدات القياس البريطانية (ميل، قدم)</string>
     <string name="settings_stats_units_metric">وحدات القياس المترية (كم، م)</string>
     <string name="settings_stats_units_title">الوحدات المفضلة</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">مشاركة ملف مسار</string>
     <string name="share_track_share_file_body">أعتقد أنك قد تكون مهتمًا بهذا المسار.\n\nلعرض هذا المسار، استخدام برنامج Google Earth أو غيره من البرامج تصميم الخرائط.\n\n%1$s</string>
     <string name="share_track_subject">أريد مشاركة مسار معك</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">متوسط إيقاع التحرك</string>
     <string name="stats_average_moving_speed">متوسط سرعة التحرك</string>
     <string name="stats_average_pace">متوسط ​​الإيقاع</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">السرعة</string>
     <string name="stats_distance">المسافة</string>
     <string name="stats_total_time">الوقت الإجمالي</string>
+    <!-- Track -->
     <string name="track_name_format">المسار %1$d</string>
     <string name="track_record_notification">جارٍ تسجيل مسارك…</string>
     <string name="track_markers">%1$s علامات</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">سيتم حذف المسار والعلامات نهائيًا من الجهاز.</string>
     <string name="track_delete_one_confirm_title">حذف المسار؟</string>
     <string name="track_delete_multiple_confirm_message">سيتم حذف المسارات المحددة وعلاماتها نهائيًا من الجهاز.</string>
     <string name="track_delete_progress_message">جارٍ الحذف…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">الرسم البياني</string>
     <string name="track_detail_stats_tab">الإحصاءات</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">نوع النشاط (على سبيل المثال المشي)</string>
     <string name="track_edit_activity_type_hint">نوع النشاط</string>
     <string name="track_edit_new_track_title">مسار جديد</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">بدء تسجيل مغامرتك التالية هنا</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d‏ مسارات</string>
     <string name="tracks_many">%1$d‏ مسارًا</string>
     <string name="tracks_one">1 مسار</string>
     <string name="tracks_other">%1$d‏ من المسارات</string>
     <string name="tracks_two">2 مساران</string>
     <string name="tracks_zero">0 مسارات</string>
+    <!-- Unit -->
     <string name="unit_feet">قدم</string>
     <string name="unit_kilometer">كم</string>
     <string name="unit_kilometer_per_hour">كم/س</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">ميل/ساعة</string>
     <string name="unit_minute_per_kilometer">د/كم</string>
     <string name="unit_minute_per_mile">دقيقة/ميل</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">تكييف من أجل الدقة</string>
     <string name="value_adapt_battery_life">التكيف بحسب عمر البطارية</string>
     <string name="value_always">دائمًا</string>
@@ -314,6 +363,7 @@
     <string name="value_off">إيقاف</string>
     <string name="value_smallest">الأصغر</string>
     <string name="value_smallest_recommended">الأصغر (موصى به)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d ساعات</string>
     <string name="voice_hours_many">%1$d ساعة</string>
     <string name="voice_hours_one">ساعة واحدة</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">المسافة الإجمالية 2 ميل</string>
     <string name="voice_total_distance_miles_zero">المسافة الإجمالية 0 ميل</string>
     <string name="voice_total_distance_zero">المسافة الإجمالية لمساراتي صفر.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">أجهزة الصراف الآلي</string>
     <string name="waypoint_type_bank">مصرف</string>
     <string name="waypoint_type_bar">بار</string>
@@ -411,4 +462,4 @@
     <string name="waypoint_type_waterfall">شلال</string>
     <string name="waypoint_type_water_fountain">نافورة مياه</string>
     <string name="waypoint_type_waypoint">نقطة طريق</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 671eb421d..866d17ff3 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">самолет</string>
     <string name="activity_type_atv">мотовсъдеход</string>
     <string name="activity_type_biking">колоездене</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">ходене</string>
     <string name="activity_type_water_skiing">водни ски</string>
     <string name="activity_type_wind_surfing">уиндсърфинг</string>
+    <!-- Description -->
     <string name="description_activity_type">Вид дейност: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Средно темпо на движение: %1$s мин/км (%2$s мин/мил)</string>
     <string name="description_average_moving_speed">Средна скорост на движение: %1$.2f км/ч (%2$.1f мили/ч)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Темпо (мин/мил)</string>
     <string name="description_pace_metric">Темпо (мин/км)</string>
     <string name="description_recorded_time">Запис: %1$s</string>
+    <string name="description_speed_ms">Скорост (м/сек)</string>
     <string name="description_sensor_cadence">Честота на въртене (об./мин)</string>
     <string name="description_sensor_heart_rate">Сърдечна честота (удара/мин)</string>
     <string name="description_sensor_power">Мощност (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Общо време: %1$s</string>
     <string name="description_track_point">Точка</string>
     <string name="description_track_segment">Сегмент</string>
+    <!-- Export -->
     <string name="export_all_option">Всичко като %1$s</string>
     <string name="export_all_title">Експортиране във външно хранилище</string>
     <string name="export_error">Експортирахте %1$d от %2$s в/ъв %3$s.</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Експортира се в/ъв %1$s…</string>
     <string name="export_success">Експортирахте %1$s в/ъв %2$s.</string>
     <string name="export_title">Експортиране във…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d файла</string>
     <string name="files_many">%1$d файла</string>
     <string name="files_one">1 файл</string>
     <string name="files_other">%1$d файла</string>
     <string name="files_two">2 файла</string>
     <string name="files_zero">0 файла</string>
+    <!-- Generic -->
     <string name="generic_add">Прибавяне</string>
     <string name="generic_cancel">Отказ</string>
     <string name="generic_delete_all_confirm_title">Да се изтрият ли всички?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Успех</string>
     <string name="generic_tracks">Маршрути</string>
     <string name="generic_yes">Да</string>
+    <!-- Gps -->
     <string name="gps_location_access">„Достъп до местоположението“</string>
     <string name="gps_disabled">GPS не е активиран. Докоснете тук, за да отидете на %1$s. Натиснете бутона за назад, за да се върнете.</string>
     <string name="gps_disabled_my_location">Текущото местоположение не може да бъде определено. Активирайте още източници на местоположение от %1$s и се уверете, че небето се вижда. Опитайте отново по-късно.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">GPS се включва.</string>
     <string name="gps_wait_for_better_signal">Изчаква се по-добър сигнал за GPS.</string>
     <string name="gps_wait_for_signal">Изчаква се сигнал за GPS.</string>
+    <!-- Image -->
     <string name="image_application">Приложение</string>
     <string name="image_arrow">Стрелка</string>
     <string name="image_marker">Маркер</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Запис</string>
     <string name="image_stop">Спиране</string>
     <string name="image_track">Маршрут</string>
+    <!-- Import -->
     <string name="import_error">Импортирахте %1$d от %2$s от %3$s.</string>
     <string name="import_no_directory">%1$s не съществува.</string>
     <string name="import_no_file">Няма файлове за импортиране. Свържете устройството с компютъра си и поставете файловете, които
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Всички %1$s файлове</string>
     <string name="import_selection_title">Импортиране от външно хранилище</string>
     <string name="import_success">Импортирахте %1$s от %2$s.</string>
+    <!-- Marker -->
     <string name="marker_add_error">Маркерът не може да се вмъкне. Няма сигнал за GPS. Опитайте отново.</string>
     <string name="marker_add_success">Маркерът бе вмъкнат.</string>
     <string name="marker_add_canceled">Добавянето на маркер бе отменено.</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Маркер %1$d</string>
     <string name="marker_split_name_format">Разделяне %1$d</string>
     <string name="marker_title">%1$d от %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">От последния разделителен маркер:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип маркер (напр. водопад)</string>
     <string name="marker_edit_marker_type_hint">Тип маркер</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Нямате маркери.</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Събрани статист. данни</string>
     <string name="menu_delete">Изтриване</string>
     <string name="menu_edit">Редактиране</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Спиране на GPS</string>
     <string name="menu_view_photo">Показв. на снимката</string>
     <string name="menu_voice_frequency">Честота на гласа</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Услуга за запис</string>
+    <!-- Search -->
     <string name="search_global_description">Маршрути и маркери</string>
     <string name="search_list_empty_message">Няма маршрути или маркери, отговарящи на търсените от вас.</string>
     <string name="search_list_marker_track_location">В маршрут „%1$s“.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Ниво на батерията</string>
     <string name="sensor_state_cadence">Такт</string>
     <string name="sensor_state_cadence_value">%1$d об/мин</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Не е налице при записване на маршрут.</string>
     <string name="settings_show">Показване</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Разширени</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">По разстояние</string>
     <string name="settings_chart_by_time">По време</string>
     <string name="settings_chart_x_axis">Ос X</string>
@@ -229,22 +263,28 @@
     <string name="settings_recording_track_name_date_local_option">Дата (местна)</string>
     <string name="settings_recording_track_name_number_option">Число</string>
     <string name="settings_recording_track_name_title">Стандартен маршрут: Име</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Нулиране</string>
     <string name="settings_reset_confirm_message">Всички настройки ще бъдат върнати към стандартните им стойности.</string>
     <string name="settings_reset_confirm_title">Да се зададе ли повторно сега?</string>
     <string name="settings_reset_done">Всички настройки са възстановени до стойностите по подразбиране.</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Сензор</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth сензор</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Ширина и дължина</string>
     <string name="settings_stats_rate_title">Предпочитана мярка</string>
     <string name="settings_stats_units_imperial">Имперски (мил, фт)</string>
     <string name="settings_stats_units_metric">Метрични (км, м)</string>
     <string name="settings_stats_units_title">Предпочитани единици</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Споделяне на файл с маршрут</string>
     <string name="share_track_share_file_body">Мисля, че този маршрут може да Ви заинтересува.\n\nЗа да го видите, използвайте Google Земя или друг
     картографски софтуер.\n\n%1$s</string>
     <string name="share_track_subject">Искам да споделя път с Вас</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Средно темпо на движение</string>
     <string name="stats_average_moving_speed">Средна скорост на движение</string>
     <string name="stats_average_pace">Средно темпо</string>
@@ -263,25 +303,33 @@
     <string name="stats_speed">Скорост</string>
     <string name="stats_distance">Разстояние</string>
     <string name="stats_total_time">Общо време</string>
+    <!-- Track -->
     <string name="track_name_format">Път %1$d</string>
     <string name="track_record_notification">Маршрутът ви се записва…</string>
     <string name="track_markers">Маркери за %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Маршрутът и маркерите му ще бъдат изтрити за постоянно от устройството.</string>
     <string name="track_delete_one_confirm_title">Да се изтрие ли маршрутът?</string>
     <string name="track_delete_multiple_confirm_message">Избраните маршрути и маркерите им ще бъдат изтрити за постоянно от устройството.</string>
     <string name="track_delete_progress_message">Изтрива се…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Диаграма</string>
     <string name="track_detail_stats_tab">Статист. данни</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Тип дейност (напр. пешеходни походи)</string>
     <string name="track_edit_activity_type_hint">Тип дейност</string>
     <string name="track_edit_new_track_title">Нов маршрут</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Започнете да записвате следващото си приключение тук.</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d маршрута</string>
     <string name="tracks_many">%1$d маршрута</string>
     <string name="tracks_one">1 маршрут</string>
     <string name="tracks_other">%1$d маршрута</string>
     <string name="tracks_two">2 маршрута</string>
     <string name="tracks_zero">0 маршрута</string>
+    <!-- Unit -->
     <string name="unit_feet">фт</string>
     <string name="unit_kilometer">км</string>
     <string name="unit_kilometer_per_hour">км/ч</string>
@@ -290,6 +338,7 @@
     <string name="unit_mile_per_hour">мил/ч</string>
     <string name="unit_minute_per_kilometer">мин/км</string>
     <string name="unit_minute_per_mile">мин/мил</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Адаптиране за точност</string>
     <string name="value_adapt_battery_life">Адаптиране спрямо батерията</string>
     <string name="value_always">Винаги</string>
@@ -316,6 +365,7 @@
     <string name="value_off">Изключено</string>
     <string name="value_smallest">Най-малката</string>
     <string name="value_smallest_recommended">Най-малкото (препоръчително)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d часа</string>
     <string name="voice_hours_many">%1$d часа</string>
     <string name="voice_hours_one">1 час</string>
@@ -362,6 +412,7 @@
     <string name="voice_total_distance_miles_two">общо разстояние 2 мили</string>
     <string name="voice_total_distance_miles_zero">общо разстояние 0 мили</string>
     <string name="voice_total_distance_zero">Общото разстояние в Моите маршрути е нула.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Банкомат</string>
     <string name="waypoint_type_bank">банка</string>
     <string name="waypoint_type_bar">бар</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 9e4ace170..4db7e42ff 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">avió</string>
     <string name="activity_type_atv">Vehicles tot terreny</string>
     <string name="activity_type_biking">anar en bicicleta</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">caminar</string>
     <string name="activity_type_water_skiing">esquí nàutic</string>
     <string name="activity_type_wind_surfing">surf de vela</string>
+    <!-- Description -->
     <string name="description_activity_type">Tipus d\'activitat: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Ritme de moviment mitjà: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Velocitat mitjana en moviment: %1$.2f km/h (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Ritme (min/mi)</string>
     <string name="description_pace_metric">Ritme (min/km)</string>
     <string name="description_recorded_time">Enregistrament: %1$s</string>
+    <string name="description_speed_ms">Velocitat (m/s)</string>
     <string name="description_sensor_cadence">Cadència (rpm)</string>
     <string name="description_sensor_heart_rate">Freqüència cardíaca (bpm)</string>
     <string name="description_sensor_power">Potència (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Temps total: %1$s</string>
     <string name="description_track_point">Punt</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Totes com a %1$s</string>
     <string name="export_all_title">Exporta a la unitat d\'emmagatzematge extern</string>
     <string name="export_error">S\'han exportat %1$d de %2$s a %3$s.</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">S\'està exportant a %1$s…</string>
     <string name="export_success">S\'han exportat %1$s a %2$s.</string>
     <string name="export_title">Exportació a…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d fitxers</string>
     <string name="files_many">%1$d fitxers</string>
     <string name="files_one">1 fitxer</string>
     <string name="files_other">%1$d fitxers</string>
     <string name="files_two">2 fitxers</string>
     <string name="files_zero">0 fitxers</string>
+    <!-- Generic -->
     <string name="generic_add">Afegeix</string>
     <string name="generic_cancel">Cancel·la</string>
     <string name="generic_delete_all_confirm_title">Voleu suprimir-ho tot?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Correcte</string>
     <string name="generic_tracks">Rutes</string>
     <string name="generic_yes">Sí</string>
+    <!-- Gps -->
     <string name="gps_location_access">\"Accés a la ubicació\"</string>
     <string name="gps_disabled">El GPS no està activat. Premeu aquí per anar a %1$s. Premeu el botó Enrere per tornar.</string>
     <string name="gps_disabled_my_location">No es pot determinar la ubicació actual. Activeu més fonts d\'ubicació a %1$s i assegureu-vos que
@@ -139,6 +161,7 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="gps_starting">El GPS s\'està iniciant.</string>
     <string name="gps_wait_for_better_signal">S\'està esperant un senyal GPS de millor qualitat.</string>
     <string name="gps_wait_for_signal">S\'està esperant el senyal GPS.</string>
+    <!-- Image -->
     <string name="image_application">Aplicació</string>
     <string name="image_arrow">Fletxa</string>
     <string name="image_marker">Marcador</string>
@@ -149,6 +172,7 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="image_record">Enregistra</string>
     <string name="image_stop">Atura</string>
     <string name="image_track">Ruta</string>
+    <!-- Import -->
     <string name="import_error">S\'han importat %1$d de %2$s del directori %3$s.</string>
     <string name="import_no_directory">%1$s no existeix.</string>
     <string name="import_no_file">No s\'ha trobat cap fitxer per importar. Connecteu el dispositiu a l\'ordinador i col·loqueu a %1$s
@@ -158,6 +182,7 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="import_selection_option">Tots els %1$s</string>
     <string name="import_selection_title">Importació de la unitat d\'emmagatzematge extern</string>
     <string name="import_success">S\'han importat %1$s del directori %2$s.</string>
+    <!-- Marker -->
     <string name="marker_add_error">No es pot inserir un marcador. No hi ha senyal del GPS. Torneu-ho a provar.</string>
     <string name="marker_add_success">S\'ha inserit un marcador.</string>
     <string name="marker_add_canceled">L\'acció s\'ha cancel·lat. No s\'ha afegit cap marcador.</string>
@@ -170,10 +195,14 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="marker_name_format">Marcador %1$d</string>
     <string name="marker_split_name_format">Parcial %1$d</string>
     <string name="marker_title">%1$d de %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Des del darrer marcador parcial:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipus de marcador (p. ex. cascada)</string>
     <string name="marker_edit_marker_type_hint">Tipus de marcador</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">No teniu cap marcador.</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Estadístiques globals</string>
     <string name="menu_delete">Suprimeix</string>
     <string name="menu_edit">Edita</string>
@@ -194,11 +223,14 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="menu_stop_gps">Desactiva el GPS</string>
     <string name="menu_view_photo">Mostra la foto</string>
     <string name="menu_voice_frequency">Freqüència de veu</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Servei d\'enregistrament</string>
+    <!-- Search -->
     <string name="search_global_description">Pistes i marcadors</string>
     <string name="search_list_empty_message">No hi ha cap ruta ni marcador que coincideixi amb els criteris de cerca.</string>
     <string name="search_list_marker_track_location">A la ruta \"%1$s\".</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Nivell de la bateria</string>
     <string name="sensor_state_cadence">Cadència</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -209,7 +241,9 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">No està disponible durant l\'enregistrament d\'una ruta.</string>
     <string name="settings_show">Mostra\'n més</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Avançades</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Per distància</string>
     <string name="settings_chart_by_time">Per temps</string>
     <string name="settings_chart_x_axis">Eix X</string>
@@ -230,21 +264,27 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nom de la ruta</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Restableix</string>
     <string name="settings_reset_confirm_message">Es tornaran a definir els valors predeterminats de la configuració.</string>
     <string name="settings_reset_confirm_title">Voleu restablir-ho ara?</string>
     <string name="settings_reset_done">S\'ha recuperat la configuració predeterminada.</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Sensor de Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitud/Longitud:</string>
     <string name="settings_stats_rate_title">Mesura preferida</string>
     <string name="settings_stats_units_imperial">Sistema anglosaxó (milles, peus)</string>
     <string name="settings_stats_units_metric">Sistema mètric (km, m)</string>
     <string name="settings_stats_units_title">Unitats preferides</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Comparteix el fitxer de la pista</string>
     <string name="share_track_share_file_body">Crec que aquesta ruta et podria interessar.\n\nLa pots veure amb Google Earth o qualsevol altre programari de mapatge.\n\n%1$s</string>
     <string name="share_track_subject">Vull compartir una ruta amb tu</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Ritme de moviment mitjà</string>
     <string name="stats_average_moving_speed">Velocitat de moviment mitjana</string>
     <string name="stats_average_pace">Ritme mitjà</string>
@@ -263,25 +303,33 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="stats_speed">Velocitat</string>
     <string name="stats_distance">Distància</string>
     <string name="stats_total_time">Temps total</string>
+    <!-- Track -->
     <string name="track_name_format">Ruta %1$d</string>
     <string name="track_record_notification">S\'està enregistrant la ruta…</string>
     <string name="track_markers">Marcadors de %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">La ruta i els seus marcadors se suprimiran definitivament del dispositiu.</string>
     <string name="track_delete_one_confirm_title">Voleu suprimir la ruta?</string>
     <string name="track_delete_multiple_confirm_message">Les rutes seleccionades i els seus marcadors se suprimiran definitivament del dispositiu.</string>
     <string name="track_delete_progress_message">S\'està suprimint…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Diagrama</string>
     <string name="track_detail_stats_tab">Estadístiques</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Tipus d\'activitat (p. ex. senderisme)</string>
     <string name="track_edit_activity_type_hint">Tipus d\'activitat</string>
     <string name="track_edit_new_track_title">Nova ruta</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Comenceu a enregistrar aquí la vostra pròxima aventura.</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d rutes</string>
     <string name="tracks_many">%1$d rutes</string>
     <string name="tracks_one">1 ruta</string>
     <string name="tracks_other">%1$d rutes</string>
     <string name="tracks_two">2 rutes</string>
     <string name="tracks_zero">0 rutes</string>
+    <!-- Unit -->
     <string name="unit_feet">peus</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -290,6 +338,7 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="unit_mile_per_hour">milles/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/milles</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Adapta\'n la precisió</string>
     <string name="value_adapt_battery_life">Adapta a la durada de la bateria</string>
     <string name="value_always">Sempre</string>
@@ -316,6 +365,7 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="value_off">Desactivat</string>
     <string name="value_smallest">Més petit</string>
     <string name="value_smallest_recommended">Més petit (recomanat)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d hores</string>
     <string name="voice_hours_many">%1$d hores</string>
     <string name="voice_hours_one">1 hora</string>
@@ -362,6 +412,7 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="voice_total_distance_miles_two">2 milles de distància total</string>
     <string name="voice_total_distance_miles_zero">0 milles de distància total</string>
     <string name="voice_total_distance_zero">La distància total de OpenTracks és zero.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">caixer</string>
     <string name="waypoint_type_bank">banc</string>
     <string name="waypoint_type_bar">bar</string>
@@ -416,4 +467,5 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <!-- Share image -->
     <string name="share_image_subject">Vull compartir una imatge amb tu</string>
     <string name="share_image_body">Crec que aquesta imatge et podria interessar.</string>
+
 </resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index a9da05b10..dbf0e3502 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -362,14 +362,13 @@ g) udělejte, co si myslíte, že pomůže OpenTracks.</string>
     <string name="settings_sensor_connecting">Připojeno k senzoru %1$s</string>
     <string name="settings_sensor_disconnected">Odpojeno od %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Velikost kola (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Zeměpisná šířka/délka</string>
     <string name="settings_stats_rate_title">Preferovaná rychlost</string>
     <string name="settings_stats_units_imperial">Imperiální jednotky (míle, stopy)</string>
     <string name="settings_stats_units_metric">Metrické jednotky (km, m)</string>
     <string name="settings_stats_units_title">Preferované jednotky</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Sdílet soubor trasy</string>
     <string name="share_track_share_file_body">Možná by vás mohla zajímat tato trasa.\n\nChcete-li ji zobrazit, použijte Google Earth nebo jiný mapový software.\n\n%1$s</string>
@@ -560,4 +559,5 @@ g) udělejte, co si myslíte, že pomůže OpenTracks.</string>
     <!-- Share image -->
     <string name="share_image_subject">Chtěl bych s vámi sdílet obrázek</string>
     <string name="share_image_body">Myslím, že by vás mohl tento obrázek zajímat.</string>
+
 </resources>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 383894a56..735eb0964 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -365,14 +365,13 @@ g) gør hvad du synes hjælper OpenTracks.</string>
     <string name="settings_sensor_connecting">Tilsluttet %1$s</string>
     <string name="settings_sensor_disconnected">Frakoblet %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Hjulstørrelse (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Breddegrad/længdegrad</string>
     <string name="settings_stats_rate_title">Foretrukkenfartenhed</string>
     <string name="settings_stats_units_imperial">Britisk (mil, ft)</string>
     <string name="settings_stats_units_metric">Metrisk (km, m)</string>
     <string name="settings_stats_units_title">Foretrukne enheder</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Del rutefil</string>
     <string name="share_track_share_file_body">Du kunne måske være interesseret i denne rute.\n\nDu kan bruge Google Earth eller anden
@@ -564,4 +563,5 @@ g) gør hvad du synes hjælper OpenTracks.</string>
     <!-- Share image -->
     <string name="share_image_subject">Jeg vil gerne dele et billede med dig</string>
     <string name="share_image_body">Jeg tror, du måske er interesseret i dette billede.</string>
+
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c3ce50fc4..101899783 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -372,14 +372,13 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
     <string name="settings_sensor_connecting">Verbunden mit %1$s</string>
     <string name="settings_sensor_disconnected">Verbindung getrennt von %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Reifengröße (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Breiten-/Längengrad</string>
     <string name="settings_stats_rate_title">Bevorzugtes Maß</string>
     <string name="settings_stats_units_imperial">Englisch (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrisch (km, m)</string>
     <string name="settings_stats_units_title">Bevorzugte Einheiten</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Track-Datei teilen</string>
     <string name="share_track_share_file_body">Dieser Track könnte dich interessieren.\n\nDu kannst ihn dir mit Google Earth oder einer anderen Kartierungssoftware ansehen.\n\n%1$s</string>
@@ -572,4 +571,5 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
     <!-- Share image -->
     <string name="share_image_subject">Ich möchte gerne ein Bild mit Dir teilen</string>
     <string name="share_image_body">Ich denke, dieses Bild könnte Dich interessieren.</string>
+
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 3834abe39..beec0e4e2 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">αεροπλάνο</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">ποδηλασία</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">βάδισμα</string>
     <string name="activity_type_water_skiing">θαλάσσιο σκι</string>
     <string name="activity_type_wind_surfing">Ιστιοσανίδα</string>
+    <!-- Description -->
     <string name="description_activity_type">Τύπος δραστηριότητας: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Μέσος ρυθμός κίνησης: %1$s λεπτά/χλμ (%2$s λεπτά/μίλι)</string>
     <string name="description_average_moving_speed">Μέση ταχύτητα κίνησης: %1$.2f χλμ/ώρα (%2$.1f μίλια/ώρα)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Ρυθμός (λεπτά/μίλι)</string>
     <string name="description_pace_metric">Ρυθμός (λεπτά/χλμ)</string>
     <string name="description_recorded_time">Εγγραφή: %1$s</string>
+    <string name="description_speed_ms">Ταχύτητα (μέτρα/δευτ)</string>
     <string name="description_sensor_cadence">Ρυθμός (σ.α.λ.)</string>
     <string name="description_sensor_heart_rate">Καρδιακός ρυθμός (χ.α.λ.)</string>
     <string name="description_sensor_power">Ισχύς (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Συνολικός χρόνος: %1$s</string>
     <string name="description_track_point">Σημείο</string>
     <string name="description_track_segment">Τμήμα</string>
+    <!-- Export -->
     <string name="export_all_option">Όλα σε μορφή %1$s</string>
     <string name="export_all_title">Εξαγωγή σε εξωτερικό αποθηκευτικό χώρο</string>
     <string name="export_error">Έγινε εξαγωγή %1$d από %2$s διαδρομών στον κατάλογο %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Εξαγωγή στο %1$s…</string>
     <string name="export_success">Έγινε εξαγωγή %1$s διαδρομών στον κατάλογο %2$s</string>
     <string name="export_title">Εξαγωγή σε…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d αρχεία</string>
     <string name="files_many">%1$d αρχεία</string>
     <string name="files_one">1 αρχείο</string>
     <string name="files_other">%1$d αρχεία</string>
     <string name="files_two">2 αρχεία</string>
     <string name="files_zero">0 αρχεία</string>
+    <!-- Generic -->
     <string name="generic_add">Προσθήκη</string>
     <string name="generic_cancel">Ακύρωση</string>
     <string name="generic_delete_all_confirm_title">Διαγραφή όλων;</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Επιτυχώς</string>
     <string name="generic_tracks">Διαδρομές</string>
     <string name="generic_yes">Ναι</string>
+    <!-- Gps -->
     <string name="gps_location_access">\'Πρόσβαση τοποθεσίας\'</string>
     <string name="gps_disabled">Το GPS δεν είναι ενεργοποιημένο. Πατήστε εδώ για να μεταβείτε στο %1$s. Πατήστε το κουμπί \"Πίσω\" για να επιστρέψετε.</string>
     <string name="gps_disabled_my_location">Η τρέχουσα τοποθεσία δεν μπορεί να προσδιοριστεί. Ενεργοποιήστε περισσότερες πηγές εντοπισμού στο μενού %1$s και βεβαιωθείτε ότι ο ουρανός είναι καθαρός. Δοκιμάστε ξανά αργότερα.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Εκκίνηση GPS</string>
     <string name="gps_wait_for_better_signal">Αναμονή για καλύτερο σήμα GPS</string>
     <string name="gps_wait_for_signal">Αναμονή για σήμα GPS</string>
+    <!-- Image -->
     <string name="image_application">Εφαρμογή</string>
     <string name="image_arrow">Βέλος</string>
     <string name="image_marker">Δείκτης</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Εγγραφή</string>
     <string name="image_stop">Στοπ</string>
     <string name="image_track">Διαδρομή</string>
+    <!-- Import -->
     <string name="import_error">Έγινε εισαγωγή %1$d από %2$s αρχείων από τον κατάλογο %3$s</string>
     <string name="import_no_directory">Ο κατάλογος %1$s δεν υπάρχει</string>
     <string name="import_no_file">Δεν υπάρχουν αρχεία για εισαγωγή. Συνδέστε τη συσκευή σας στον υπολογιστή σας και τοποθετήστε τα αρχεία που θέλετε
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Και τα %1$s</string>
     <string name="import_selection_title">Εισαγωγή από εξωτερικό αποθηκευτικό χώρο</string>
     <string name="import_success">Έγινε εισαγωγή %1$s αρχείων από τον κατάλογο %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Δεν είναι δυνατή η εισαγωγή σήμανσης. Δεν υπάρχει σήμα GPS. Δοκιμάστε ξανά.</string>
     <string name="marker_add_success">Έγινε εισαγωγή δείκτη</string>
     <string name="marker_add_canceled">Ακυρώθηκε, δεν προστέθηκε κανένας δείκτης</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Σήμανση %1$d</string>
     <string name="marker_split_name_format">Διαίρεση %1$d</string>
     <string name="marker_title">%1$d από %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Από την τελευταία σήμανση διαίρεσης:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Τύπος σήμανσης (π.χ. καταρράκτης)</string>
     <string name="marker_edit_marker_type_hint">Τύπος σήμανσης</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Δεν έχετε κανένα δείκτη</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Στατιστικά</string>
     <string name="menu_delete">Διαγραφή</string>
     <string name="menu_edit">Επεξεργασία</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Διακοπή GPS</string>
     <string name="menu_view_photo">Προβολή φωτογραφίας</string>
     <string name="menu_voice_frequency">Συχνότητα ανακοινώσεων</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Υπηρεσία καταγραφής</string>
+    <!-- Search -->
     <string name="search_global_description">Ίχνη και σημάνσεις</string>
     <string name="search_list_empty_message">Δεν υπάρχουν διαδρομές ή δείκτες που να ταιριάζουν στην αναζήτησή σας</string>
     <string name="search_list_marker_track_location">Στο ίχνος \"%1$s\".</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Στάθμη μπαταρίας</string>
     <string name="sensor_state_cadence">Ρυθμός</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Η επιλογή δεν είναι διαθέσιμη κατά την εγγραφή ίχνους</string>
     <string name="settings_show">Εμφάνιση</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Προηγμένες</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Κατά απόσταση</string>
     <string name="settings_chart_by_time">Κατά χρόνο</string>
     <string name="settings_chart_x_axis">Άξονας Χ</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">Ημερομηνία (τοπική)</string>
     <string name="settings_recording_track_name_number_option">Αριθμός</string>
     <string name="settings_recording_track_name_title">Προεπιλεγμένο όνομα ίχνους</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Επαναφορά</string>
     <string name="settings_reset_confirm_message">Όλες οι ρυθμίσεις θα επανέλθουν στις προεπιλεγμένες τιμές.</string>
     <string name="settings_reset_confirm_title">Επαναφορά τώρα;</string>
     <string name="settings_reset_done">Όλες οι ρυθμίσεις έχουν επανέλθει στις προεπιλεγμένες τιμές</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Αισθητήρας</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Αισθητήρας Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Πλάτος/Μήκος</string>
     <string name="settings_stats_rate_title">Προτιμώμενος ρυθμός</string>
     <string name="settings_stats_units_imperial">Αγγλοσαξονικό (μίλια, πόδια)</string>
     <string name="settings_stats_units_metric">Μετρικό (χλμ, μέτρα)</string>
     <string name="settings_stats_units_title">Προτιμώμενες μονάδες</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Κοινή χρήση αρχείου ίχνους</string>
     <string name="share_track_share_file_body">Νομίζω ότι μπορεί να σε ενδιαφέρει αυτό το ίχνος.\n\nΓια να δεις αυτό το ίχνος, χρησιμοποίησε το Google Earth ή άλλο λογισμικό χαρτογράφησης.\n\n%1$s</string>
     <string name="share_track_subject">Θα ήθελα να μοιραστώ μία διαδρομή μαζί σου</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Μέσος ρυθμός κίνησης</string>
     <string name="stats_average_moving_speed">Μέση ταχύτητα κίνησης</string>
     <string name="stats_average_pace">Μέσος ρυθμός</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Ταχύτητα</string>
     <string name="stats_distance">Απόσταση</string>
     <string name="stats_total_time">Συνολικός χρόνος</string>
+    <!-- Track -->
     <string name="track_name_format">Διαδρομή %1$d</string>
     <string name="track_record_notification">Καταγραφή του ίχνους σας…</string>
     <string name="track_markers">%1$s Δείκτες</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Η διαδρομή και οι δείκτες της θα διαγραφούν οριστικά από τη συσκευή.</string>
     <string name="track_delete_one_confirm_title">Διαγραφή διαδρομής;</string>
     <string name="track_delete_multiple_confirm_message">Οι επιλεγμένες διαδρομές και οι δείκτες τους θα διαγραφούν οριστικά από τη συσκευή.</string>
     <string name="track_delete_progress_message">Διαγραφή…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Γράφημα</string>
     <string name="track_detail_stats_tab">Στατιστικά</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Τύπος δραστηριότητας (π.χ. πεζοπορία)</string>
     <string name="track_edit_activity_type_hint">Τύπος δραστηριότητας</string>
     <string name="track_edit_new_track_title">Νέο ίχνος</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Ξεκινήστε την εγγραφή της επόμενης περιπέτειάς σας εδώ</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d ίχνη</string>
     <string name="tracks_many">%1$d ίχνη</string>
     <string name="tracks_one">1 ίχνος</string>
     <string name="tracks_other">%1$d ίχνη</string>
     <string name="tracks_two">2 ίχνη</string>
     <string name="tracks_zero">0 ίχνη</string>
+    <!-- Unit -->
     <string name="unit_feet">πόδια</string>
     <string name="unit_kilometer">χλμ.</string>
     <string name="unit_kilometer_per_hour">χλμ/ώρα</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">μίλια/ώρα</string>
     <string name="unit_minute_per_kilometer">λεπτά / χιλ.</string>
     <string name="unit_minute_per_mile">λεπτά/μίλι</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Προσαρμογή για ακρίβεια</string>
     <string name="value_adapt_battery_life">Καλύτερο για μπατ.</string>
     <string name="value_always">Πάντα</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Απενεργοποιημένο</string>
     <string name="value_smallest">Μικρότερη</string>
     <string name="value_smallest_recommended">Μικρότερη (συνιστάται)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d ώρες</string>
     <string name="voice_hours_many">%1$d ώρες</string>
     <string name="voice_hours_one">1 ώρα</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">συνολική απόσταση 2 μίλια</string>
     <string name="voice_total_distance_miles_zero">συνολική απόσταση 0 μίλια</string>
     <string name="voice_total_distance_zero">OpenTracks συνολική απόσταση μηδέν.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">τράπεζα</string>
     <string name="waypoint_type_bar">μπαρ</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 693cea673..cd6886df8 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -367,14 +367,13 @@ g) haz lo que creas que ayude a OpenTracks.</string>
     <string name="settings_sensor_connecting">Conectado a %1$s</string>
     <string name="settings_sensor_disconnected">Desconectado de %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Tamaño de la rueda (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitud/Longitud</string>
     <string name="settings_stats_rate_title">Ritmo preferido</string>
     <string name="settings_stats_units_imperial">Imperiales (millas, pies)</string>
     <string name="settings_stats_units_metric">Métricas (km, m)</string>
     <string name="settings_stats_units_title">Unidades preferidas</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Compartir el archivo de la ruta</string>
     <string name="share_track_share_file_body">Creo que esta ruta te podría interesar.\n\nPara ver esta ruta, usa Google Earth u otro software de mapas.\n\n%1$s</string>
@@ -497,8 +496,6 @@ g) haz lo que creas que ayude a OpenTracks.</string>
     <string name="voice_speed_miles_per_hour_two">2 millas por hora</string>
     <string name="voice_speed_miles_per_hour_zero">0 millas por hora</string>
     <string name="voice_template">OpenTracks de %1$s en %2$s a %3$s</string>
-    <string name="voice_speed_lap">Velocidad de vuelta de %1$s</string>
-    <string name="voice_pace_lap">Tiempo de vuelta de %1$s</string>
     <string name="voice_total_distance_kilometers_few">distancia total de %1$.2f kilómetros</string>
     <string name="voice_total_distance_kilometers_many">distancia total de %1$.2f kilómetros</string>
     <string name="voice_total_distance_kilometers_one">distancia total de 1 kilómetro</string>
@@ -567,4 +564,5 @@ g) haz lo que creas que ayude a OpenTracks.</string>
     <!-- Share image -->
     <string name="share_image_subject">Me gustaría compartir una imagen contigo</string>
     <string name="share_image_body">Creo que esta imagen te podría interesar.</string>
+
 </resources>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 92206e9ea..3d69918d0 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -364,14 +364,13 @@ g) tehke kõike, mis teie arvates OpenTracks aitab.</string>
     <string name="settings_sensor_connecting">Ühendatud anduriga %1$s</string>
     <string name="settings_sensor_disconnected">Lahti ühendatud %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Ratta suurus (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Laiuskraad/pikkuskraad</string>
     <string name="settings_stats_rate_title">Eelistatud määr</string>
     <string name="settings_stats_units_imperial">Inglise mõõtühikud (miili, jalga)</string>
     <string name="settings_stats_units_metric">Meetermõõdustik (km, m)</string>
     <string name="settings_stats_units_title">Eelistatud ühikud</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Jagage rajafaili</string>
     <string name="share_track_share_file_body">Teile võib see rada huvi pakkuda.\n\nRaja vaatamiseks kasutage rakendust Google Earth või muud kaardistamistarkvara.\n\n%1$s</string>
@@ -562,4 +561,5 @@ g) tehke kõike, mis teie arvates OpenTracks aitab.</string>
     <!-- Share image -->
     <string name="share_image_subject">Tahaksin teiega pilti jagada</string>
     <string name="share_image_body">Ma arvan, et see pilt võiks teid huvitada.</string>
+
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 32294e132..4df217013 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -362,14 +362,13 @@ g) Egin uste duzu OpenTracks-ek laguntzen duela.</string>
     <string name="settings_sensor_connecting">Honekin konektatuta: %1$s</string>
     <string name="settings_sensor_disconnected">Deskonektatuta %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Gurpilaren tamaina (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitudea/Longitudea</string>
     <string name="settings_stats_rate_title">Erritmo hobetsia</string>
     <string name="settings_stats_units_imperial">Inperiala (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrikoa (km, m)</string>
     <string name="settings_stats_units_title">Unitate hobetsiak</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Partekatu ibilbide-fitxategia</string>
     <string name="share_track_share_file_body">Ibilbidea interesgarria gerta dakizukeela uste dut.\n\nIbilbidea ikusteko, erabili Google Earth edo beste kartografia-softwareren bat.\n\n%1$s</string>
@@ -560,4 +559,5 @@ g) Egin uste duzu OpenTracks-ek laguntzen duela.</string>
     <!-- Share image -->
     <string name="share_image_subject">Irudi bat zurekin partekatu nahi nuke</string>
     <string name="share_image_body">Irudi hau interesatuko zaizuela uste dut.</string>
+
 </resources>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 04f986a2a..ad69cd500 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">هواپیما</string>
     <string name="activity_type_atv">تمام وسایل زمینی (ATV)</string>
     <string name="activity_type_biking">دوچرخه‌سواری</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">پیاده‌روی</string>
     <string name="activity_type_water_skiing">اسکی روی آب</string>
     <string name="activity_type_wind_surfing">موج‌سواری</string>
+    <!-- Description -->
     <string name="description_activity_type">نوع فعالیت: %1$s</string>
     <string name="description_average_moving_pace_in_minute">سرعت متوسط حرکت: %1$s دقیقه در کیلومتر (%2$s دقیقه در مایل)</string>
     <string name="description_average_moving_speed">سرعت متوسط حرکت: %1$.2f کیلومتر در ساعت (%2$.1f مایل در ساعت)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">سرعت (دقیقه در مایل)</string>
     <string name="description_pace_metric">سرعت (دقیقه در کیلومتر)</string>
     <string name="description_recorded_time">ثبت شد: %1$s</string>
+    <string name="description_speed_ms">سرعت (متر بر ثانیه)</string>
     <string name="description_sensor_cadence">دوران (دور در دقیقه)</string>
     <string name="description_sensor_heart_rate">ضربان قلب (ضربه در دقیقه)</string>
     <string name="description_sensor_power">توان (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">کل زمان: %1$s</string>
     <string name="description_track_point">نقطه</string>
     <string name="description_track_segment">بخش</string>
+    <!-- Export -->
     <string name="export_all_option">همه به عنوان %1$s</string>
     <string name="export_all_title">صادر کردن به حافظه خارجی</string>
     <string name="export_error">%1$d مسیر از %2$s مسیر به %3$s صادر شد</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">در حال صادر کردن به %1$s…</string>
     <string name="export_success">%1$s مسیر به %2$s صادر شد</string>
     <string name="export_title">صادر کردن به…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d فایل</string>
     <string name="files_many">%1$d فایل</string>
     <string name="files_one">۱ فایل</string>
     <string name="files_other">%1$d فایل</string>
     <string name="files_two">۲ فایل</string>
     <string name="files_zero">۰ فایل</string>
+    <!-- Generic -->
     <string name="generic_add">افزودن</string>
     <string name="generic_cancel">لغو</string>
     <string name="generic_delete_all_confirm_title">حذف همه؟</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">موفقیت‌آمیز بود</string>
     <string name="generic_tracks">مسیرها</string>
     <string name="generic_yes">بله</string>
+    <!-- Gps -->
     <string name="gps_location_access">«دسترسی به موقعیت مکانی»</string>
     <string name="gps_disabled">GPS فعال نیست. برای رفتن به %1$s اینجا ضربه بزنید. برای برگشت دکمه بازگشت را فشار دهید.</string>
     <string name="gps_disabled_my_location">موقعیت مکانی کنونی را نمی‌توان تعیین کرد. در %1$s منابع بیشتری را برای موقعیت مکانی فعال کنید و مطمئن شوید که چیزی مانع دیدن آسمان نباشد. بعداً دوباره امتحان کنید.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">در حال راه‌اندازی GPS</string>
     <string name="gps_wait_for_better_signal">در انتظار سیگنال GPS بهتر</string>
     <string name="gps_wait_for_signal">در انتظار سیگنال GPS</string>
+    <!-- Image -->
     <string name="image_application">برنامه کاربردی</string>
     <string name="image_arrow">پیکان</string>
     <string name="image_marker">نشانگر</string>
@@ -148,6 +171,7 @@
     <string name="image_record">ضبط</string>
     <string name="image_stop">توقف</string>
     <string name="image_track">مسیر</string>
+    <!-- Import -->
     <string name="import_error">%1$d فایل از %2$s فایل از %3$s وارد شد</string>
     <string name="import_no_directory">%1$s وجود ندارد</string>
     <string name="import_no_file">هیچ فایلی برای وارد کردن وجود نداشت. دستگاه‌تان را به رایانه‌تان وصل کنید و فایل‌هایی که می خواهید وارد کنید در %1$s قرار دهید.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">همه %1$s</string>
     <string name="import_selection_title">وارد کردن از حافظه خارجی</string>
     <string name="import_success">%1$s فایل از %2$s وارد شد</string>
+    <!-- Marker -->
     <string name="marker_add_error">درج نشانگر امکان‌پذیر نیست. سیگنال GPS وجود ندارد. دوباره امتحان کنید.</string>
     <string name="marker_add_success">نشانگر درج شد</string>
     <string name="marker_add_canceled">لغو شد، نشانگری اضافه نشد</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">نشانگر %1$d</string>
     <string name="marker_split_name_format">تقسیم گذر %1$d</string>
     <string name="marker_title">%1$d از %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">از آخرین نشانگر تقسیم گذر:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">نوع نشانگر (برای مثال آبشار)</string>
     <string name="marker_edit_marker_type_hint">نوع نشانگر</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">شما هیچ نشانگری ندارید</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">آمار جمع‌آوری‌شده</string>
     <string name="menu_delete">حذف</string>
     <string name="menu_edit">ویرایش</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">توقف GPS</string>
     <string name="menu_view_photo">مشاهده عکس</string>
     <string name="menu_voice_frequency">بسامد اعلان صوتی</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">خدمات ضبط</string>
+    <!-- Search -->
     <string name="search_global_description">گذرها و نشانگرها</string>
     <string name="search_list_empty_message">هیچ مسیر یا نشانگری با جستجوی شما مطابقت نداشت</string>
     <string name="search_list_marker_track_location">در گذر «%1$s».</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">مقدار شارژ باتری</string>
     <string name="sensor_state_cadence">سرعت دورانی</string>
     <string name="sensor_state_cadence_value">%1$d دور در دقیقه</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d وات</string>
     <string name="settings_not_while_recording">در حال ضبط گذر، در دسترس نیست</string>
     <string name="settings_show">نمایش</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">پیشرفته</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">بر حسب مسافت</string>
     <string name="settings_chart_by_time">بر حسب زمان</string>
     <string name="settings_chart_x_axis">محور X</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">تاریخ (محلی)</string>
     <string name="settings_recording_track_name_number_option">شماره</string>
     <string name="settings_recording_track_name_title">نام پیش‌فرض گذر</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">بازنشانی</string>
     <string name="settings_reset_confirm_message">همه تنظیمات به مقادیر پیش‌فرض برگردانده خواهند شد.</string>
     <string name="settings_reset_confirm_title">اکنون بازنشانی شود؟</string>
     <string name="settings_reset_done">تمام تنظیمات به مقادیر پیش‌فرض برگردانده شدند</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">حسگر</string>
     <string name="settings_sensor_bluetooth">بلوتوث</string>
     <string name="settings_sensor_bluetooth_sensor">حسگر بلوتوث</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">عرض جغرافیایی/ طول جغرافیایی</string>
     <string name="settings_stats_rate_title">اولویت سنجه سرعت</string>
     <string name="settings_stats_units_imperial">انگلیسی (مایل، فوت)</string>
     <string name="settings_stats_units_metric">متریک (کیلومتر، متر)</string>
     <string name="settings_stats_units_title">اولویت سیستم اندازه‌گیری</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">اشتراک‌گذاری فایل گذر</string>
     <string name="share_track_share_file_body">فکر می‌کنم به این گذر علاقه‌مند باشید.\n\nبرای مشاهدهٔ این گذر، از Google Earth یا دیگر نرم‌افزارهای نقشه‌برداری استفاده کنید.\n\n‏%1$s</string>
     <string name="share_track_subject">می‌خواهم یک گذر با شما به اشتراک بگذارم</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">میانگین سرعت حرکت</string>
     <string name="stats_average_moving_speed">میانگین سرعت حرکت</string>
     <string name="stats_average_pace">سرعت متوسط</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">سرعت</string>
     <string name="stats_distance">فاصله</string>
     <string name="stats_total_time">کل زمان</string>
+    <!-- Track -->
     <string name="track_name_format">گذر %1$d</string>
     <string name="track_record_notification">ضبط گذر شما…</string>
     <string name="track_markers">نشانگرهای %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">گذر و نشانگرهایش برای همیشه از روی دستگاه حذف خواهند شد.</string>
     <string name="track_delete_one_confirm_title">مسیر حذف شود؟</string>
     <string name="track_delete_multiple_confirm_message">گذرهای انتخاب شده و نشانگرهایشان برای همیشه از دستگاه حذف خواهند شد.</string>
     <string name="track_delete_progress_message">در حال حذف…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">نمودار</string>
     <string name="track_detail_stats_tab">آمار</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">نوع فعالیت (برای مثال پیاده‌روی)</string>
     <string name="track_edit_activity_type_hint">نوع فعالیت</string>
     <string name="track_edit_new_track_title">گذر جدید</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">ضبط ماجراجویی بعدی خودتان را از اینجا شروع کنید</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d گذر</string>
     <string name="tracks_many">%1$d گذر</string>
     <string name="tracks_one">۱ گذر</string>
     <string name="tracks_other">%1$d گذر</string>
     <string name="tracks_two">۲ گذر</string>
     <string name="tracks_zero">۰ گذر</string>
+    <!-- Unit -->
     <string name="unit_feet">فوت</string>
     <string name="unit_kilometer">کیلومتر</string>
     <string name="unit_kilometer_per_hour">کیلومتر در ساعت</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">مایل در ساعت</string>
     <string name="unit_minute_per_kilometer">دقیقه در کیلومتر</string>
     <string name="unit_minute_per_mile">دقیقه در مایل</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">تعدیل به خاطر دقت</string>
     <string name="value_adapt_battery_life">تعدیل به خاطر عمر باتری</string>
     <string name="value_always">همیشه</string>
@@ -314,6 +363,7 @@
     <string name="value_off">خاموش</string>
     <string name="value_smallest">کوچکترین</string>
     <string name="value_smallest_recommended">کوچکترین (توصیه می‌شود)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d ساعت</string>
     <string name="voice_hours_many">%1$d ساعت</string>
     <string name="voice_hours_one">۱ ساعت</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">کل مسافت 2 مایل</string>
     <string name="voice_total_distance_miles_zero">کل مسافت 0 مایل</string>
     <string name="voice_total_distance_zero">جمع مسافت OpenTracks صفر است.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">خودپرداز</string>
     <string name="waypoint_type_bank">بانک</string>
     <string name="waypoint_type_bar">بار</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 825650abb..0aaee7f54 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -375,8 +375,6 @@ jotta ne voidaan tuoda kohteeseen %1$s.</string>
     <string name="settings_sensor_connecting">Yhdistetty: %1$s</string>
     <string name="settings_sensor_disconnected">Yhteys katkaistu: %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Renkaan koko (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Leveys-/pituusaste</string>
     <string name="settings_stats_rate_title">Haluttu nopeus</string>
@@ -384,6 +382,7 @@ jotta ne voidaan tuoda kohteeseen %1$s.</string>
 (maili, jalka)</string>
     <string name="settings_stats_units_metric">Metrijärjestelmä (km, m)</string>
     <string name="settings_stats_units_title">Halutut yksiköt</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Jaa reittitiedosto</string>
     <string name="share_track_share_file_body">Luulen, että voisit olla kiinnostunut tästä reitistä.\n\nNäet reitin käyttämällä Google Earth -palvelua tai muuta kartoitusohjelmistoa.\n\n%1$s</string>
@@ -576,4 +575,5 @@ jotta ne voidaan tuoda kohteeseen %1$s.</string>
     <!-- Share image -->
     <string name="share_image_subject">Haluaisin jakaa kuvan kanssasi</string>
     <string name="share_image_body">Luulen, että voisit olla kiinnostunut tästä kuvasta.</string>
+
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index f38c2dac8..4f88a2534 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -366,14 +366,13 @@ g) faire tout ce qui vous semble utile à OpenTracks.</string>
     <string name="settings_sensor_connecting">Connecté à %1$s</string>
     <string name="settings_sensor_disconnected">Déconnecté de %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Taille des roues (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitude/Longitude</string>
     <string name="settings_stats_rate_title">Mode de calcul souhaité</string>
     <string name="settings_stats_units_imperial">Unités impériales (mi, pi)</string>
     <string name="settings_stats_units_metric">Unités métriques (km, m)</string>
     <string name="settings_stats_units_title">Unités souhaitées</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Partager le fichier du parcours</string>
     <string name="share_track_share_file_body">Je pense que ce parcours peut t\'intéresser.\n\nPour l\'afficher, utilise Google Earth ou un autre logiciel de cartographie.\n\n%1$s</string>
@@ -564,4 +563,5 @@ g) faire tout ce qui vous semble utile à OpenTracks.</string>
     <!-- Share image -->
     <string name="share_image_subject">J aimerais partager une image avec vous</string>
     <string name="share_image_body">Je pense que cette image pourrait vous intéresser.</string>
+
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 0ac4952ce..caaff4a7e 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -109,6 +109,7 @@ g) calquera cousa que estimes axuda a OpenTracks.</string>
     <string name="activity_type_driving">en coche</string>
     <string name="activity_type_driving_bus">conducir un autobús</string>
     <string name="activity_type_driving_car">conducir un coche</string>
+    <string name="activity_type_escooter">motoreta</string>
     <string name="activity_type_ferry">transbordador</string>
     <string name="activity_type_frisbee">frisbee</string>
     <string name="activity_type_gliding">voo sen motor</string>
@@ -244,6 +245,8 @@ g) calquera cousa que estimes axuda a OpenTracks.</string>
     <string name="gps_starting">Iniciando o GPS</string>
     <string name="gps_wait_for_better_signal">Agardando un mellor sinal de GPS</string>
     <string name="gps_wait_for_signal">Agardando un sinal de GPS</string>
+    <string name="gps_disabled_msg">GPS desactivado</string>
+    <string name="gps_fixed_and_ready">GPS fixado e preparado</string>
     <!-- Image -->
     <string name="image_application">Aplicación</string>
     <string name="image_arrow">Frecha</string>
@@ -343,6 +346,8 @@ g) calquera cousa que estimes axuda a OpenTracks.</string>
     <string name="settings_recording_show_on_lockscreen_while_recording_summary">Ao gravar, mostra estatísticas sen desbloquear o dispositivo.</string>
     <string name="settings_recording_keep_screen_on_while_recording_title">Manter pantalla acesa</string>
     <string name="settings_recording_keep_screen_on_while_recording_summary">Ao gravar, manten a pantalla acesa.</string>
+    <string name="settings_recording_fullscreen_on_while_recording_title">Pantalla completa</string>
+    <string name="settings_recording_fullscreen_on_while_recording_summary">Mentras grava, mostrar a pantalla completa.</string>
     <string name="settings_recording">Gravación</string>
     <string name="settings_recording_auto_resume_track_timeout_always_summary">Retomar sempre unha gravación ao reiniciar o sistema</string>
     <string name="settings_recording_auto_resume_track_timeout_never_summary">Non retomar nunca unha gravación ao reiniciar o sistema</string>
@@ -381,6 +386,7 @@ g) calquera cousa que estimes axuda a OpenTracks.</string>
     <string name="settings_stats_units_imperial">Imperiais (millas, pés)</string>
     <string name="settings_stats_units_metric">Métricas (km, m)</string>
     <string name="settings_stats_units_title">Unidades preferidas</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Compartir ficheiro de traxecto</string>
     <string name="share_track_share_file_body">Creo que che pode interesar este traxecto.\n\nPara velo, utiliza Google Earth ou outro programa de mapas.\n\n%1$s</string>
@@ -425,6 +431,8 @@ g) calquera cousa que estimes axuda a OpenTracks.</string>
     <string name="track_edit_new_track_title">Novo traxecto</string>
     <!-- Track List -->
     <string name="track_list_empty_message">Empeza a gravar aquí a túa próxima aventura</string>
+    <!-- Aggregated Statistics -->
+    <string name="aggregated_stats_empty_message">Grava a túa primeira ruta para ver estatísticas </string>
     <!-- Track Widget -->
     <!-- Tracks -->
     <string name="tracks_few">%1$d rutas</string>
@@ -571,4 +579,7 @@ g) calquera cousa que estimes axuda a OpenTracks.</string>
     <!-- Share image -->
     <string name="share_image_subject">Quixera compartir unha imaxe contigo</string>
     <string name="share_image_body">Creo que che podería gustar esta imaxe.</string>
+
+    <string name="hold_to_stop">Mantén preso para deixar de gravar</string>
+    <string name="hold_to_pause">Mantén preso para pausar a gravación</string>
 </resources>
diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml
index 5fd3bbcf1..f7fac1219 100644
--- a/src/main/res/values-hi/strings.xml
+++ b/src/main/res/values-hi/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">विमान</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">बाइकिंग</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">चलना</string>
     <string name="activity_type_water_skiing">वॉटर स्कीइंग</string>
     <string name="activity_type_wind_surfing">विंड सर्फ़िंग</string>
+    <!-- Description -->
     <string name="description_activity_type">गतिविधि प्रकार: %1$s</string>
     <string name="description_average_moving_pace_in_minute">चलने की औसत गति: %1$s मिनट/किमी (%2$s मिनट/मील)</string>
     <string name="description_average_moving_speed">चलने की औसत गति: %1$.2f किमी/घं ( %2$.1f मील/घं)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">गति (मिनट/मील)</string>
     <string name="description_pace_metric">गति (मिनट/किमी)</string>
     <string name="description_recorded_time">रिकॉर्ड किया गया: %1$s</string>
+    <string name="description_speed_ms">गति (मी/से)</string>
     <string name="description_sensor_cadence">लय (आरपीएम)</string>
     <string name="description_sensor_heart_rate">हृदय दर (बीपीएम)</string>
     <string name="description_sensor_power">पावर (वाट)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">कुल समय: %1$s</string>
     <string name="description_track_point">बिंदु</string>
     <string name="description_track_segment">खंड</string>
+    <!-- Export -->
     <string name="export_all_option">%1$s के रूप वाले सभी को</string>
     <string name="export_all_title">बाह्य संग्रहण पर निर्यात करें</string>
     <string name="export_error">%2$s में से %1$d को %3$s पर निर्यात गया</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">%1$s पर निर्यात किया जा रहा है…</string>
     <string name="export_success">%1$s को %2$s पर निर्यात किया गया</string>
     <string name="export_title">यहां निर्यात करें…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d फ़ाइलें</string>
     <string name="files_many">%1$d फ़ाइलें</string>
     <string name="files_one">1 फ़ाइल</string>
     <string name="files_other">%1$d फ़ाइलें</string>
     <string name="files_two">2 फ़ाइलें</string>
     <string name="files_zero">0 फ़ाइलें</string>
+    <!-- Generic -->
     <string name="generic_add">जोड़ें</string>
     <string name="generic_cancel">रद्द करें</string>
     <string name="generic_delete_all_confirm_title">सभी हटाएं?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">सफलता</string>
     <string name="generic_tracks">ट्रैक</string>
     <string name="generic_yes">हां</string>
+    <!-- Gps -->
     <string name="gps_location_access">सही स्थान</string>
     <string name="gps_disabled">GPS अक्षम है. %1$s पर जाने के लिए यहां टैप करें. लौटने के लिए  वापस जाएं बटन को दबाएं.</string>
     <string name="gps_disabled_my_location">वर्तमान स्थान का निर्धारण नहीं किया जा सकता. %1$s पर अधिक स्थान स्रोतों को सक्षम करें और सुनिश्चित करें कि आसमान दिख रहा है. बाद में पुन: प्रयास करें.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">GPS को प्रारंभ किया जा रहा है</string>
     <string name="gps_wait_for_better_signal">बेहतर GPS सिग्नल की प्रतीक्षा की जा रही है</string>
     <string name="gps_wait_for_signal">GPS सिग्नल की प्रतीक्षा की जा रही है</string>
+    <!-- Image -->
     <string name="image_application">एप्लिकेशन</string>
     <string name="image_arrow">तीर</string>
     <string name="image_marker">मार्कर</string>
@@ -148,6 +171,7 @@
     <string name="image_record">रिकॉर्ड करें</string>
     <string name="image_stop">रोकें</string>
     <string name="image_track">ट्रैक</string>
+    <!-- Import -->
     <string name="import_error">%3$s से %2$s में से %1$d आयातित</string>
     <string name="import_no_directory">%1$s मौजूद नहीं है</string>
     <string name="import_no_file">आयात करने के लिए कोई फ़ाइल नहीं थी. अपने उपकरण को अपने कंप्यूटर से कनेक्ट करें और आयात की जाने वाली फ़ाइलों को %1$s में रखें.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">सभी %1$s</string>
     <string name="import_selection_title">बाह्य संग्रहण से आयात करें</string>
     <string name="import_success">%2$s से %1$s आयातित</string>
+    <!-- Marker -->
     <string name="marker_add_error">मार्कर नहीं डाल सके. कोई GPS सिग्नल नहीं है. फिर से कोशिश करें.</string>
     <string name="marker_add_success">एक मार्कर सम्मिलित किया गया</string>
     <string name="marker_add_canceled">रद्द किया गया, कोई मार्कर जोड़ा नहीं गया</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">मार्कर %1$d</string>
     <string name="marker_split_name_format">विभाजन %1$d</string>
     <string name="marker_title">%2$d में से %1$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">पिछले विभाजन मार्कर के बाद से:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">मार्कर प्रकार (उदा., झरना)</string>
     <string name="marker_edit_marker_type_hint">मार्कर प्रकार</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">आपके पास कोई मार्कर नहीं है</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">सकल आंकड़े</string>
     <string name="menu_delete">हटाएं</string>
     <string name="menu_edit">संपादित करें</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">GPS बंद करें</string>
     <string name="menu_view_photo">फ़ोटो देखें</string>
     <string name="menu_voice_frequency">ध्वनि आवृत्ति</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">रिकॉर्डिंग सेवा</string>
+    <!-- Search -->
     <string name="search_global_description">ट्रैक और मार्कर</string>
     <string name="search_list_empty_message">किसी भी ट्रैक या मार्कर का आपकी खोज से मिलान नहीं हुआ</string>
     <string name="search_list_marker_track_location">ट्रैक \'%1$s\' में.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">बैटरी स्‍तर</string>
     <string name="sensor_state_cadence">केडेंस</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">ट्रैक रिकॉर्ड करते समय उपलब्ध नहीं</string>
     <string name="settings_show">दिखाएं</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">उन्नत</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">दूरी के अनुसार</string>
     <string name="settings_chart_by_time">समय के अनुसार</string>
     <string name="settings_chart_x_axis">एक्स अक्ष</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">तिथि (स्थानीय)</string>
     <string name="settings_recording_track_name_number_option">नंबर</string>
     <string name="settings_recording_track_name_title">डिफ़ॉल्ट ट्रैक नाम</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">रीसेट करें</string>
     <string name="settings_reset_confirm_message">सभी सेटिंग को डिफ़ॉल्ट मानों पर उलट दिया जाएगा.</string>
     <string name="settings_reset_confirm_title">अभी रीसेट करें?</string>
     <string name="settings_reset_done">सभी सेटिंग को सामान्य मानों में उलट दिया गया है</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">सेंसर</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth सेंसर</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">अक्षांश/देशांतर</string>
     <string name="settings_stats_rate_title">पसंदीदा दर</string>
     <string name="settings_stats_units_imperial">इंपीरियल (मील, फुट)</string>
     <string name="settings_stats_units_metric">मेट्रिक (किमी, मी)</string>
     <string name="settings_stats_units_title">पसंदीदा इकाइयां</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">ट्रैक फ़ाइल को साझा करें</string>
     <string name="share_track_share_file_body">मेरा विचार है कि आपको इस ट्रैक में रुचि हो सकती है.\n\nइस ट्रैक को देखने के लिए Google Earth या अन्य मानचित्रन सॉफ्टवेयर का उपयोग करें.\n\n%1$s</string>
     <string name="share_track_subject">मैं आपके साथ एक ट्रैक साझा करना चाहता/चाहती हूं</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">चलने की औसत प्रगति</string>
     <string name="stats_average_moving_speed">चलने की औसत गति</string>
     <string name="stats_average_pace">औसत प्रगति</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">गति</string>
     <string name="stats_distance">दूरी</string>
     <string name="stats_total_time">कुल समय</string>
+    <!-- Track -->
     <string name="track_name_format">ट्रैक %1$d</string>
     <string name="track_record_notification">आपका ट्रैक रिकॉर्ड कर रहा है…</string>
     <string name="track_markers">%1$s मार्कर</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">ट्रैक और इसके मार्कर को उपकरण से स्थायी रूप से हटा दिया जाएगा.</string>
     <string name="track_delete_one_confirm_title">ट्रैक हटाएं?</string>
     <string name="track_delete_multiple_confirm_message">चयनित ट्रैक और उनके मार्कर को उपकरण से स्थायी रूप से हटा दिया जाएगा.</string>
     <string name="track_delete_progress_message">हटा रहा है…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">चार्ट</string>
     <string name="track_detail_stats_tab">आंकड़े</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">गतिविधि प्रकार (उदा. हाइकिंग)</string>
     <string name="track_edit_activity_type_hint">गतिविधि प्रकार</string>
     <string name="track_edit_new_track_title">नया ट्रैक</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">अपनी अगली साहसिक यात्रा यहां रिकॉर्ड करना शुरू करें</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d ट्रैक</string>
     <string name="tracks_many">%1$d ट्रैक</string>
     <string name="tracks_one">1 ट्रैक</string>
     <string name="tracks_other">%1$d ट्रैक</string>
     <string name="tracks_two">2 ट्रैक</string>
     <string name="tracks_zero">0 ट्रैक</string>
+    <!-- Unit -->
     <string name="unit_feet">फ़ीट</string>
     <string name="unit_kilometer">किमी</string>
     <string name="unit_kilometer_per_hour">किमी/घं</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">मि/घं</string>
     <string name="unit_minute_per_kilometer">मि/किमी</string>
     <string name="unit_minute_per_mile">मि/मील</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">सटीकता के लिए ग्रहण करें</string>
     <string name="value_adapt_battery_life">बैटरी जीवन के लिए ग्रहण करें</string>
     <string name="value_always">हमेशा</string>
@@ -314,6 +363,7 @@
     <string name="value_off">बंद करें</string>
     <string name="value_smallest">सबसे छोटा</string>
     <string name="value_smallest_recommended">सबसे छोटा (अनुशंसित)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d घंटे</string>
     <string name="voice_hours_many">%1$d घंटे</string>
     <string name="voice_hours_one">1 घंटा</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">कुल दूरी 2 मील</string>
     <string name="voice_total_distance_miles_zero">कुल दूरी 0 मील</string>
     <string name="voice_total_distance_zero">मेरे ट्रैक की कुल दूरी शून्य है.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">बैंक</string>
     <string name="waypoint_type_bar">बार</string>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index 11c779703..f6b7284ef 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">zrakoplov</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">biciklizam</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">hodanje</string>
     <string name="activity_type_water_skiing">skijanje na vodi</string>
     <string name="activity_type_wind_surfing">jedrenje na dasci</string>
+    <!-- Description -->
     <string name="description_activity_type">Aktivnost: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Prosječan tempo kretanja: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Prosječna brzina kretanja: %1$.2f km/h (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempo (min/mi)</string>
     <string name="description_pace_metric">Tempo (min/km)</string>
     <string name="description_recorded_time">Zabilježeno: %1$s</string>
+    <string name="description_speed_ms">Brzina (m/s)</string>
     <string name="description_sensor_cadence">Ritam (min)</string>
     <string name="description_sensor_heart_rate">Brzina otkucaja srca (o/min)</string>
     <string name="description_sensor_power">Snaga (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Ukupno vrijeme: %1$s</string>
     <string name="description_track_point">Točka</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Sve kao %1$s</string>
     <string name="export_all_title">Izvoz u vanjsku pohranu</string>
     <string name="export_error">Izvezeno u direktorij %3$s: %1$d od %2$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Izvoz u direktorij %1$s…</string>
     <string name="export_success">Izvezeno u direktorij %2$s: %1$s</string>
     <string name="export_title">Izvoz u…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d datoteke</string>
     <string name="files_many">%1$d datoteka</string>
     <string name="files_one">1 datoteka</string>
     <string name="files_other">%1$d datoteka</string>
     <string name="files_two">2 datoteke</string>
     <string name="files_zero">0 datoteka</string>
+    <!-- Generic -->
     <string name="generic_add">Dodaj</string>
     <string name="generic_cancel">Otkaži</string>
     <string name="generic_delete_all_confirm_title">Želite li izbrisati sve?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Uspjeh</string>
     <string name="generic_tracks">Trase</string>
     <string name="generic_yes">Da</string>
+    <!-- Gps -->
     <string name="gps_location_access">\"Pristup lokaciji\"</string>
     <string name="gps_disabled">GPS nije omogućen. Dotaknite ovdje da biste posjetili %1$s. Pritisnite gumb Natrag da biste se vratili.</string>
     <string name="gps_disabled_my_location">Nije moguće utvrditi trenutačnu lokaciju. Omogućite više izvora lokacije u odjeljku %1$s i provjerite je li nebo vidljivo. Pokušajte ponovo kasnije.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Pokretanje GPS-a</string>
     <string name="gps_wait_for_better_signal">Čeka se bolji signal GPS-a</string>
     <string name="gps_wait_for_signal">Čeka se signal GPS-a</string>
+    <!-- Image -->
     <string name="image_application">Aplikacija</string>
     <string name="image_arrow">Strelica</string>
     <string name="image_marker">Oznaka</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Snimanje</string>
     <string name="image_stop">Stop</string>
     <string name="image_track">Trasa</string>
+    <!-- Import -->
     <string name="import_error">Uvezeno iz direktorija %3$s: %1$d od %2$s</string>
     <string name="import_no_directory">%1$s ne postoji</string>
     <string name="import_no_file">Nije bilo datoteka za uvoz. Povežite svoj uređaj s računalom i spremite datoteke za
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Sve %1$s datoteke</string>
     <string name="import_selection_title">Uvoz s vanjske pohrane</string>
     <string name="import_success">Uvezeno iz direktorija %2$s: %1$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Nije moguće umetnuti oznaku. Nema signala GPS-a. Pokušajte ponovo.</string>
     <string name="marker_add_success">Oznaka je umetnuta</string>
     <string name="marker_add_canceled">Otkazano, oznaka nije dodana</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Oznaka %1$d</string>
     <string name="marker_split_name_format">Podijeljena %1$d</string>
     <string name="marker_title">%1$d od %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Od posljednje podijeljene oznake:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Vrsta oznake (npr. slap)</string>
     <string name="marker_edit_marker_type_hint">Vrsta oznake</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Nemate nijednu oznaku</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Skupna statistika</string>
     <string name="menu_delete">Izbriši</string>
     <string name="menu_edit">Uredi</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Zaustavi GPS</string>
     <string name="menu_view_photo">Prikaz fotografije</string>
     <string name="menu_voice_frequency">Učest. glas. objava</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Usluga snimanja</string>
+    <!-- Search -->
     <string name="search_global_description">Staze i oznake</string>
     <string name="search_list_empty_message">Nijedna trasa ni oznaka ne odgovaraju vašem pretraživanju</string>
     <string name="search_list_marker_track_location">Na stazi \"%1$s\".</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Razina baterije</string>
     <string name="sensor_state_cadence">Kadenca</string>
     <string name="sensor_state_cadence_value">%1$d o/min</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Nije dostupno tijekom snimanja staze</string>
     <string name="settings_show">Prikaži</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Napredno</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Prema udaljenosti</string>
     <string name="settings_chart_by_time">Prema vremenu</string>
     <string name="settings_chart_x_axis">Os X</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">Datum (lokalno)</string>
     <string name="settings_recording_track_name_number_option">Broj</string>
     <string name="settings_recording_track_name_title">Zadani naziv staze</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Poništiti</string>
     <string name="settings_reset_confirm_message">Sve će se postavke vratiti na zadane vrijednosti.</string>
     <string name="settings_reset_confirm_title">Želite li sada vratiti na zadano?</string>
     <string name="settings_reset_done">Sve su postavke vraćene na zadane vrijednosti</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Senzor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Senzor Bluetootha</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Geografska širina/duljina</string>
     <string name="settings_stats_rate_title">Preferirana stopa</string>
     <string name="settings_stats_units_imperial">Imperijalne (milje, stope)</string>
     <string name="settings_stats_units_metric">Metričke (km, m)</string>
     <string name="settings_stats_units_title">Preferirane jedinice</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Dijelite datoteku staze</string>
     <string name="share_track_share_file_body">Mislim da bi vam ova staza mogla biti zanimljiva.\n\nDa biste ju pogledali, upotrijebite Google Earth ili neki drugi softver za izradu karata.\n\n%1$s</string>
     <string name="share_track_subject">Želim podijeliti stazu s vama.</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Prosj. tempo kretanja</string>
     <string name="stats_average_moving_speed">Prosj. brzina kretanja</string>
     <string name="stats_average_pace">Prosj. tempo</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Brzina</string>
     <string name="stats_distance">Udaljenost</string>
     <string name="stats_total_time">Ukupno vrijeme</string>
+    <!-- Track -->
     <string name="track_name_format">Staza %1$d</string>
     <string name="track_record_notification">Snimanje vaše staze…</string>
     <string name="track_markers">%1$s: oznake</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Staza i njezine oznake trajno će se izbrisati s uređaja.</string>
     <string name="track_delete_one_confirm_title">Želite li izbrisati trasu?</string>
     <string name="track_delete_multiple_confirm_message">Odabrane staze i njihove oznake trajno će se izbrisati s uređaja.</string>
     <string name="track_delete_progress_message">Brisanje…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Grafikon</string>
     <string name="track_detail_stats_tab">Statistički podaci</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Vrsta aktivnosti (npr. pješačenje)</string>
     <string name="track_edit_activity_type_hint">Vrsta aktivnosti</string>
     <string name="track_edit_new_track_title">Nova staza</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Počnite snimati svoju sljedeću avanturu ovdje</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d staze</string>
     <string name="tracks_many">%1$d staza</string>
     <string name="tracks_one">1 staza</string>
     <string name="tracks_other">%1$d staza</string>
     <string name="tracks_two">2 staze</string>
     <string name="tracks_zero">0 staza</string>
+    <!-- Unit -->
     <string name="unit_feet">ft</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">mi/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Prilagodba radi točnosti</string>
     <string name="value_adapt_battery_life">Prilagodi vijeku trajanja baterije</string>
     <string name="value_always">Uvijek</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Isključeno</string>
     <string name="value_smallest">Najmanja</string>
     <string name="value_smallest_recommended">Najmanji (preporučeno)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d sata</string>
     <string name="voice_hours_many">%1$d sati</string>
     <string name="voice_hours_one">1 sat</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">ukupna udaljenost dvije milje</string>
     <string name="voice_total_distance_miles_zero">ukupna udaljenost 0 milja</string>
     <string name="voice_total_distance_zero">Ukupna udaljenost aplikacije OpenTracks iznosi nula.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Bankomat</string>
     <string name="waypoint_type_bank">banka</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index dd0d60b3d..da83a66cb 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">repülőgép</string>
     <string name="activity_type_atv">terepjáró</string>
     <string name="activity_type_biking">kerékpározás</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">gyaloglás</string>
     <string name="activity_type_water_skiing">vízisí</string>
     <string name="activity_type_wind_surfing">szörfözés</string>
+    <!-- Description -->
     <string name="description_activity_type">Tevékenység típusa: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Átlagos haladási tempó: %1$s perc/km (%2$s perc/mérföld)</string>
     <string name="description_average_moving_speed">Átlagos haladási sebesség: %1$.2f km/óra (%2$.1f mérföld/óra)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempó (perc/mérföld)</string>
     <string name="description_pace_metric">Tempó (perc/km)</string>
     <string name="description_recorded_time">Rögzítés: %1$s</string>
+    <string name="description_speed_ms">Sebesség (m/s)</string>
     <string name="description_sensor_cadence">Pedálfordulat (ford./perc)</string>
     <string name="description_sensor_heart_rate">Szívverés (ütés/perc)</string>
     <string name="description_sensor_power">Teljesítmény (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Teljes idő: %1$s</string>
     <string name="description_track_point">Pont</string>
     <string name="description_track_segment">Szakasz</string>
+    <!-- Export -->
     <string name="export_all_option">Mindent %1$s formátumban</string>
     <string name="export_all_title">Exportálás külső tárhelyre</string>
     <string name="export_error">%1$d/%2$s exportálva ide: %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Exportálás ide: %1$s…</string>
     <string name="export_success">%1$s exportálva ide: %2$s</string>
     <string name="export_title">Exportálás ide:…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d fájl</string>
     <string name="files_many">%1$d fájl</string>
     <string name="files_one">1 fájl</string>
     <string name="files_other">%1$d fájl</string>
     <string name="files_two">2 fájl</string>
     <string name="files_zero">0 fájl</string>
+    <!-- Generic -->
     <string name="generic_add">Hozzáadás</string>
     <string name="generic_cancel">Mégse</string>
     <string name="generic_delete_all_confirm_title">Mindent töröl?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Sikerült</string>
     <string name="generic_tracks">Számok</string>
     <string name="generic_yes">Igen</string>
+    <!-- Gps -->
     <string name="gps_location_access">\'Helyhozzáférés\'</string>
     <string name="gps_disabled">A GPS nincs engedélyezve. Érintse meg itt, ha a következőre szeretne lépni: %1$s. A visszalépéshez nyomja meg a vissza gombot.</string>
     <string name="gps_disabled_my_location">Jelenlegi helyét nem lehet meghatározni. Engedélyezzen több helyforrást itt: %1$s, és gondoskodjon arról, hogy az ég látható legyen. Próbálja meg később.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">GPS indítása</string>
     <string name="gps_wait_for_better_signal">Várakozás jobb GPS-jelre</string>
     <string name="gps_wait_for_signal">Várakozás GPS-jelre</string>
+    <!-- Image -->
     <string name="image_application">Alkalmazás</string>
     <string name="image_arrow">Nyíl</string>
     <string name="image_marker">Jelölő</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Rögzítés</string>
     <string name="image_stop">Leállítás</string>
     <string name="image_track">Útvonal</string>
+    <!-- Import -->
     <string name="import_error">%1$d/%2$s importálva innen: %3$s</string>
     <string name="import_no_directory">%1$s nem létezik</string>
     <string name="import_no_file">Nem voltak importálandó fájlok. Csatlakoztassa az eszközt a számítógéphez, és helyezze az importálni
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Minden %1$s formátumú</string>
     <string name="import_selection_title">Importálás külső tárhelyről</string>
     <string name="import_success">%1$s importálva innen: %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Nem sikerült jelölőt beilleszteni. Nincs GPS-jel. Próbálja újra.</string>
     <string name="marker_add_success">Jelölő beszúrása megtörtént</string>
     <string name="marker_add_canceled">Jelölő megadása nélkül megszakítva</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">%1$d. jelölő</string>
     <string name="marker_split_name_format">%1$d. felosztott</string>
     <string name="marker_title">%1$d/%2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Utolsó felosztott jelölő óta:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Jelölő típusa (pl. vízesés)</string>
     <string name="marker_edit_marker_type_hint">Jelölő típusa</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Nincsenek jelölők</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Összesítő statisztika</string>
     <string name="menu_delete">Törlés</string>
     <string name="menu_edit">Szerkesztés</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">GPS leállítása</string>
     <string name="menu_view_photo">Fotó megtekintése</string>
     <string name="menu_voice_frequency">Utasítások gyakorisága</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Rögzítőszolgáltatás</string>
+    <!-- Search -->
     <string name="search_global_description">Útvonalak és jelölők</string>
     <string name="search_list_empty_message">Egyetlen útvonal vagy jelölő sem felelt meg a keresésnek</string>
     <string name="search_list_marker_track_location">„%1$s” pályán.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Akkumulátor töltöttségi szintje</string>
     <string name="sensor_state_cadence">Fordulatszám</string>
     <string name="sensor_state_cadence_value">%1$d fordulat/perc</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Pálya rögzítése közben nem érhető el</string>
     <string name="settings_show">Megjelenítés</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Speciális</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Távolság szerint</string>
     <string name="settings_chart_by_time">Idő szerint</string>
     <string name="settings_chart_x_axis">X tengely</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">Dátum (helyi)</string>
     <string name="settings_recording_track_name_number_option">Szám</string>
     <string name="settings_recording_track_name_title">Pálya alapértelmezett neve</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Visszaállítás</string>
     <string name="settings_reset_confirm_message">Minden beállítás visszaáll az alapértelmezett értékekre.</string>
     <string name="settings_reset_confirm_title">Visszaállítja most?</string>
     <string name="settings_reset_done">Minden beállítás visszaállt az alapértelmezett értékre</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Érzékelő</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth érzékelő</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Szélesség/hosszúság</string>
     <string name="settings_stats_rate_title">Mérték választása</string>
     <string name="settings_stats_units_imperial">Angolszász (mérföld, láb)</string>
     <string name="settings_stats_units_metric">Metrikus (km, m)</string>
     <string name="settings_stats_units_title">Mértékegység választása</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Útvonal-fájl megosztása</string>
     <string name="share_track_share_file_body">Szerintem érdekelni fog ez a pálya.\n\nA pályát a Google Earth vagy más térképszoftver segítségével nézheted meg.\n\n%1$s</string>
     <string name="share_track_subject">Szeretnék megosztani veled egy pályát</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Mozgás átlagos irama</string>
     <string name="stats_average_moving_speed">Mozgás átlagos sebessége</string>
     <string name="stats_average_pace">Átlagos iram</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Sebesség</string>
     <string name="stats_distance">Távolság</string>
     <string name="stats_total_time">Összes idő</string>
+    <!-- Track -->
     <string name="track_name_format">%1$d. pálya</string>
     <string name="track_record_notification">Útvonal rögzítése…</string>
     <string name="track_markers">%1$s jelölői</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Az útvonal és a jelölők véglegesen törlődnek az eszközről.</string>
     <string name="track_delete_one_confirm_title">Törli az útvonalat?</string>
     <string name="track_delete_multiple_confirm_message">Az kiválasztott útvonalak és a jelölőik véglegesen törlődnek az eszközről.</string>
     <string name="track_delete_progress_message">Törlés folyamatban…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Grafikon</string>
     <string name="track_detail_stats_tab">Statisztikák</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Tevékenység típusa (pl. túrázás)</string>
     <string name="track_edit_activity_type_hint">Tevékenység típusa</string>
     <string name="track_edit_new_track_title">Új útvonal</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Indítsa el következő kalandja rögzítését itt</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d pálya</string>
     <string name="tracks_many">%1$d pálya</string>
     <string name="tracks_one">1 pálya</string>
     <string name="tracks_other">%1$d pálya</string>
     <string name="tracks_two">2 pálya</string>
     <string name="tracks_zero">0 pálya</string>
+    <!-- Unit -->
     <string name="unit_feet">láb</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/ó</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">mérföld/ó</string>
     <string name="unit_minute_per_kilometer">perc/km</string>
     <string name="unit_minute_per_mile">perc/mérföld</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Beállítás pontossághoz</string>
     <string name="value_adapt_battery_life">Akkumulátor élettartama szerint</string>
     <string name="value_always">Mindig</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Ki</string>
     <string name="value_smallest">Legkisebb</string>
     <string name="value_smallest_recommended">Legkisebb (ajánlott)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d óra</string>
     <string name="voice_hours_many">%1$d óra</string>
     <string name="voice_hours_one">1 óra</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">össztávolság: 2 mérföld</string>
     <string name="voice_total_distance_miles_zero">össztávolság: 0 mérföld</string>
     <string name="voice_total_distance_zero">Saját útvonalak - össztávolság nulla.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">bankautomata</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bár</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 5c6d47eba..2c035b75e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">aereo</string>
     <string name="activity_type_atv">fuoristrada</string>
     <string name="activity_type_biking">bicicletta</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">camminare</string>
     <string name="activity_type_water_skiing">sci d\'acqua</string>
     <string name="activity_type_wind_surfing">windsurf</string>
+    <!-- Description -->
     <string name="description_activity_type">Tipo di attività: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Ritmo di spostamento medio: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Velocità di spostamento media: %1$.2f km/h (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Ritmo (min/mi)</string>
     <string name="description_pace_metric">Ritmo (min/km)</string>
     <string name="description_recorded_time">Registrato: %1$s</string>
+    <string name="description_speed_ms">Velocità (m/s)</string>
     <string name="description_sensor_cadence">Cadenza (rpm)</string>
     <string name="description_sensor_heart_rate">Frequenza cardiaca (bpm)</string>
     <string name="description_sensor_power">Potenza (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Tempo totale: %1$s</string>
     <string name="description_track_point">Punto</string>
     <string name="description_track_segment">Segmento</string>
+    <!-- Export -->
     <string name="export_all_option">Tutto come %1$s</string>
     <string name="export_all_title">Esporta nella memoria esterna</string>
     <string name="export_error">Esportati %1$d di %2$s in %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Esportazioni su %1$s…</string>
     <string name="export_success">Esportati %1$s in %2$s.</string>
     <string name="export_title">Esporta in…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d file</string>
     <string name="files_many">%1$d file</string>
     <string name="files_one">1 file</string>
     <string name="files_other">%1$d file</string>
     <string name="files_two">2 file</string>
     <string name="files_zero">0 file</string>
+    <!-- Generic -->
     <string name="generic_add">Aggiungi</string>
     <string name="generic_cancel">Annulla</string>
     <string name="generic_delete_all_confirm_title">Eliminare tutto?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Riuscito</string>
     <string name="generic_tracks">Percorsi</string>
     <string name="generic_yes">Sì</string>
+    <!-- Gps -->
     <string name="gps_location_access">\"Accesso alla posizione\"</string>
     <string name="gps_disabled">GPS non attivato. Tocca qui per andare a %1$s. Poi premi il pulsante per tornare indietro.</string>
     <string name="gps_disabled_my_location">Impossibile determinare la posizione corrente. Attiva ulteriori fonti per la determinazione della posizione in %1$s e assicurati che
@@ -139,6 +161,7 @@
     <string name="gps_starting">Avvio GPS in corso</string>
     <string name="gps_wait_for_better_signal">In attesa di un miglior segnale GPS</string>
     <string name="gps_wait_for_signal">In attesa del segnale GPS</string>
+    <!-- Image -->
     <string name="image_application">Applicazione</string>
     <string name="image_arrow">Freccia</string>
     <string name="image_marker">Indicatore</string>
@@ -149,6 +172,7 @@
     <string name="image_record">Registra</string>
     <string name="image_stop">Interrompi</string>
     <string name="image_track">Percorso</string>
+    <!-- Import -->
     <string name="import_error">Importati %1$d su %2$s da %3$s</string>
     <string name="import_no_directory">%1$s non esiste</string>
     <string name="import_no_file">Nessun file da importare. Collega il dispositivo al computer e metti i file da
@@ -158,6 +182,7 @@
     <string name="import_selection_option">Tutti i %1$s</string>
     <string name="import_selection_title">Importa da memoria esterna</string>
     <string name="import_success">Importati %1$s da %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Impossibile inserire un indicatore. Nessun segnale GPS.</string>
     <string name="marker_add_success">È stato inserito un indicatore</string>
     <string name="marker_add_canceled">Operazione annullata, nessun indicatore aggiunto</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">Indicatore %1$d</string>
     <string name="marker_split_name_format">Suddividi %1$d</string>
     <string name="marker_title">%1$d di %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Dall\'ultimo indicatore parziale:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipo di indicatore (ad es. cascata)</string>
     <string name="marker_edit_marker_type_hint">Tipo di indicatore</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Non ci sono indicatori</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Statistiche aggregate</string>
     <string name="menu_delete">Elimina</string>
     <string name="menu_edit">Modifica</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">Spegni GPS</string>
     <string name="menu_view_photo">Visualizza foto</string>
     <string name="menu_voice_frequency">Frequenza voce</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Servizio di registrazione</string>
+    <!-- Search -->
     <string name="search_global_description">Percorsi e indicatori</string>
     <string name="search_list_empty_message">Non ci sono percorsi o indicatori corrispondenti alla tua ricerca</string>
     <string name="search_list_marker_track_location">Nel percorso \"%1$s\".</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Livello batteria</string>
     <string name="sensor_state_cadence">Cadenza</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Non disponibile durante la registrazione di un percorso</string>
     <string name="settings_show">Mostra</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Avanzate</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Pedistanza</string>
     <string name="settings_chart_by_time">Per durata</string>
     <string name="settings_chart_x_axis">Asse X</string>
@@ -230,22 +264,28 @@
     <string name="settings_recording_track_name_date_local_option">Data (locale)</string>
     <string name="settings_recording_track_name_number_option">Numero</string>
     <string name="settings_recording_track_name_title">Nome percorso predefinito</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Reimposta</string>
     <string name="settings_reset_confirm_message">Tutte le impostazioni verranno ripristinate sui valori predefiniti.</string>
     <string name="settings_reset_confirm_title">Reimpostare ora?</string>
     <string name="settings_reset_done">Tutte le impostazioni sono ripristinate sui valori predefiniti</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensore</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Sensore bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitudine/longitudine</string>
     <string name="settings_stats_rate_title">Velocità preferita</string>
     <string name="settings_stats_units_imperial">Imperiale (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrico (km, m)</string>
     <string name="settings_stats_units_title">Unità di misura preferite</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Condividi file di percorso</string>
     <string name="share_track_share_file_body">Credo che ti potrebbe interessare questo percorso.\n\nPer visualizzare questo percorso, usa Google Earth o un altro
     software di mappatura.\n\n%1$s</string>
     <string name="share_track_subject">Desidero condividere un percorso con te.</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Ritmo medio in movimento</string>
     <string name="stats_average_moving_speed">Velocità media in movimento</string>
     <string name="stats_average_pace">Ritmo medio</string>
@@ -264,25 +304,33 @@
     <string name="stats_speed">Velocità</string>
     <string name="stats_distance">Distanza</string>
     <string name="stats_total_time">Tempo totale</string>
+    <!-- Track -->
     <string name="track_name_format">Percorso %1$d</string>
     <string name="track_record_notification">Registrazione del percorso…</string>
     <string name="track_markers">Indicatori %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Questo percorso e i suoi marcatori verranno eliminati definitivamente dal dispositivo.</string>
     <string name="track_delete_one_confirm_title">Eliminare percorso?</string>
     <string name="track_delete_multiple_confirm_message">I percorsi selezionati e i loro marcatori verranno eliminati definitivamente dal dispositivo.</string>
     <string name="track_delete_progress_message">Eliminazione in corso…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Grafico</string>
     <string name="track_detail_stats_tab">Statistiche</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Tipo di attività (ad es. escursionismo)</string>
     <string name="track_edit_activity_type_hint">Tipo attività</string>
     <string name="track_edit_new_track_title">Nuovo percorso</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Inizia a registrare la tua prossima avventura qui</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d percorsi</string>
     <string name="tracks_many">%1$d percorsi</string>
     <string name="tracks_one">1 percorso</string>
     <string name="tracks_other">%1$d percorsi</string>
     <string name="tracks_two">2 percorsi</string>
     <string name="tracks_zero">0 percorsi</string>
+    <!-- Unit -->
     <string name="unit_feet">pd</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -291,6 +339,7 @@
     <string name="unit_mile_per_hour">mi/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Adatta per la precisione</string>
     <string name="value_adapt_battery_life">Adatta per la massima durata della batteria</string>
     <string name="value_always">Sempre</string>
@@ -317,6 +366,7 @@
     <string name="value_off">Disattivato</string>
     <string name="value_smallest">Il più piccolo</string>
     <string name="value_smallest_recommended">Il più piccolo (consigliato)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d ore</string>
     <string name="voice_hours_many">%1$d ore</string>
     <string name="voice_hours_one">1 ora</string>
@@ -363,6 +413,7 @@
     <string name="voice_total_distance_miles_two">distanza totale 2 miglia</string>
     <string name="voice_total_distance_miles_zero">distanza totale 0 miglia</string>
     <string name="voice_total_distance_zero">Distanza totale OpenTracks uguale a zero.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Bancomat</string>
     <string name="waypoint_type_bank">banca</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 184959117..29c50348d 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">飛行機</string>
     <string name="activity_type_atv">全地形対応車（ATV）</string>
     <string name="activity_type_biking">サイクリング</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">ウォーキング</string>
     <string name="activity_type_water_skiing">水上スキー</string>
     <string name="activity_type_wind_surfing">ウィンドサーフィン</string>
+    <!-- Description -->
     <string name="description_activity_type">活動タイプ： %1$s</string>
     <string name="description_average_moving_pace_in_minute">平均移動ペース: %1$s分/km（%2$s分/マイル）</string>
     <string name="description_average_moving_speed">平均移動速度： %1$.2fkm/時（%2$.1fマイル/時）</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">ペース（分/マイル）</string>
     <string name="description_pace_metric">ペース（分/km）</string>
     <string name="description_recorded_time">記録： %1$s</string>
+    <string name="description_speed_ms">速度（m/秒）</string>
     <string name="description_sensor_cadence">ケイデンス（rpm）</string>
     <string name="description_sensor_heart_rate">心拍数（bpm）</string>
     <string name="description_sensor_power">電力（W）</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">合計時間： %1$s</string>
     <string name="description_track_point">地点</string>
     <string name="description_track_segment">セグメント</string>
+    <!-- Export -->
     <string name="export_all_option">すべてを%1$s形式で</string>
     <string name="export_all_title">外部ストレージにエクスポート</string>
     <string name="export_error">%2$s中%1$d件を「%3$s」にエクスポートしました</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">%1$sにエクスポート中…</string>
     <string name="export_success">%1$sを「%2$s」にエクスポートしました</string>
     <string name="export_title">エクスポート先…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d個のファイル</string>
     <string name="files_many">%1$d個のファイル</string>
     <string name="files_one">1個のファイル</string>
     <string name="files_other">%1$d個のファイル</string>
     <string name="files_two">2個のファイル</string>
     <string name="files_zero">0個のファイル</string>
+    <!-- Generic -->
     <string name="generic_add">追加</string>
     <string name="generic_cancel">キャンセル</string>
     <string name="generic_delete_all_confirm_title">すべて削除しますか？</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">完了しました</string>
     <string name="generic_tracks">トラック</string>
     <string name="generic_yes">はい</string>
+    <!-- Gps -->
     <string name="gps_location_access">[位置情報アクセス]</string>
     <string name="gps_disabled">GPSが有効になっていません。%1$sにアクセスするにはここをタップします。前に戻るには[戻る]ボタンを押します。</string>
     <string name="gps_disabled_my_location">現在地を特定できません。[%1$s]で他の位置情報を有効にして、空が見える場所に移動してください。
@@ -139,6 +161,7 @@
     <string name="gps_starting">GPSを起動しています</string>
     <string name="gps_wait_for_better_signal">GPS信号の精度が上がるまで待機しています</string>
     <string name="gps_wait_for_signal">GPS信号を待機しています</string>
+    <!-- Image -->
     <string name="image_application">アプリ</string>
     <string name="image_arrow">矢印</string>
     <string name="image_marker">マーカー</string>
@@ -149,6 +172,7 @@
     <string name="image_record">記録</string>
     <string name="image_stop">停止</string>
     <string name="image_track">トラック</string>
+    <!-- Import -->
     <string name="import_error">%2$s中%1$d個を「%3$s」からインポートしました</string>
     <string name="import_no_directory">「%1$s」は存在しません</string>
     <string name="import_no_file">インポートするファイルがありませんでした。端末をパソコンに接続して、インポートするファイルを
@@ -158,6 +182,7 @@
     <string name="import_selection_option">すべての%1$s</string>
     <string name="import_selection_title">外部ストレージからインポート</string>
     <string name="import_success">「%2$s」から%1$sをインポートしました</string>
+    <!-- Marker -->
     <string name="marker_add_error">GPS信号がないため、マーカーを追加できません。もう一度やり直してください。</string>
     <string name="marker_add_success">マーカーを追加しました</string>
     <string name="marker_add_canceled">キャンセルしました。追加したマーカーはありません</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">マーカー%1$d</string>
     <string name="marker_split_name_format">分割マーカー%1$d</string>
     <string name="marker_title">%1$d/%2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">分割マーカーが最後に挿入された後のデータ:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">マーカーの種類（例: 滝）</string>
     <string name="marker_edit_marker_type_hint">マーカーの種類</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">マーカーはありません</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">集計統計</string>
     <string name="menu_delete">削除</string>
     <string name="menu_edit">編集</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">GPSを停止</string>
     <string name="menu_view_photo">写真を表示</string>
     <string name="menu_voice_frequency">音声アナウンスの頻度</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">記録サービス</string>
+    <!-- Search -->
     <string name="search_global_description">トラックとマーカー</string>
     <string name="search_list_empty_message">該当するトラックやマーカーは見つかりませんでした</string>
     <string name="search_list_marker_track_location">「%1$s」のトラック内。</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">電池残量</string>
     <string name="sensor_state_cadence">ケイデンス</string>
     <string name="sensor_state_cadence_value">%1$drpm</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$dW</string>
     <string name="settings_not_while_recording">トラックの記録中はご利用いただけません</string>
     <string name="settings_show">表示</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">詳細設定</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">距離</string>
     <string name="settings_chart_by_time">時間</string>
     <string name="settings_chart_x_axis">X軸</string>
@@ -230,21 +264,27 @@
     <string name="settings_recording_track_name_date_local_option">日付（ローカル）</string>
     <string name="settings_recording_track_name_number_option">番号</string>
     <string name="settings_recording_track_name_title">デフォルトのトラック名</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">リセット</string>
     <string name="settings_reset_confirm_message">すべての設定がデフォルト値に戻されます。</string>
     <string name="settings_reset_confirm_title">リセットしますか？</string>
     <string name="settings_reset_done">すべての設定をデフォルト値に戻しました</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">センサー</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetoothのセンサー</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">緯度/経度</string>
     <string name="settings_stats_rate_title">計測方法</string>
     <string name="settings_stats_units_imperial">ヤード･ポンド法（マイル、フィート）</string>
     <string name="settings_stats_units_metric">メートル法（km、m）</string>
     <string name="settings_stats_units_title">計測単位</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">トラックファイルを共有</string>
     <string name="share_track_share_file_body">次のトラックを見てみてください。\n\nトラックを表示するには、Google Earthか他のマッピングソフトウェアを使用してください。\n\n%1$s</string>
     <string name="share_track_subject">トラック共有のお知らせ</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">平均移動ペース</string>
     <string name="stats_average_moving_speed">平均移動速度</string>
     <string name="stats_average_pace">平均ペース</string>
@@ -263,25 +303,33 @@
     <string name="stats_speed">速度</string>
     <string name="stats_distance">距離</string>
     <string name="stats_total_time">合計時間</string>
+    <!-- Track -->
     <string name="track_name_format">トラック%1$d</string>
     <string name="track_record_notification">トラックを記録中…</string>
     <string name="track_markers">%1$sのマーカー</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">トラックとマーカーが端末から完全に削除されます。</string>
     <string name="track_delete_one_confirm_title">トラックを削除しますか？</string>
     <string name="track_delete_multiple_confirm_message">選択したトラックとマーカーが端末から完全に削除されます。</string>
     <string name="track_delete_progress_message">削除中…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">グラフ</string>
     <string name="track_detail_stats_tab">統計情報</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">活動タイプ（例: ハイキング）</string>
     <string name="track_edit_activity_type_hint">活動タイプ</string>
     <string name="track_edit_new_track_title">新しいトラック</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">このボタンでトラックの記録を開始しよう</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d件のトラック</string>
     <string name="tracks_many">%1$d件のトラック</string>
     <string name="tracks_one">1件のトラック</string>
     <string name="tracks_other">%1$d件のトラック</string>
     <string name="tracks_two">2件のトラック</string>
     <string name="tracks_zero">0件のトラック</string>
+    <!-- Unit -->
     <string name="unit_feet">ft</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/時</string>
@@ -290,6 +338,7 @@
     <string name="unit_mile_per_hour">マイル/時</string>
     <string name="unit_minute_per_kilometer">分/km</string>
     <string name="unit_minute_per_mile">分/マイル</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">精度を重視</string>
     <string name="value_adapt_battery_life">電池残量を重視</string>
     <string name="value_always">常に使用する</string>
@@ -316,6 +365,7 @@
     <string name="value_off">オフ</string>
     <string name="value_smallest">最小</string>
     <string name="value_smallest_recommended">最小値（推奨）</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d時間</string>
     <string name="voice_hours_many">%1$d時間</string>
     <string name="voice_hours_one">1時間</string>
@@ -362,6 +412,7 @@
     <string name="voice_total_distance_miles_two">合計距離2マイル</string>
     <string name="voice_total_distance_miles_zero">合計距離0マイル</string>
     <string name="voice_total_distance_zero">OpenTracksの合計距離はゼロです。</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">銀行</string>
     <string name="waypoint_type_bar">バー</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 9b3006194..9b6e0f0fd 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">비행기</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">자전거</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">도보</string>
     <string name="activity_type_water_skiing">수상 스키</string>
     <string name="activity_type_wind_surfing">윈드서핑</string>
+    <!-- Description -->
     <string name="description_activity_type">운동 유형: %1$s</string>
     <string name="description_average_moving_pace_in_minute">평균 이동 속도: %1$s분/km(%2$s분/마일)</string>
     <string name="description_average_moving_speed">평균 이동 속도: 시속 %1$.2fkm(시속 %2$.1f마일)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">속도(분/마일)</string>
     <string name="description_pace_metric">속도(분/km)</string>
     <string name="description_recorded_time">기록 시간: %1$s</string>
+    <string name="description_speed_ms">속도(m/s)</string>
     <string name="description_sensor_cadence">페달 회전수(rpm)</string>
     <string name="description_sensor_heart_rate">심장박동수(bpm)</string>
     <string name="description_sensor_power">출력(W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">총 시간: %1$s</string>
     <string name="description_track_point">지점</string>
     <string name="description_track_segment">세그먼트</string>
+    <!-- Export -->
     <string name="export_all_option">모두 %1$s 형식으로</string>
     <string name="export_all_title">외부 저장소로 내보내기</string>
     <string name="export_error">%2$s개 중 %1$d개를 %3$s(으)로 내보냈습니다.</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">%1$s(으)로 내보내기 중…</string>
     <string name="export_success">%1$s개를 %2$s(으)로 내보냈습니다.</string>
     <string name="export_title">내보내기…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">파일 %1$d개</string>
     <string name="files_many">파일 %1$d개</string>
     <string name="files_one">파일 1개</string>
     <string name="files_other">파일 %1$d개</string>
     <string name="files_two">파일 2개</string>
     <string name="files_zero">파일 0개</string>
+    <!-- Generic -->
     <string name="generic_add">추가하기</string>
     <string name="generic_cancel">취소</string>
     <string name="generic_delete_all_confirm_title">모두 삭제하시겠습니까?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">완료</string>
     <string name="generic_tracks">운동기록</string>
     <string name="generic_yes">예</string>
+    <!-- Gps -->
     <string name="gps_location_access">\'위치 액세스\'</string>
     <string name="gps_disabled">GPS를 사용하도록 설정하지 않았습니다. %1$s(으)로 이동하려면 여기를 누르세요. 돌아가려면 뒤로 버튼을 누르세요.</string>
     <string name="gps_disabled_my_location">현재 위치를 확인할 수 없습니다. %1$s에서 더 많은 위치 소스를 사용 설정하고
@@ -139,6 +161,7 @@
     <string name="gps_starting">GPS 시작</string>
     <string name="gps_wait_for_better_signal">더 나은 GPS 신호 대기 중</string>
     <string name="gps_wait_for_signal">GPS 신호 대기 중</string>
+    <!-- Image -->
     <string name="image_application">애플리케이션</string>
     <string name="image_arrow">화살표</string>
     <string name="image_marker">마커</string>
@@ -149,6 +172,7 @@
     <string name="image_record">기록</string>
     <string name="image_stop">중지</string>
     <string name="image_track">운동기록</string>
+    <!-- Import -->
     <string name="import_error">%3$s에서 %2$s개 중 %1$d개를 가져왔습니다.</string>
     <string name="import_no_directory">%1$s(이)가 없습니다.</string>
     <string name="import_no_file">가져올 파일이 없습니다. 기기를 컴퓨터에 연결하고 %1$s에 가져올 파일을 가져다 놓으세요.</string>
@@ -157,6 +181,7 @@
     <string name="import_selection_option">있는 모든 %1$s 파일</string>
     <string name="import_selection_title">외부 저장소에서 가져오기</string>
     <string name="import_success">%2$s에서 %1$s개를 가져왔습니다.</string>
+    <!-- Marker -->
     <string name="marker_add_error">아이콘을 삽입할 수 없습니다. GPS 신호가 없습니다. 다시 시도하세요.</string>
     <string name="marker_add_success">마커가 삽입되었습니다.</string>
     <string name="marker_add_canceled">취소되어 마커가 추가되지 않았습니다.</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">아이콘 %1$d</string>
     <string name="marker_split_name_format">분할 %1$d</string>
     <string name="marker_title">%2$d개 중 %1$d개</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">마지막 분할 아이콘 이후:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">아이콘 유형(예: 폭포)</string>
     <string name="marker_edit_marker_type_hint">아이콘 유형</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">마커가 없습니다.</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">전체 통계</string>
     <string name="menu_delete">삭제</string>
     <string name="menu_edit">수정</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">GPS 중지</string>
     <string name="menu_view_photo">사진 보기</string>
     <string name="menu_voice_frequency">음성 안내 빈도</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">기록 서비스</string>
+    <!-- Search -->
     <string name="search_global_description">운동기록 및 아이콘</string>
     <string name="search_list_empty_message">검색과 일치하는 운동기록 또는 마커가 없습니다.</string>
     <string name="search_list_marker_track_location">%1$s의 운동기록 결과</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">배터리 수준</string>
     <string name="sensor_state_cadence">페달 회전수</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">운동기록을 기록하는 동안 사용할 수 없습니다.</string>
     <string name="settings_show">표시</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">고급</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">거리 기준</string>
     <string name="settings_chart_by_time">시간 기준</string>
     <string name="settings_chart_x_axis">X축</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">날짜 (현지)</string>
     <string name="settings_recording_track_name_number_option">숫자</string>
     <string name="settings_recording_track_name_title">기본 운동기록 이름</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">재설정</string>
     <string name="settings_reset_confirm_message">모든 설정이 기본값으로 복구됩니다.</string>
     <string name="settings_reset_confirm_title">지금 재설정하시겠습니까?</string>
     <string name="settings_reset_done">모든 설정을 기본값으로 되돌렸습니다.</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">센서</string>
     <string name="settings_sensor_bluetooth">블루투스</string>
     <string name="settings_sensor_bluetooth_sensor">블루투스 센서</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">위도/경도</string>
     <string name="settings_stats_rate_title">선호하는 속도</string>
     <string name="settings_stats_units_imperial">야드파운드법(마일, 피트)</string>
     <string name="settings_stats_units_metric">미터법(km,m)</string>
     <string name="settings_stats_units_title">선호하는 단위</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">운동기록 파일 공유</string>
     <string name="share_track_share_file_body">이 운동기록에 관심이 있으시군요.\n\n이 운동기록을 보려면 Google 어스 또는 기타 지도 소프트웨어를 사용하세요.\n\n%1$s</string>
     <string name="share_track_subject">운동기록을 공유하려고 합니다.</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">평균 이동 페이스</string>
     <string name="stats_average_moving_speed">평균 이동 속도</string>
     <string name="stats_average_pace">평균 페이스</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">속도</string>
     <string name="stats_distance">거리</string>
     <string name="stats_total_time">총 시간</string>
+    <!-- Track -->
     <string name="track_name_format">운동기록 %1$d</string>
     <string name="track_record_notification">내 운동기록을 기록 중…</string>
     <string name="track_markers">%1$s 마커</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">운동기록과 아이콘이 기기에서 영구적으로 삭제됩니다.</string>
     <string name="track_delete_one_confirm_title">운동기록을 삭제하시겠습니까?</string>
     <string name="track_delete_multiple_confirm_message">선택된 운동기록과 아이콘이 기기에서 영구적으로 삭제됩니다.</string>
     <string name="track_delete_progress_message">삭제 중…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">도표</string>
     <string name="track_detail_stats_tab">통계</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">운동 유형(예: 하이킹)</string>
     <string name="track_edit_activity_type_hint">운동 유형</string>
     <string name="track_edit_new_track_title">새 운동기록</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">여기에서 새로운 활동을 기록해 보세요.</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">운동기록 %1$d개</string>
     <string name="tracks_many">운동기록 %1$d개</string>
     <string name="tracks_one">운동기록 1개</string>
     <string name="tracks_other">운동기록 %1$d개</string>
     <string name="tracks_two">운동기록 2개</string>
     <string name="tracks_zero">운동기록 0개</string>
+    <!-- Unit -->
     <string name="unit_feet">피트</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">mi/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">정확도를 위해 조정</string>
     <string name="value_adapt_battery_life">배터리 수명을 위해 조정</string>
     <string name="value_always">항상</string>
@@ -315,6 +364,7 @@
     <string name="value_off">사용 안함</string>
     <string name="value_smallest">최소</string>
     <string name="value_smallest_recommended">최소(권장)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d시간</string>
     <string name="voice_hours_many">%1$d시간</string>
     <string name="voice_hours_one">1시간</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">총 거리 2마일</string>
     <string name="voice_total_distance_miles_zero">총 거리 0마일</string>
     <string name="voice_total_distance_zero">내 운동기록의 총 거리는 0입니다.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">은행</string>
     <string name="waypoint_type_bar">바</string>
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index 033406f7b..502d15c8d 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">lėktuvas</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">važiavimas dviračiais</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">ėjimas</string>
     <string name="activity_type_water_skiing">vandens slidžių sportas</string>
     <string name="activity_type_wind_surfing">burlenčių sportas</string>
+    <!-- Description -->
     <string name="description_activity_type">Veiklos tipas: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Vidutinis judėjimo tempas: %1$s min./km (%2$s min./myl.)</string>
     <string name="description_average_moving_speed">Vidutinis judėjimo greitis: %1$.2f km/val. (%2$.1f myl./val.)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempas (min./myl.)</string>
     <string name="description_pace_metric">Tempas (min./km)</string>
     <string name="description_recorded_time">Įrašyta: %1$s</string>
+    <string name="description_speed_ms">Greitis (m/s)</string>
     <string name="description_sensor_cadence">Kadencija (aps./min.)</string>
     <string name="description_sensor_heart_rate">Širdies susitraukimų dažnis (dūž./min.)</string>
     <string name="description_sensor_power">Galia (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Visa trukmė: %1$s</string>
     <string name="description_track_point">Taškas</string>
     <string name="description_track_segment">Atkarpa</string>
+    <!-- Export -->
     <string name="export_all_option">Visi kaip %1$s</string>
     <string name="export_all_title">Eksportuoti į išorinę saugyklą</string>
     <string name="export_error">Eksportuota: %1$d iš %2$s į %3$s.</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Eksportuojama į %1$s…</string>
     <string name="export_success">Eksportuota: %1$s į %2$s.</string>
     <string name="export_title">Eksportuoti į…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d failai</string>
     <string name="files_many">%1$d failai</string>
     <string name="files_one">1 failas</string>
     <string name="files_other">%1$d failų</string>
     <string name="files_two">2 failai</string>
     <string name="files_zero">0 failų</string>
+    <!-- Generic -->
     <string name="generic_add">Papildyti</string>
     <string name="generic_cancel">Atšaukti</string>
     <string name="generic_delete_all_confirm_title">Ištrinti viską?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Pavyko</string>
     <string name="generic_tracks">Maršrutai</string>
     <string name="generic_yes">Taip</string>
+    <!-- Gps -->
     <string name="gps_location_access">Vietos prieiga</string>
     <string name="gps_disabled">GPS neįjungtas. Palieskite čia, jei norite pereiti prie %1$s. Paspauskite grįžimo mygtuką, jei norite grįžti.</string>
     <string name="gps_disabled_my_location">Dabartinės vietos nustatyti negalima. %1$s įgalinkite daugiau vietos šaltinių ir įsitikinkite, kad
@@ -139,6 +161,7 @@
     <string name="gps_starting">Paleidžiama GPS</string>
     <string name="gps_wait_for_better_signal">Laukiama geresnio GPS signalo</string>
     <string name="gps_wait_for_signal">Laukiama GPS signalo</string>
+    <!-- Image -->
     <string name="image_application">Programa</string>
     <string name="image_arrow">Rodyklė</string>
     <string name="image_marker">Žymeklis</string>
@@ -149,6 +172,7 @@
     <string name="image_record">Įrašyti</string>
     <string name="image_stop">Stabdyti</string>
     <string name="image_track">Maršrutas</string>
+    <!-- Import -->
     <string name="import_error">Importuota %1$d iš %2$s, esančių %3$s</string>
     <string name="import_no_directory">%1$s neegzistuoja</string>
     <string name="import_no_file">Nebuvo importuoti skirtų failų. Prijunkite savo įrenginį prie kompiuterio ir įdėkite failus
@@ -158,6 +182,7 @@
     <string name="import_selection_option">Visi %1$s</string>
     <string name="import_selection_title">Importuoti iš išorinės saugyklos</string>
     <string name="import_success">Importuota %1$s iš %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Nepavyko įterpti žymeklio. Nėra GPS signalo. Bandykite dar kartą.</string>
     <string name="marker_add_success">Žymeklis įterptas</string>
     <string name="marker_add_canceled">Atšaukta, žymeklių nepridėta</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">Žymeklis %1$d</string>
     <string name="marker_split_name_format">Išskaidymas %1$d</string>
     <string name="marker_title">%1$d iš %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Nuo praeito žymeklių sudėjimo:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Žymeklio tipas (pvz., krioklys)</string>
     <string name="marker_edit_marker_type_hint">Žymeklio tipas</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Jūs neturite žymeklių</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Apibendrinta statist.</string>
     <string name="menu_delete">Panaikinti</string>
     <string name="menu_edit">Redaguoti</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">Išjungti GPS</string>
     <string name="menu_view_photo">Žiūrėti nuotrauką</string>
     <string name="menu_voice_frequency">Balso dažnumas</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Įrašymo paslauga</string>
+    <!-- Search -->
     <string name="search_global_description">Maršrutai ir maršrutų vietos</string>
     <string name="search_list_empty_message">Jūsų paieškos neatitiko jokie maršrutai ar žymekliai</string>
     <string name="search_list_marker_track_location">Maršrute \'%1$s\'.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Akumuliatoriaus lygis</string>
     <string name="sensor_state_cadence">Kadencija</string>
     <string name="sensor_state_cadence_value">%1$d aps./min.</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Kol įrašinėjamas maršrutas, nepasiekiama.</string>
     <string name="settings_show">Rodyti</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Išplėstinės</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Pagal atstumą</string>
     <string name="settings_chart_by_time">Pagal laiką</string>
     <string name="settings_chart_x_axis">X ašis</string>
@@ -230,22 +264,28 @@
     <string name="settings_recording_track_name_date_local_option">Data (vietos)</string>
     <string name="settings_recording_track_name_number_option">Skaičius</string>
     <string name="settings_recording_track_name_title">Numatyt. maršruto pav.</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Nustatyti iš naujo</string>
     <string name="settings_reset_confirm_message">Visi nustatymai bus grąžinti į numatytąsias vertes.</string>
     <string name="settings_reset_confirm_title">Nustatyti iš naujo dabar?</string>
     <string name="settings_reset_done">Visi nustatymai buvo grąžinti į numatytąsias reikšmes</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Jutiklis</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">„Bluetooth“ jutiklis</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Platuma ir ilguma</string>
     <string name="settings_stats_rate_title">Pageidaujamas greitis</string>
     <string name="settings_stats_units_imperial">Imperinės (myl., pėdos)</string>
     <string name="settings_stats_units_metric">Metrinės (km, m)</string>
     <string name="settings_stats_units_title">Pageidaujami vienetai</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Bendrinti maršruto bylą</string>
     <string name="share_track_share_file_body">Manau, kad jus galėtų dominti į šis maršrutas.\n\nJei norite peržiūrėti šį maršrutą, naudokite „Google“ žemę ar kitą
     žemėlapių programinę įrangą.\n\n%1$s</string>
     <string name="share_track_subject">Norėčiau su jumis bendrinti maršrutą</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Vid. judėjimo tempas</string>
     <string name="stats_average_moving_speed">Vid. judėjimo greitis</string>
     <string name="stats_average_pace">Vid. tempas</string>
@@ -264,25 +304,33 @@
     <string name="stats_speed">Greitis</string>
     <string name="stats_distance">Atstumas</string>
     <string name="stats_total_time">Bendras laikas</string>
+    <!-- Track -->
     <string name="track_name_format">Maršrutas %1$d</string>
     <string name="track_record_notification">Jūsų maršrutas įrašomas…</string>
     <string name="track_markers">„%1$s“ žymekliai</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Maršrutas ir jo žymekliai bus visam laikui ištrinti iš įrenginio.</string>
     <string name="track_delete_one_confirm_title">Ištrinti maršrutą?</string>
     <string name="track_delete_multiple_confirm_message">Pasirinkti maršrutai ir jų žymekliai bus visam laikui ištrinti iš įrenginio.</string>
     <string name="track_delete_progress_message">Trinama…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Diagrama</string>
     <string name="track_detail_stats_tab">Statistika</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Veiklos tipas (pvz., iškylavimas)</string>
     <string name="track_edit_activity_type_hint">Veiklos tipas</string>
     <string name="track_edit_new_track_title">Naujas maršrutas</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Čia pradėkite įrašyti savo naują nuotykį</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d maršrutai</string>
     <string name="tracks_many">%1$d maršrutai</string>
     <string name="tracks_one">1 maršrutas</string>
     <string name="tracks_other">%1$d maršrutų</string>
     <string name="tracks_two">2 maršrutai</string>
     <string name="tracks_zero">0 maršrutų</string>
+    <!-- Unit -->
     <string name="unit_feet">pėd.</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/val.</string>
@@ -291,6 +339,7 @@
     <string name="unit_mile_per_hour">myl./val.</string>
     <string name="unit_minute_per_kilometer">min./km</string>
     <string name="unit_minute_per_mile">min./myl.</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Pritaikyti siekiant tikslumo</string>
     <string name="value_adapt_battery_life">Pritaik. taus. akum.</string>
     <string name="value_always">Visada</string>
@@ -317,6 +366,7 @@
     <string name="value_off">Išjungta</string>
     <string name="value_smallest">Mažiausia</string>
     <string name="value_smallest_recommended">Mažiausia (rekomenduojama)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d val.</string>
     <string name="voice_hours_many">%1$d val.</string>
     <string name="voice_hours_one">1 val.</string>
@@ -363,6 +413,7 @@
     <string name="voice_total_distance_miles_two">bendras atstumas 2 mylios</string>
     <string name="voice_total_distance_miles_zero">bendras atstumas 0 mylių</string>
     <string name="voice_total_distance_zero">Mano kelionių bendras atstumas lygus nuliui.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">bankas</string>
     <string name="waypoint_type_bar">juosta</string>
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index c7aa48f79..49d88611a 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">lidmašīna</string>
     <string name="activity_type_atv">Visurgājējs</string>
     <string name="activity_type_biking">riteņbraukšana</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">iešana</string>
     <string name="activity_type_water_skiing">ūdensslēpošana</string>
     <string name="activity_type_wind_surfing">vindsērfings</string>
+    <!-- Description -->
     <string name="description_activity_type">Nodarbes veids: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Vidējais pārvietošanās temps: %1$s min/km (%2$s min/jūdzē)</string>
     <string name="description_average_moving_speed">Vidējais pārvietošanās ātrums: %1$.2f km/h (%2$.1f jūdze(-es)/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Temps (min/jūdzē)</string>
     <string name="description_pace_metric">Temps (min/km)</string>
     <string name="description_recorded_time">Ierakstīts: %1$s</string>
+    <string name="description_speed_ms">Ātrums (m/s)</string>
     <string name="description_sensor_cadence">Kadence (apgriezienu skaits minūtē)</string>
     <string name="description_sensor_heart_rate">Sirdsdarbības ātrums (sitieni minūtē)</string>
     <string name="description_sensor_power">Jauda (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Kopējais laiks: %1$s</string>
     <string name="description_track_point">Punkts</string>
     <string name="description_track_segment">Posms</string>
+    <!-- Export -->
     <string name="export_all_option">Visus kā %1$s</string>
     <string name="export_all_title">Eksportēšana uz ārējo krātuvi</string>
     <string name="export_error">Mapē %3$s eksportēts(-i) %1$d maršruts(-i) no %2$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Notiek eksportēšana uz %1$s…</string>
     <string name="export_success">Mapē %2$s eksportēts(-i) %1$s maršruts(-i)</string>
     <string name="export_title">Eksportēšana uz…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d faili</string>
     <string name="files_many">%1$d faili</string>
     <string name="files_one">1 fails</string>
     <string name="files_other">%1$d faili</string>
     <string name="files_two">2 faili</string>
     <string name="files_zero">0 failu</string>
+    <!-- Generic -->
     <string name="generic_add">Pievienot</string>
     <string name="generic_cancel">Atcelt</string>
     <string name="generic_delete_all_confirm_title">Vai dzēst visu?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Paveikts</string>
     <string name="generic_tracks">Maršruti</string>
     <string name="generic_yes">Jā</string>
+    <!-- Gps -->
     <string name="gps_location_access">Piekļuve atrašanās vietai</string>
     <string name="gps_disabled">GPS nav iespējots. Pieskarieties šeit, lai dotos uz %1$s. Lai atgrieztos, nospiediet pogu Atpakaļ.</string>
     <string name="gps_disabled_my_location">Pašreizējo atrašanās vietu nevar noteikt. Sadaļā %1$s iespējojiet vairāk atrašanās vietas noteikšanas avotus un pārliecinieties, ka debesis ir redzamas. Mēģiniet vēlreiz vēlāk.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Notiek GPS navigācijas aktivizēšana</string>
     <string name="gps_wait_for_better_signal">Gaida spēcīgāku GPS signālu</string>
     <string name="gps_wait_for_signal">Gaida GPS signālu</string>
+    <!-- Image -->
     <string name="image_application">Lietotne</string>
     <string name="image_arrow">Bultiņa</string>
     <string name="image_marker">Atzīme</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Ierakstīt</string>
     <string name="image_stop">Apturēt</string>
     <string name="image_track">Maršruts</string>
+    <!-- Import -->
     <string name="import_error">No mapes %3$s importēts(-i) %1$d no %2$s faila(-iem)</string>
     <string name="import_no_directory">Mape %1$s neeksistē</string>
     <string name="import_no_file">Nav failu, ko importēt. Savienojiet ierīci ar datoru un importējamos failus ievietojiet mapē %1$s.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">Visus %1$s failus</string>
     <string name="import_selection_title">Importēšana no ārējās krātuves</string>
     <string name="import_success">No mapes %2$s importēts(-i) %1$s fails(-i)</string>
+    <!-- Marker -->
     <string name="marker_add_error">Nav iespējams ievietot marķieri. Nav GPS signāla. Mēģiniet vēlreiz.</string>
     <string name="marker_add_success">Atzīme ievietota</string>
     <string name="marker_add_canceled">Darbība atcelta, atzīme nav ievietota</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">Marķieris %1$d</string>
     <string name="marker_split_name_format">Sadalīt %1$d</string>
     <string name="marker_title">%1$d no %2$d atzīmes(-ēm)</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Kopš pēdējā sadalītā marķiera:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Marķiera veids (piemēram, ūdenskritums)</string>
     <string name="marker_edit_marker_type_hint">Marķiera veids</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Jums nav pieejama neviena atzīme</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Statistikas apkopojums</string>
     <string name="menu_delete">Dzēst</string>
     <string name="menu_edit">Rediģēt</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">Apturēt GPS</string>
     <string name="menu_view_photo">Skatīt fotoattēlu</string>
     <string name="menu_voice_frequency">Balss ziņas</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Ierakstīšanas pakalpojums</string>
+    <!-- Search -->
     <string name="search_global_description">Maršruti un marķieri</string>
     <string name="search_list_empty_message">Jūsu vaicājumam neatbilst neviens maršruts vai atzīme</string>
     <string name="search_list_marker_track_location">Maršrutā %1$s.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Akumulatora uzlādes līmenis</string>
     <string name="sensor_state_cadence">Kadence</string>
     <string name="sensor_state_cadence_value"> %1$d apgr./min</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Nav pieejams maršruta ierakstīšanas laikā.</string>
     <string name="settings_show">Rādīt</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Papildu iestatījumi</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Pēc attāluma</string>
     <string name="settings_chart_by_time">Pēc laika</string>
     <string name="settings_chart_x_axis">X ass</string>
@@ -228,22 +262,28 @@
     <string name="settings_recording_track_name_date_local_option">Datums (vietējā form.)</string>
     <string name="settings_recording_track_name_number_option">Numurs</string>
     <string name="settings_recording_track_name_title">Noklusējuma maršruta nosaukums</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Atiestatīt</string>
     <string name="settings_reset_confirm_message">Visiem iestatījumiem tiks atjaunotas to noklusējuma vērtības.</string>
     <string name="settings_reset_confirm_title">Vai atiestatīt tagad?</string>
     <string name="settings_reset_done">Visos iestatījumos atjaunotas to noklusējuma vērtības</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensors</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth sensors</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Platums/garums</string>
     <string name="settings_stats_rate_title">Vēlamais rādītājs</string>
     <string name="settings_stats_units_imperial">Standarta (jūdzes, pēdas)</string>
     <string name="settings_stats_units_metric">Metriskās (km, m)</string>
     <string name="settings_stats_units_title">Vēlamās mērvienības</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Kopīgot maršruta failu</string>
     <string name="share_track_share_file_body">Manuprāt, jūs varētu interesēt šis maršruts.\n\nLai to aplūkotu, izmantojiet pakalpojumu Google Earth vai citu
     kartēšanas programmatūru.\n\n%1$s</string>
     <string name="share_track_subject">Vēlos ar jums koplietot maršrutu</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Vidējais pārvietošanās temps</string>
     <string name="stats_average_moving_speed">Vidējais pārvietošanās ātrums</string>
     <string name="stats_average_pace">Vidējais temps</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Ātrums</string>
     <string name="stats_distance">Attālums</string>
     <string name="stats_total_time">Kopējais laiks</string>
+    <!-- Track -->
     <string name="track_name_format">%1$d. maršruts</string>
     <string name="track_record_notification">Notiek maršruta ierakstīšana…</string>
     <string name="track_markers">Maršruta %1$s atzīmes</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Maršruts un tā marķieri tiks neatgriezeniski dzēsti no ierīces.</string>
     <string name="track_delete_one_confirm_title">Vai dzēst maršrutu?</string>
     <string name="track_delete_multiple_confirm_message">Atlasītie maršruti un to marķieri tiks neatgriezeniski dzēsti no ierīces.</string>
     <string name="track_delete_progress_message">Notiek dzēšana…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Diagramma</string>
     <string name="track_detail_stats_tab">Statistika</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Aktivitātes veids (piemēram, došanās pārgājienā)</string>
     <string name="track_edit_activity_type_hint">Aktivitātes veids</string>
     <string name="track_edit_new_track_title">Jauns maršruts</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Sāciet ierakstīt savu nākamo piedzīvojumu šeit</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d maršruti</string>
     <string name="tracks_many">%1$d maršruti</string>
     <string name="tracks_one">1 maršruts</string>
     <string name="tracks_other">%1$d maršruti</string>
     <string name="tracks_two">2 maršruti</string>
     <string name="tracks_zero">0 maršrutu</string>
+    <!-- Unit -->
     <string name="unit_feet">pēdas</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">jūdzes/stundā</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/jūdzē</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Pielāgot precizitātei</string>
     <string name="value_adapt_battery_life">Pielāgot akumulatora darbības ilgumam</string>
     <string name="value_always">Vienmēr</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Izslēgts</string>
     <string name="value_smallest">Mazākais</string>
     <string name="value_smallest_recommended">Mazākais (ieteicams)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d stundas</string>
     <string name="voice_hours_many">%1$d stundas</string>
     <string name="voice_hours_one">1 stunda</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">kopējais garums ir 2 jūdzes</string>
     <string name="voice_total_distance_miles_zero">kopējais garums ir 0 jūdzes</string>
     <string name="voice_total_distance_zero">Kopējais manu maršrutu garums ir nulle.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Bankas automāts</string>
     <string name="waypoint_type_bank">banka</string>
     <string name="waypoint_type_bar">bārs</string>
diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml
index bebbe45c6..3eb90ce6d 100644
--- a/src/main/res/values-ms/strings.xml
+++ b/src/main/res/values-ms/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">kapal terbang</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">berbasikal</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">berjalan</string>
     <string name="activity_type_water_skiing">meluncur air</string>
     <string name="activity_type_wind_surfing">meluncur angin</string>
+    <!-- Description -->
     <string name="description_activity_type">Jenis aktiviti: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Purata langkah pergerakan: %1$s min/km (%2$s min/bt)</string>
     <string name="description_average_moving_speed">Purata kelajuan pergerakan: %1$.2f km/j (%2$.1f bt/j)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Langkah (min/bt)</string>
     <string name="description_pace_metric">Langkah (min/km)</string>
     <string name="description_recorded_time">Dirakam: %1$s</string>
+    <string name="description_speed_ms">Kelajuan (m/s)</string>
     <string name="description_sensor_cadence">Rentak (rpm)</string>
     <string name="description_sensor_heart_rate">Kadar denyut jantung (bpm)</string>
     <string name="description_sensor_power">Kuasa (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Jumlah masa: %1$s</string>
     <string name="description_track_point">Titik</string>
     <string name="description_track_segment">Segmen</string>
+    <!-- Export -->
     <string name="export_all_option">Semua sebagai %1$s</string>
     <string name="export_all_title">Eksport ke storan luaran</string>
     <string name="export_error">%1$d daripada %2$s dieksport ke %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Mengeksport ke %1$s…</string>
     <string name="export_success">%1$s dieksport ke %2$s</string>
     <string name="export_title">Eksport ke…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d fail</string>
     <string name="files_many">%1$d fail</string>
     <string name="files_one">1 fail</string>
     <string name="files_other">%1$d fail</string>
     <string name="files_two">2 fail</string>
     <string name="files_zero">0 fail</string>
+    <!-- Generic -->
     <string name="generic_add">Tambah</string>
     <string name="generic_cancel">Batal</string>
     <string name="generic_delete_all_confirm_title">Padamkan semua?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Berjaya</string>
     <string name="generic_tracks">Lagu</string>
     <string name="generic_yes">Ya</string>
+    <!-- Gps -->
     <string name="gps_location_access">‘Akses lokasi’</string>
     <string name="gps_disabled">GPS tidak didayakan. Ketik di sini untuk pergi ke %1$s. Tekan butang kembali untuk kembali.</string>
     <string name="gps_disabled_my_location">Lokasi semasa tidak dapat ditentukan. Dayakan sumber lokasi lagi di %1$s &amp; pastikan langit dapat dilihat. Cuba sebentar lagi.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Memulakan GPS</string>
     <string name="gps_wait_for_better_signal">Menunggu isyarat GPS yang lebih baik</string>
     <string name="gps_wait_for_signal">Menunggu isyarat GPS</string>
+    <!-- Image -->
     <string name="image_application">Aplikasi</string>
     <string name="image_arrow">Anak panah</string>
     <string name="image_marker">Penanda</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Rakam</string>
     <string name="image_stop">Berhenti</string>
     <string name="image_track">Lagu</string>
+    <!-- Import -->
     <string name="import_error">%1$d daripada %2$s diimport dari %3$s</string>
     <string name="import_no_directory">%1$s tidak wujud</string>
     <string name="import_no_file">Tiada fail untuk diimport. Sambungkan peranti anda ke komputer dan letakkan fail untuk
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Semua %1$s</string>
     <string name="import_selection_title">Import dari storan luaran</string>
     <string name="import_success">%1$s daripada %2$s diimport</string>
+    <!-- Marker -->
     <string name="marker_add_error">Tidak dapat menyisipkan penanda. Tiada isyarat GPS. Cuba lagi.</string>
     <string name="marker_add_success">Penanda telah disisipkan</string>
     <string name="marker_add_canceled">Dibatalkan, tiada penanda ditambahkan</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Penanda %1$d</string>
     <string name="marker_split_name_format">Pisahan %1$d</string>
     <string name="marker_title">%1$d daripada %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Sejak penanda pisahan terakhir:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Jenis penanda (mis. air terjun)</string>
     <string name="marker_edit_marker_type_hint">Jenis penanda</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Anda tiada sebarang penanda</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Statistik teragregat</string>
     <string name="menu_delete">Padam</string>
     <string name="menu_edit">Edit</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Hentikan GPS</string>
     <string name="menu_view_photo">Lihat foto</string>
     <string name="menu_voice_frequency">Kekerapan suara</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Khidmat rakaman</string>
+    <!-- Search -->
     <string name="search_global_description">Laluan dan penanda</string>
     <string name="search_list_empty_message">Tiada laluan atau penanda yang sepadan dengan carian anda</string>
     <string name="search_list_marker_track_location">Dalam laluan \'%1$s\'.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Aras bateri</string>
     <string name="sensor_state_cadence">Rentak</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Tidak tersedia semasa merakam laluan</string>
     <string name="settings_show">Tunjukkan</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Terperinci</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Mengikut jarak</string>
     <string name="settings_chart_by_time">Mengikut masa</string>
     <string name="settings_chart_x_axis">Paksi-X</string>
@@ -229,22 +263,28 @@
     <string name="settings_recording_track_name_date_local_option">Tarikh (setempat)</string>
     <string name="settings_recording_track_name_number_option">Nombor</string>
     <string name="settings_recording_track_name_title">Nama lalai laluan</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Tetapkan semula</string>
     <string name="settings_reset_confirm_message">Semua tetapan akan dikembalikan kepada nilai lalai.</string>
     <string name="settings_reset_confirm_title">Tetapkan semula sekarang?</string>
     <string name="settings_reset_done">Semua tetapan telah dikembalikan kepada nilai tetapan asal</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Penderia</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Sensor Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitud/Longitud</string>
     <string name="settings_stats_rate_title">Kadar pilihan</string>
     <string name="settings_stats_units_imperial">Imperial (bt, kaki)</string>
     <string name="settings_stats_units_metric">Metrik (km, m)</string>
     <string name="settings_stats_units_title">Unit pilihan</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Kongsi fail laluan</string>
     <string name="share_track_share_file_body">Saya fikir anda mungkin berminat dengan laluan ini.\n\nUntuk melihat laluan, gunakan Google Earth atau perisian
     pemetaan lain.\n\n%1$s</string>
     <string name="share_track_subject">Saya mahu berkongsi jejak dengan awak</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Langkah bergerak purata</string>
     <string name="stats_average_moving_speed">Kelajuan bergerak purata</string>
     <string name="stats_average_pace">Langkah purata</string>
@@ -263,25 +303,33 @@
     <string name="stats_speed">Kelajuan</string>
     <string name="stats_distance">Jarak</string>
     <string name="stats_total_time">Jumlah masa</string>
+    <!-- Track -->
     <string name="track_name_format">Jejak %1$d</string>
     <string name="track_record_notification">Merakamkan laluan anda…</string>
     <string name="track_markers">Penanda %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Laluan dan penandanya akan dipadamkan secara kekal dari peranti.</string>
     <string name="track_delete_one_confirm_title">Padamkan lagu?</string>
     <string name="track_delete_multiple_confirm_message">Laluan yang dipilih dan penandanya akan dipadamkan secara kekal dari peranti.</string>
     <string name="track_delete_progress_message">Memadamkan…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Carta</string>
     <string name="track_detail_stats_tab">Statistik</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Jenis aktiviti (mis. mengembara berjalan kaki)</string>
     <string name="track_edit_activity_type_hint">Jenis aktiviti</string>
     <string name="track_edit_new_track_title">Laluan Baharu</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Mula merakam pengembaraan anda yang seterusnya di sini</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d laluan</string>
     <string name="tracks_many">%1$d laluan</string>
     <string name="tracks_one">1 laluan</string>
     <string name="tracks_other">%1$d laluan</string>
     <string name="tracks_two">2 laluan</string>
     <string name="tracks_zero">0 laluan</string>
+    <!-- Unit -->
     <string name="unit_feet">kaki</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/j</string>
@@ -290,6 +338,7 @@
     <string name="unit_mile_per_hour">bt/j</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/bt</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Sesuaikan untuk ketepatan</string>
     <string name="value_adapt_battery_life">Sesuaikan untuk hayat bateri</string>
     <string name="value_always">Sentiasa</string>
@@ -316,6 +365,7 @@
     <string name="value_off">Dimatikan</string>
     <string name="value_smallest">Paling kecil</string>
     <string name="value_smallest_recommended">Terkecil (disyorkan)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d jam</string>
     <string name="voice_hours_many">%1$d jam</string>
     <string name="voice_hours_one">1 jam</string>
@@ -362,6 +412,7 @@
     <string name="voice_total_distance_miles_two">jumlah jarak 2 batu</string>
     <string name="voice_total_distance_miles_zero">jumlah jarak 0 batu</string>
     <string name="voice_total_distance_zero">Jumlah jarak Jejak Saya ialah kosong.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index ba2e21265..c66222d8d 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">fly</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">sykling</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">gange</string>
     <string name="activity_type_water_skiing">vannski</string>
     <string name="activity_type_wind_surfing">vindsurfing</string>
+    <!-- Description -->
     <string name="description_activity_type">Aktivitetstype: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Gjennomsnittshastighet: %1$s min/km (%2$s min/eng. mil)</string>
     <string name="description_average_moving_speed">Gjennomsnittsfart: %1$.2f km/t (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Hastighet (min/eng. mil)</string>
     <string name="description_pace_metric">Hastighet (min/km)</string>
     <string name="description_recorded_time">Spilt inn: %1$s</string>
+    <string name="description_speed_ms">Hastighet (m/s)</string>
     <string name="description_sensor_cadence">Takt (rpm)</string>
     <string name="description_sensor_heart_rate">Puls (bpm)</string>
     <string name="description_sensor_power">Styrke (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Total tid: %1$s</string>
     <string name="description_track_point">Punkt</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Alle som %1$s</string>
     <string name="export_all_title">Eksporter til ekstern lagringsplass</string>
     <string name="export_error">%1$d av %2$s ble eksportert til %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Eksporterer til %1$s…</string>
     <string name="export_success">%1$s ble eksportert til %2$s</string>
     <string name="export_title">Eksporter til …</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d filer</string>
     <string name="files_many">%1$d filer</string>
     <string name="files_one">1 fil</string>
     <string name="files_other">%1$d filer</string>
     <string name="files_two">2 filer</string>
     <string name="files_zero">0 filer</string>
+    <!-- Generic -->
     <string name="generic_add">Legg til</string>
     <string name="generic_cancel">Avbryt</string>
     <string name="generic_delete_all_confirm_title">Vil du slette alle?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Vellykket</string>
     <string name="generic_tracks">Spor</string>
     <string name="generic_yes">Ja</string>
+    <!-- Gps -->
     <string name="gps_location_access">«Posisjonstilgang»</string>
     <string name="gps_disabled">GPS er ikke aktivert. Trykk her for å gå til %1$s. Trykk på tilbake-knappen for å gå tilbake.</string>
     <string name="gps_disabled_my_location">Den nåværende posisjonen kan ikke fastslås. Aktiver flere posisjonskilder i %1$s, og
@@ -139,6 +161,7 @@
     <string name="gps_starting">Starter GPS</string>
     <string name="gps_wait_for_better_signal">Venter på bedre GPS-signal</string>
     <string name="gps_wait_for_signal">Venter på GPS-signal</string>
+    <!-- Image -->
     <string name="image_application">App</string>
     <string name="image_arrow">Pil</string>
     <string name="image_marker">Markør</string>
@@ -149,6 +172,7 @@
     <string name="image_record">Spill inn</string>
     <string name="image_stop">Stopp</string>
     <string name="image_track">Spor</string>
+    <!-- Import -->
     <string name="import_error">%1$d av %2$s ble importert fra %3$s</string>
     <string name="import_no_directory">%1$s finnes ikke</string>
     <string name="import_no_file">Det var ingen filer å importere. Koble enheten din til datamaskinen din, og plasser filene som skal
@@ -158,6 +182,7 @@
     <string name="import_selection_option">Alle %1$s</string>
     <string name="import_selection_title">Importer fra ekstern lagringsplass</string>
     <string name="import_success">%1$s ble importert fra %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Kan ikke sette inn markør. Har ikke GPS-signal. Prøv på nytt.</string>
     <string name="marker_add_success">En markør ble satt inn</string>
     <string name="marker_add_canceled">Avbrutt – ingen markør lagt til</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">Markør %1$d</string>
     <string name="marker_split_name_format">Del %1$d</string>
     <string name="marker_title">%1$d av %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Siden forrige delmarkør:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Markørtype (f.eks. foss)</string>
     <string name="marker_edit_marker_type_hint">Markørtype</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Du har ingen markører</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Samlet statistikk</string>
     <string name="menu_delete">Slett</string>
     <string name="menu_edit">Rediger</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">Stopp GPS</string>
     <string name="menu_view_photo">Se bildet</string>
     <string name="menu_voice_frequency">Talefrekvens</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Opptakstjeneste</string>
+    <!-- Search -->
     <string name="search_global_description">Spor og markører</string>
     <string name="search_list_empty_message">Ingen spor eller markører samsvarte med søket ditt</string>
     <string name="search_list_marker_track_location">I «%1$s»-stien.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Batterinivå</string>
     <string name="sensor_state_cadence">Kadens</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Ikke tilgjengelig mens du tar opp en sti.</string>
     <string name="settings_show">Vis</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Avansert</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Etter distanse</string>
     <string name="settings_chart_by_time">Etter tid</string>
     <string name="settings_chart_x_axis">X-akse</string>
@@ -230,22 +264,28 @@
     <string name="settings_recording_track_name_date_local_option">Dato (lokal)</string>
     <string name="settings_recording_track_name_number_option">Tall</string>
     <string name="settings_recording_track_name_title">Standardnavn på sti</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Tilbakestill</string>
     <string name="settings_reset_confirm_message">Alle innstillinger går tilbake til standardverdiene.</string>
     <string name="settings_reset_confirm_title">Vil du tilbakestille nå?</string>
     <string name="settings_reset_done">Alle innstillinger er tilbakestilt til standardverdiene</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth-sensor</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Bredde- og lengdegrad</string>
     <string name="settings_stats_rate_title">Foretrukket måling</string>
     <string name="settings_stats_units_imperial">Imperial (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrisk (km, m)</string>
     <string name="settings_stats_units_title">Foretrukne enheter</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Del sporfilen</string>
     <string name="share_track_share_file_body">Jeg tror du kan være interessert i dette sporet.\n\nFor å se på dette sporet bruker du Google Earth eller annen
     kartprogramvare.\n\n%1$s</string>
     <string name="share_track_subject">Jeg vil dele en sti med deg</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Gjennomsnittlig forflytningstempo</string>
     <string name="stats_average_moving_speed">Gjennomsnittlig forflytningshastighet</string>
     <string name="stats_average_pace">Gjennomsnittlig tempo</string>
@@ -264,25 +304,33 @@
     <string name="stats_speed">Hastighet</string>
     <string name="stats_distance">Avstand</string>
     <string name="stats_total_time">Total tid</string>
+    <!-- Track -->
     <string name="track_name_format">Sti %1$d</string>
     <string name="track_record_notification">Tar opp stien …</string>
     <string name="track_markers">Markører for %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Sporet og markørene slettes permanent fra enheten.</string>
     <string name="track_delete_one_confirm_title">Vil du slette sporet?</string>
     <string name="track_delete_multiple_confirm_message">De valgte sporene og markørene slettes permanent fra enheten.</string>
     <string name="track_delete_progress_message">Sletter …</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Diagram</string>
     <string name="track_detail_stats_tab">Statistikk</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Aktivitetstype (f.eks. turgåing)</string>
     <string name="track_edit_activity_type_hint">Aktivitetstype</string>
     <string name="track_edit_new_track_title">Nytt spor</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Begynn å spille inn ditt neste eventyr her</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d stier</string>
     <string name="tracks_many">%1$d stier</string>
     <string name="tracks_one">1 sti</string>
     <string name="tracks_other">%1$d stier</string>
     <string name="tracks_two">2 stier</string>
     <string name="tracks_zero">0 stier</string>
+    <!-- Unit -->
     <string name="unit_feet">fot</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/t</string>
@@ -291,6 +339,7 @@
     <string name="unit_mile_per_hour">eng. mil per time</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min per eng. mil</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Tilpass for nøyaktighet</string>
     <string name="value_adapt_battery_life">Tilpass for batterilevetid</string>
     <string name="value_always">Alltid</string>
@@ -317,6 +366,7 @@
     <string name="value_off">Av</string>
     <string name="value_smallest">Minst</string>
     <string name="value_smallest_recommended">Minste (anbefales)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d timer</string>
     <string name="voice_hours_many">%1$d timer</string>
     <string name="voice_hours_one">Én time</string>
@@ -363,6 +413,7 @@
     <string name="voice_total_distance_miles_two">total avstand er to engelske mil</string>
     <string name="voice_total_distance_miles_zero">total avstand er null engelske mil</string>
     <string name="voice_total_distance_zero">Total avstand i Spor er null.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Minibank</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index f72ad8be5..d00a3c637 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -366,14 +366,13 @@ g) doe wat je denkt dat OpenTracks helpt.</string>
     <string name="settings_sensor_connecting">Verbonden met %1$s</string>
     <string name="settings_sensor_disconnected">Ontkoppeld van %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Wielmaat (mm)</string>
-
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Breedte-/lengtegraad</string>
     <string name="settings_stats_rate_title">Voorkeursverhouding</string>
     <string name="settings_stats_units_imperial">Engels (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrisch (km, m)</string>
     <string name="settings_stats_units_title">Voorkeurseenheden</string>
+
     <!-- Share Track -->
     <string name="share_track_share_file">Routebestand delen</string>
     <string name="share_track_share_file_body">Ik denk dat u misschien wel geïnteresseerd bent in deze route.\n\nAls u deze route wilt weergeven, kunt u Google Earth of andere kaartsoftware gebruiken.\n\n%1$s</string>
@@ -564,4 +563,5 @@ g) doe wat je denkt dat OpenTracks helpt.</string>
     <!-- Share image -->
     <string name="share_image_subject">Ik wil graag een beeld met u delen</string>
     <string name="share_image_body">Ik denk dat je misschien geïnteresseerd bent in dit beeld.</string>
+
 </resources>
diff --git a/src/main/res/values-no/strings.xml b/src/main/res/values-no/strings.xml
index ba2e21265..c66222d8d 100644
--- a/src/main/res/values-no/strings.xml
+++ b/src/main/res/values-no/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">fly</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">sykling</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">gange</string>
     <string name="activity_type_water_skiing">vannski</string>
     <string name="activity_type_wind_surfing">vindsurfing</string>
+    <!-- Description -->
     <string name="description_activity_type">Aktivitetstype: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Gjennomsnittshastighet: %1$s min/km (%2$s min/eng. mil)</string>
     <string name="description_average_moving_speed">Gjennomsnittsfart: %1$.2f km/t (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Hastighet (min/eng. mil)</string>
     <string name="description_pace_metric">Hastighet (min/km)</string>
     <string name="description_recorded_time">Spilt inn: %1$s</string>
+    <string name="description_speed_ms">Hastighet (m/s)</string>
     <string name="description_sensor_cadence">Takt (rpm)</string>
     <string name="description_sensor_heart_rate">Puls (bpm)</string>
     <string name="description_sensor_power">Styrke (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Total tid: %1$s</string>
     <string name="description_track_point">Punkt</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Alle som %1$s</string>
     <string name="export_all_title">Eksporter til ekstern lagringsplass</string>
     <string name="export_error">%1$d av %2$s ble eksportert til %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Eksporterer til %1$s…</string>
     <string name="export_success">%1$s ble eksportert til %2$s</string>
     <string name="export_title">Eksporter til …</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d filer</string>
     <string name="files_many">%1$d filer</string>
     <string name="files_one">1 fil</string>
     <string name="files_other">%1$d filer</string>
     <string name="files_two">2 filer</string>
     <string name="files_zero">0 filer</string>
+    <!-- Generic -->
     <string name="generic_add">Legg til</string>
     <string name="generic_cancel">Avbryt</string>
     <string name="generic_delete_all_confirm_title">Vil du slette alle?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Vellykket</string>
     <string name="generic_tracks">Spor</string>
     <string name="generic_yes">Ja</string>
+    <!-- Gps -->
     <string name="gps_location_access">«Posisjonstilgang»</string>
     <string name="gps_disabled">GPS er ikke aktivert. Trykk her for å gå til %1$s. Trykk på tilbake-knappen for å gå tilbake.</string>
     <string name="gps_disabled_my_location">Den nåværende posisjonen kan ikke fastslås. Aktiver flere posisjonskilder i %1$s, og
@@ -139,6 +161,7 @@
     <string name="gps_starting">Starter GPS</string>
     <string name="gps_wait_for_better_signal">Venter på bedre GPS-signal</string>
     <string name="gps_wait_for_signal">Venter på GPS-signal</string>
+    <!-- Image -->
     <string name="image_application">App</string>
     <string name="image_arrow">Pil</string>
     <string name="image_marker">Markør</string>
@@ -149,6 +172,7 @@
     <string name="image_record">Spill inn</string>
     <string name="image_stop">Stopp</string>
     <string name="image_track">Spor</string>
+    <!-- Import -->
     <string name="import_error">%1$d av %2$s ble importert fra %3$s</string>
     <string name="import_no_directory">%1$s finnes ikke</string>
     <string name="import_no_file">Det var ingen filer å importere. Koble enheten din til datamaskinen din, og plasser filene som skal
@@ -158,6 +182,7 @@
     <string name="import_selection_option">Alle %1$s</string>
     <string name="import_selection_title">Importer fra ekstern lagringsplass</string>
     <string name="import_success">%1$s ble importert fra %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Kan ikke sette inn markør. Har ikke GPS-signal. Prøv på nytt.</string>
     <string name="marker_add_success">En markør ble satt inn</string>
     <string name="marker_add_canceled">Avbrutt – ingen markør lagt til</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">Markør %1$d</string>
     <string name="marker_split_name_format">Del %1$d</string>
     <string name="marker_title">%1$d av %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Siden forrige delmarkør:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Markørtype (f.eks. foss)</string>
     <string name="marker_edit_marker_type_hint">Markørtype</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Du har ingen markører</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Samlet statistikk</string>
     <string name="menu_delete">Slett</string>
     <string name="menu_edit">Rediger</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">Stopp GPS</string>
     <string name="menu_view_photo">Se bildet</string>
     <string name="menu_voice_frequency">Talefrekvens</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Opptakstjeneste</string>
+    <!-- Search -->
     <string name="search_global_description">Spor og markører</string>
     <string name="search_list_empty_message">Ingen spor eller markører samsvarte med søket ditt</string>
     <string name="search_list_marker_track_location">I «%1$s»-stien.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Batterinivå</string>
     <string name="sensor_state_cadence">Kadens</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Ikke tilgjengelig mens du tar opp en sti.</string>
     <string name="settings_show">Vis</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Avansert</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Etter distanse</string>
     <string name="settings_chart_by_time">Etter tid</string>
     <string name="settings_chart_x_axis">X-akse</string>
@@ -230,22 +264,28 @@
     <string name="settings_recording_track_name_date_local_option">Dato (lokal)</string>
     <string name="settings_recording_track_name_number_option">Tall</string>
     <string name="settings_recording_track_name_title">Standardnavn på sti</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Tilbakestill</string>
     <string name="settings_reset_confirm_message">Alle innstillinger går tilbake til standardverdiene.</string>
     <string name="settings_reset_confirm_title">Vil du tilbakestille nå?</string>
     <string name="settings_reset_done">Alle innstillinger er tilbakestilt til standardverdiene</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth-sensor</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Bredde- og lengdegrad</string>
     <string name="settings_stats_rate_title">Foretrukket måling</string>
     <string name="settings_stats_units_imperial">Imperial (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrisk (km, m)</string>
     <string name="settings_stats_units_title">Foretrukne enheter</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Del sporfilen</string>
     <string name="share_track_share_file_body">Jeg tror du kan være interessert i dette sporet.\n\nFor å se på dette sporet bruker du Google Earth eller annen
     kartprogramvare.\n\n%1$s</string>
     <string name="share_track_subject">Jeg vil dele en sti med deg</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Gjennomsnittlig forflytningstempo</string>
     <string name="stats_average_moving_speed">Gjennomsnittlig forflytningshastighet</string>
     <string name="stats_average_pace">Gjennomsnittlig tempo</string>
@@ -264,25 +304,33 @@
     <string name="stats_speed">Hastighet</string>
     <string name="stats_distance">Avstand</string>
     <string name="stats_total_time">Total tid</string>
+    <!-- Track -->
     <string name="track_name_format">Sti %1$d</string>
     <string name="track_record_notification">Tar opp stien …</string>
     <string name="track_markers">Markører for %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Sporet og markørene slettes permanent fra enheten.</string>
     <string name="track_delete_one_confirm_title">Vil du slette sporet?</string>
     <string name="track_delete_multiple_confirm_message">De valgte sporene og markørene slettes permanent fra enheten.</string>
     <string name="track_delete_progress_message">Sletter …</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Diagram</string>
     <string name="track_detail_stats_tab">Statistikk</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Aktivitetstype (f.eks. turgåing)</string>
     <string name="track_edit_activity_type_hint">Aktivitetstype</string>
     <string name="track_edit_new_track_title">Nytt spor</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Begynn å spille inn ditt neste eventyr her</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d stier</string>
     <string name="tracks_many">%1$d stier</string>
     <string name="tracks_one">1 sti</string>
     <string name="tracks_other">%1$d stier</string>
     <string name="tracks_two">2 stier</string>
     <string name="tracks_zero">0 stier</string>
+    <!-- Unit -->
     <string name="unit_feet">fot</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/t</string>
@@ -291,6 +339,7 @@
     <string name="unit_mile_per_hour">eng. mil per time</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min per eng. mil</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Tilpass for nøyaktighet</string>
     <string name="value_adapt_battery_life">Tilpass for batterilevetid</string>
     <string name="value_always">Alltid</string>
@@ -317,6 +366,7 @@
     <string name="value_off">Av</string>
     <string name="value_smallest">Minst</string>
     <string name="value_smallest_recommended">Minste (anbefales)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d timer</string>
     <string name="voice_hours_many">%1$d timer</string>
     <string name="voice_hours_one">Én time</string>
@@ -363,6 +413,7 @@
     <string name="voice_total_distance_miles_two">total avstand er to engelske mil</string>
     <string name="voice_total_distance_miles_zero">total avstand er null engelske mil</string>
     <string name="voice_total_distance_zero">Total avstand i Spor er null.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Minibank</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 006e73802..4cd95d15d 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">samolot</string>
     <string name="activity_type_atv">quady</string>
     <string name="activity_type_biking">jazda na rowerze</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">spacer</string>
     <string name="activity_type_water_skiing">narciarstwo wodne</string>
     <string name="activity_type_wind_surfing">windsurfing</string>
+    <!-- Description -->
     <string name="description_activity_type">Rodzaj aktywności: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Średnie tempo ruchu: %1$s min/km (%2$s min/milę)</string>
     <string name="description_average_moving_speed">Średnia prędkość ruchu: %1$.2f km/h (mil/h: %2$.1f)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempo (min/milę)</string>
     <string name="description_pace_metric">Tempo (min/km)</string>
     <string name="description_recorded_time">Zarejestrowano: %1$s</string>
+    <string name="description_speed_ms">Prędkość (m/s)</string>
     <string name="description_sensor_cadence">Prędkość obrotowa (obr./min)</string>
     <string name="description_sensor_heart_rate">Częstość akcji serca (uderzeń/min)</string>
     <string name="description_sensor_power">Moc (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Łączny czas: %1$s</string>
     <string name="description_track_point">Punkt</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Wszystko jako pliki %1$s</string>
     <string name="export_all_title">Eksport do pamięci zewnętrznej</string>
     <string name="export_error">Wyeksportowano %1$d z %2$s do folderu %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Eksportuję do %1$s…</string>
     <string name="export_success">Wyeksportowano %1$s do folderu %2$s</string>
     <string name="export_title">Wyeksportuj do…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d pliki</string>
     <string name="files_many">%1$d plików</string>
     <string name="files_one">1 plik</string>
     <string name="files_other">%1$d pliku</string>
     <string name="files_two">2 pliki</string>
     <string name="files_zero">0 plików</string>
+    <!-- Generic -->
     <string name="generic_add">Dodaj</string>
     <string name="generic_cancel">Anuluj</string>
     <string name="generic_delete_all_confirm_title">Usunąć wszystko?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Udało się</string>
     <string name="generic_tracks">Trasy</string>
     <string name="generic_yes">Tak</string>
+    <!-- Gps -->
     <string name="gps_location_access">„Dostęp do lokalizacji”</string>
     <string name="gps_disabled">GPS nie jest włączony. Kliknij tutaj, aby przejść do %1$s. Naciśnij przycisk Wstecz, aby wrócić.</string>
     <string name="gps_disabled_my_location">Nie można określić aktualnej lokalizacji. Otwórz %1$s, włącz więcej źródeł określania lokalizacji i upewnij się,
@@ -139,6 +161,7 @@
     <string name="gps_starting">Uruchamiam GPS</string>
     <string name="gps_wait_for_better_signal">Czekam na lepszy sygnał GPS</string>
     <string name="gps_wait_for_signal">Czekam na sygnał GPS</string>
+    <!-- Image -->
     <string name="image_application">Aplikacja</string>
     <string name="image_arrow">Strzałka</string>
     <string name="image_marker">Znacznik</string>
@@ -149,6 +172,7 @@
     <string name="image_record">Rejestruj</string>
     <string name="image_stop">Zatrzymaj</string>
     <string name="image_track">Trasa</string>
+    <!-- Import -->
     <string name="import_error">Zaimportowano %1$d z %2$s z katalogu %3$s</string>
     <string name="import_no_directory">Katalog %1$s nie istnieje</string>
     <string name="import_no_file">Brak plików do zaimportowania. Połącz urządzenie z komputerem i umieść pliki, które chcesz
@@ -158,6 +182,7 @@
     <string name="import_selection_option">Wszystkie pliki %1$s</string>
     <string name="import_selection_title">Import z pamięci zewnętrznej</string>
     <string name="import_success">Zaimportowano %1$s z katalogu %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Nie można wstawić znacznika. Brak sygnału GPS. Spróbuj ponownie.</string>
     <string name="marker_add_success">Wstawiono znacznik</string>
     <string name="marker_add_canceled">Anulowano, nie dodano znacznika</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">Znacznik %1$d</string>
     <string name="marker_split_name_format">Podział %1$d</string>
     <string name="marker_title">%1$d z %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Od ostatniego znacznika podziału:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Typ znacznika (np. wodospad)</string>
     <string name="marker_edit_marker_type_hint">Typ znacznika</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Nie masz żadnych znaczników</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Statystyki łączne</string>
     <string name="menu_delete">Usuń</string>
     <string name="menu_edit">Edytuj</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">Zatrzymaj GPS</string>
     <string name="menu_view_photo">Wyświetl zdjęcie</string>
     <string name="menu_voice_frequency">Częstość powiadomień</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Usługa rejestrowania</string>
+    <!-- Search -->
     <string name="search_global_description">Trasy i znaczniki</string>
     <string name="search_list_empty_message">Brak tras lub znaczników pasujących do wyszukiwania</string>
     <string name="search_list_marker_track_location">Na trasie „%1$s”.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Poziom naładowania baterii</string>
     <string name="sensor_state_cadence">Prędkość obrotowa</string>
     <string name="sensor_state_cadence_value">%1$d obr./min</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Niedostępne podczas rejestrowania trasy</string>
     <string name="settings_show">Pokaż</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Zaawansowane</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Wg odległości</string>
     <string name="settings_chart_by_time">Wg czasu</string>
     <string name="settings_chart_x_axis">Oś X</string>
@@ -230,22 +264,28 @@
     <string name="settings_recording_track_name_date_local_option">Data (lokalnie)</string>
     <string name="settings_recording_track_name_number_option">Numer</string>
     <string name="settings_recording_track_name_title">Domyślna nazwa trasy</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Zresetuj</string>
     <string name="settings_reset_confirm_message">Wszystkie ustawienia zostaną zresetowane do wartości domyślnych.</string>
     <string name="settings_reset_confirm_title">Zresetować teraz?</string>
     <string name="settings_reset_done">Wszystkie ustawienia wróciły do wartości domyślnych</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Czujnik</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Czujnik Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Szerokość/długość geo.</string>
     <string name="settings_stats_rate_title">Preferowana wartość</string>
     <string name="settings_stats_units_imperial">Imperialne (mile, stopy)</string>
     <string name="settings_stats_units_metric">Metryczne (km, m)</string>
     <string name="settings_stats_units_title">Preferowane jednostki</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Udostępnij plik z trasą</string>
     <string name="share_track_share_file_body">Myślę, że ta trasa może Cię zainteresować.\n\nAby wyświetlić tę trasę, skorzystaj z Google Earth lub innego oprogramowania
     do obsługi map.\n\n%1$s</string>
     <string name="share_track_subject">Chcę udostępnić Ci trasę.</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Średnie tempo ruchu</string>
     <string name="stats_average_moving_speed">Średnia prędkość ruchu</string>
     <string name="stats_average_pace">Średnie tempo</string>
@@ -264,25 +304,33 @@
     <string name="stats_speed">Prędkość</string>
     <string name="stats_distance">Odległość</string>
     <string name="stats_total_time">Łączny czas</string>
+    <!-- Track -->
     <string name="track_name_format">Trasa %1$d</string>
     <string name="track_record_notification">Rejestrowanie Twojej trasy…</string>
     <string name="track_markers">Znaczniki: %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Trasa wraz ze znacznikami zostanie trwale usunięta z urządzenia.</string>
     <string name="track_delete_one_confirm_title">Usunąć trasę?</string>
     <string name="track_delete_multiple_confirm_message">Wybrane trasy wraz ze znacznikami zostaną trwale usunięte z urządzenia.</string>
     <string name="track_delete_progress_message">Usuwam…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Wykres</string>
     <string name="track_detail_stats_tab">Statystyki</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Typ aktywności (np. turystyka piesza)</string>
     <string name="track_edit_activity_type_hint">Typ aktywności</string>
     <string name="track_edit_new_track_title">Nowa trasa</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Rozpocznij rejestrowanie swojej następnej przygody</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d trasy</string>
     <string name="tracks_many">%1$d tras</string>
     <string name="tracks_one">1 trasa</string>
     <string name="tracks_other">%1$d trasy</string>
     <string name="tracks_two">2 trasy</string>
     <string name="tracks_zero">0 tras</string>
+    <!-- Unit -->
     <string name="unit_feet">ft</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -291,6 +339,7 @@
     <string name="unit_mile_per_hour">mi/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Dostosuj pod kątem dokładności</string>
     <string name="value_adapt_battery_life">Dostosuj pod kątem żywotności baterii</string>
     <string name="value_always">Zawsze</string>
@@ -317,6 +366,7 @@
     <string name="value_off">Wyłącz</string>
     <string name="value_smallest">Najniższa</string>
     <string name="value_smallest_recommended">Najmniejsza (zalecane)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d godzin(y)</string>
     <string name="voice_hours_many">%1$d godzin(y)</string>
     <string name="voice_hours_one">1 godzina</string>
@@ -363,6 +413,7 @@
     <string name="voice_total_distance_miles_two">całkowita odległość: 2 mile</string>
     <string name="voice_total_distance_miles_zero">całkowita odległość: 0 mil</string>
     <string name="voice_total_distance_zero">Zerowa odległość w Moich trasach</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">bankomat</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 0ce90843f..b9be2c4ba 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">avião</string>
     <string name="activity_type_atv">quadriciclos</string>
     <string name="activity_type_biking">ciclismo</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">caminhada</string>
     <string name="activity_type_water_skiing">esqui aquático</string>
     <string name="activity_type_wind_surfing">windsurfe</string>
+    <!-- Description -->
     <string name="description_activity_type">Tipo de atividade: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Ritmo médio de deslocamento: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Velocidade média de deslocamento: %1$.2f km/h (%2$.1f milhas/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Ritmo (min/mi)</string>
     <string name="description_pace_metric">Ritmo (min/km)</string>
     <string name="description_recorded_time">Registro: %1$s</string>
+    <string name="description_speed_ms">Velocidade (m/s)</string>
     <string name="description_sensor_cadence">Cadência (rpm)</string>
     <string name="description_sensor_heart_rate">Frequência cardíaca (bpm)</string>
     <string name="description_sensor_power">Potência (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Tempo total: %1$s</string>
     <string name="description_track_point">Ponto</string>
     <string name="description_track_segment">Segmento</string>
+    <!-- Export -->
     <string name="export_all_option">Todas como %1$s</string>
     <string name="export_all_title">Exportar para o armazenamento externo</string>
     <string name="export_error">Exportação: %1$d de %2$s para %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Exportando para %1$s…</string>
     <string name="export_success">Exportação: %1$s para %2$s</string>
     <string name="export_title">Exportar para…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d arquivos</string>
     <string name="files_many">%1$d arquivos</string>
     <string name="files_one">1 arquivo</string>
     <string name="files_other">%1$d arquivos</string>
     <string name="files_two">2 arquivos</string>
     <string name="files_zero">0 arquivos</string>
+    <!-- Generic -->
     <string name="generic_add">Adicionar</string>
     <string name="generic_cancel">Cancelar</string>
     <string name="generic_delete_all_confirm_title">Excluir tudo?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Sucesso</string>
     <string name="generic_tracks">Rotas</string>
     <string name="generic_yes">Sim</string>
+    <!-- Gps -->
     <string name="gps_location_access">\"Acesso ao local\"</string>
     <string name="gps_disabled">GPS inativo. Toque aqui para ir para %1$s. Pressione o botão \"Voltar\" para retornar.</string>
     <string name="gps_disabled_my_location">Não é possível determinar o local atual. Ative mais fontes da localização em %1$s. Além disso, verifique se
@@ -139,6 +161,7 @@
     <string name="gps_starting">Iniciando GPS</string>
     <string name="gps_wait_for_better_signal">Aguardando sinal de GPS melhor</string>
     <string name="gps_wait_for_signal">Aguardando sinal de GPS</string>
+    <!-- Image -->
     <string name="image_application">Aplicativo</string>
     <string name="image_arrow">Seta</string>
     <string name="image_marker">Marcador</string>
@@ -149,6 +172,7 @@
     <string name="image_record">Gravar</string>
     <string name="image_stop">Parar</string>
     <string name="image_track">Rota</string>
+    <!-- Import -->
     <string name="import_error">Importação: %1$d de %2$s de %3$s</string>
     <string name="import_no_directory">%1$s não existe</string>
     <string name="import_no_file">Nenhum arquivo para importar. Conecte o dispositivo ao computador e coloque os
@@ -158,6 +182,7 @@
     <string name="import_selection_option">Todos os %1$s</string>
     <string name="import_selection_title">Importar do armazenamento externo</string>
     <string name="import_success">Importação: %1$s de %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Não foi possível inserir um marcador. Não há sinal de GPS. Tente novamente.</string>
     <string name="marker_add_success">Um marcador foi inserido</string>
     <string name="marker_add_canceled">Cancelado. Nenhum marcador foi adicionado.</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">Marcador %1$d</string>
     <string name="marker_split_name_format">Dividir %1$d</string>
     <string name="marker_title">%1$d de %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">A partir do último marcador de divisão:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipo de marcador (por exemplo, cascata)</string>
     <string name="marker_edit_marker_type_hint">Tipo de marcador</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Você não tem marcadores</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Estatísticas reunidas</string>
     <string name="menu_delete">Excluir</string>
     <string name="menu_edit">Editar</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">Parar GPS</string>
     <string name="menu_view_photo">Ver foto</string>
     <string name="menu_voice_frequency">Frequência da voz</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Serviço de gravação</string>
+    <!-- Search -->
     <string name="search_global_description">Trilhas e marcadores</string>
     <string name="search_list_empty_message">Nenhuma rota ou marcador corresponde à pesquisa</string>
     <string name="search_list_marker_track_location">Na trilha \"%1$s\".</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Nível da bateria</string>
     <string name="sensor_state_cadence">Cadência</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Não disponível durante a gravação de uma trilha</string>
     <string name="settings_show">Mostrar</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Avançado</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Por distância</string>
     <string name="settings_chart_by_time">Por tempo</string>
     <string name="settings_chart_x_axis">Eixo X</string>
@@ -230,22 +264,28 @@
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nome padrão para trilhas</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Redefinir</string>
     <string name="settings_reset_confirm_message">Todas as configurações serão revertidas para os valores padrão.</string>
     <string name="settings_reset_confirm_title">Redefinir agora?</string>
     <string name="settings_reset_done">Todas as configurações foram revertidas para os valores padrão</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Sensor Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitude/longitude</string>
     <string name="settings_stats_rate_title">Taxa preferencial</string>
     <string name="settings_stats_units_imperial">Imperial (milhas, pés)</string>
     <string name="settings_stats_units_metric">Métrica (km, m)</string>
     <string name="settings_stats_units_title">Unidades preferenciais</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Compartilhar arquivo da trilha</string>
     <string name="share_track_share_file_body">Achei que você pudesse se interessar por essa trilha.\n\nPara visualizá-la, use o Google Earth ou outro
     software de mapas.\n\n%1$s</string>
     <string name="share_track_subject">Eu gostaria de compartilhar uma trilha com você</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Ritmo médio de movimentação</string>
     <string name="stats_average_moving_speed">Velocidade média de movimentação</string>
     <string name="stats_average_pace">Ritmo médio</string>
@@ -264,25 +304,33 @@
     <string name="stats_speed">Velocidade</string>
     <string name="stats_distance">Distância</string>
     <string name="stats_total_time">Tempo total</string>
+    <!-- Track -->
     <string name="track_name_format">Trilha %1$d</string>
     <string name="track_record_notification">Gravando sua trilha…</string>
     <string name="track_markers">Marcadores de %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">A trilha e seus marcadores serão excluídos permanentemente do dispositivo.</string>
     <string name="track_delete_one_confirm_title">Excluir rota?</string>
     <string name="track_delete_multiple_confirm_message">As trilhas selecionadas e seus respectivos marcadores serão excluídos permanentemente do dispositivo.</string>
     <string name="track_delete_progress_message">Excluindo…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Gráfico</string>
     <string name="track_detail_stats_tab">Estatísticas</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Tipo de atividade (por exemplo, caminhada)</string>
     <string name="track_edit_activity_type_hint">Tipo de atividade</string>
     <string name="track_edit_new_track_title">Trilha nova</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Comece a gravar sua próxima aventura aqui</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d trilhas</string>
     <string name="tracks_many">%1$d trilhas</string>
     <string name="tracks_one">1 trilha</string>
     <string name="tracks_other">%1$d trilhas</string>
     <string name="tracks_two">2 trilhas</string>
     <string name="tracks_zero">0 trilhas</string>
+    <!-- Unit -->
     <string name="unit_feet">pés</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -291,6 +339,7 @@
     <string name="unit_mile_per_hour">milhas/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/milhas</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Adaptar para fins de precisão</string>
     <string name="value_adapt_battery_life">Adaptar à vida da bateria</string>
     <string name="value_always">Sempre</string>
@@ -317,6 +366,7 @@
     <string name="value_off">Desativar</string>
     <string name="value_smallest">Menor</string>
     <string name="value_smallest_recommended">Menor (recomendado)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d horas</string>
     <string name="voice_hours_many">%1$d horas</string>
     <string name="voice_hours_one">1 hora</string>
@@ -363,6 +413,7 @@
     <string name="voice_total_distance_miles_two">distância total de 2 milhas</string>
     <string name="voice_total_distance_miles_zero">distância total de 0 milha</string>
     <string name="voice_total_distance_zero">Minhas trilhas, distância total zero.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">caixa eletrônico</string>
     <string name="waypoint_type_bank">banco</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 64f413051..27e35b90f 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">zbor</string>
     <string name="activity_type_atv">ATV-uri</string>
     <string name="activity_type_biking">ciclism</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">mers pe jos</string>
     <string name="activity_type_water_skiing">schi nautic</string>
     <string name="activity_type_wind_surfing">windsurfing</string>
+    <!-- Description -->
     <string name="description_activity_type">Tip de activitate: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Ritmul mediu de mișcare: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Viteză medie de deplasare: %1$.2f km/h (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Ritmul (min/mi)</string>
     <string name="description_pace_metric">Ritmul (min/km)</string>
     <string name="description_recorded_time">Înregistrat: %1$s</string>
+    <string name="description_speed_ms">Viteză (m/s)</string>
     <string name="description_sensor_cadence">Cadenţă (rpm)</string>
     <string name="description_sensor_heart_rate">Ritm cardiac (bpm)</string>
     <string name="description_sensor_power">Putere (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Timp total: %1$s</string>
     <string name="description_track_point">Punct</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Toate ca %1$s</string>
     <string name="export_all_title">Salvați în stocarea externă</string>
     <string name="export_error">S-a(u) exportat %1$d din %2$s în %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Se exportă în %1$s…</string>
     <string name="export_success">S-a(u) exportat %1$s în %2$s</string>
     <string name="export_title">Exportați în…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d fișiere</string>
     <string name="files_many">%1$d (de) fișiere</string>
     <string name="files_one">1 fișier</string>
     <string name="files_other">%1$d (de) fișiere</string>
     <string name="files_two">2 fișiere</string>
     <string name="files_zero">0 fișiere</string>
+    <!-- Generic -->
     <string name="generic_add">Adăugați</string>
     <string name="generic_cancel">Anulaţi</string>
     <string name="generic_delete_all_confirm_title">Ștergeți toate?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Aţi reuşit</string>
     <string name="generic_tracks">Trasee</string>
     <string name="generic_yes">Da</string>
+    <!-- Gps -->
     <string name="gps_location_access">„Acces la locație”</string>
     <string name="gps_disabled">GPS-ul nu este activat. Apăsați aici pentru a accesa %1$s. Apăsați butonul Înapoi pentru a reveni.</string>
     <string name="gps_disabled_my_location">Locația curentă nu poate fi determinată. Activați mai multe surse de localizare la %1$s și asigurați-vă că este vizibil cerul. Încercați din nou mai târziu.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Se pornește GPS</string>
     <string name="gps_wait_for_better_signal">Se așteaptă un semnal GPS mai bun</string>
     <string name="gps_wait_for_signal">Se așteaptă semnal GPS</string>
+    <!-- Image -->
     <string name="image_application">Aplicație</string>
     <string name="image_arrow">Săgeată</string>
     <string name="image_marker">Marcator</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Înregistrați</string>
     <string name="image_stop">Opriți</string>
     <string name="image_track">Traseu</string>
+    <!-- Import -->
     <string name="import_error">S-a(u) importat %1$d din %2$s din %3$s</string>
     <string name="import_no_directory">%1$s nu există</string>
     <string name="import_no_file">Nu există niciun fișier de importat. Conectați dispozitivul la computer și plasați fișierele
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Toate fișierele de format %1$s</string>
     <string name="import_selection_title">Importați din stocarea externă</string>
     <string name="import_success">S-a(u) importat %1$s din %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Marcatorul nu a putut fi introdus. Nu există semnal GPS. Încercați din nou.</string>
     <string name="marker_add_success">A fost inserat un marcator</string>
     <string name="marker_add_canceled">Anulat, niciun marcator adăugat</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Marcator %1$d</string>
     <string name="marker_split_name_format">Divizați %1$d</string>
     <string name="marker_title">%1$d din %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">De la ultimul marcator de divizare:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tip de marcator (de exemplu: cascadă)</string>
     <string name="marker_edit_marker_type_hint">Tipul de marcator</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Nu aveți niciun marcator</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Statistici cumulate</string>
     <string name="menu_delete">Ștergeți</string>
     <string name="menu_edit">Editați</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Opriți GPS</string>
     <string name="menu_view_photo">Afișați fotografia</string>
     <string name="menu_voice_frequency">Frecvența vocii</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Serviciu de înregistrare</string>
+    <!-- Search -->
     <string name="search_global_description">Trasee și marcatori</string>
     <string name="search_list_empty_message">Nu există trasee sau marcatori care să corespundă căutării</string>
     <string name="search_list_marker_track_location">În traseul „%1$s”.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Nivelul bateriei</string>
     <string name="sensor_state_cadence">Cadenţă</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Indisponibilă în timp ce înregistrați un traseu.</string>
     <string name="settings_show">Afișați</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Avansate</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">După distanță</string>
     <string name="settings_chart_by_time">După durată</string>
     <string name="settings_chart_x_axis">Axa x</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
     <string name="settings_recording_track_name_number_option">Număr</string>
     <string name="settings_recording_track_name_title">Nume prestabilit traseu</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Resetaţi</string>
     <string name="settings_reset_confirm_message">Toate setările vor fi readuse la valorile implicite.</string>
     <string name="settings_reset_confirm_title">Resetați acum?</string>
     <string name="settings_reset_done">Toate setările au revenit la valorile prestabilite</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Senzor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Senzor Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitudine/longitudine</string>
     <string name="settings_stats_rate_title">Rata de preferat</string>
     <string name="settings_stats_units_imperial">Imperial (mi, ft)</string>
     <string name="settings_stats_units_metric">Metric (km, m)</string>
     <string name="settings_stats_units_title">Unități preferate</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Distribuiți fișierul traseului</string>
     <string name="share_track_share_file_body">Cred că te-ar putea interesa acest traseu.\n\nPentru a vizualiza acest traseu, utilizați Google Earth sau alt software de cartografiere.\n\n%1$s</string>
     <string name="share_track_subject">Aş vrea să-ţi trimit un traseu.</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Ritmul mediu de mișcare</string>
     <string name="stats_average_moving_speed">Viteza medie de mișcare</string>
     <string name="stats_average_pace">Ritmul mediu</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Viteza</string>
     <string name="stats_distance">Distanţa</string>
     <string name="stats_total_time">Durata totală</string>
+    <!-- Track -->
     <string name="track_name_format">Traseul %1$d</string>
     <string name="track_record_notification">Se înregistrează traseul dvs…</string>
     <string name="track_markers">Marcatori %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Traseul și marcatorii săi vor fi șterși definitiv de pe dispozitiv.</string>
     <string name="track_delete_one_confirm_title">Ștergeți traseul?</string>
     <string name="track_delete_multiple_confirm_message">Traseele selectate și marcatorii lor vor fi șterși definitiv de pe dispozitiv.</string>
     <string name="track_delete_progress_message">Se șterge…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Diagramă</string>
     <string name="track_detail_stats_tab">Statistici</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Tipul de activitate (de exemplu: drumeții)</string>
     <string name="track_edit_activity_type_hint">Tipul de activitate</string>
     <string name="track_edit_new_track_title">Traseu nou</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Începeți aici înregistrarea următoarei aventuri</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d trasee</string>
     <string name="tracks_many">%1$d (de) trasee</string>
     <string name="tracks_one">1 traseu</string>
     <string name="tracks_other">%1$d (de) trasee</string>
     <string name="tracks_two">2 trasee</string>
     <string name="tracks_zero">0 trasee</string>
+    <!-- Unit -->
     <string name="unit_feet">ft</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">mi/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Adaptaţi pentru acurateţe</string>
     <string name="value_adapt_battery_life">Economisiţi bateria</string>
     <string name="value_always">Întotdeauna</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Dezactivare</string>
     <string name="value_smallest">Cea mai mică valoare</string>
     <string name="value_smallest_recommended">Cea mai mică valoare (recomandată)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d ore</string>
     <string name="voice_hours_many">%1$d (de) ore</string>
     <string name="voice_hours_one">1 oră</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">distanţa totală 2 mile</string>
     <string name="voice_total_distance_miles_zero">distanţa totală 0 mile</string>
     <string name="voice_total_distance_zero">Distanţa totală în Traseele mele, zero.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Bancomat</string>
     <string name="waypoint_type_bank">bancă</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 9c8bef887..1c0274dec 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">Авиаспорт</string>
     <string name="activity_type_atv">Езда на внедорожниках</string>
     <string name="activity_type_biking">велосипед</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">Ходьба</string>
     <string name="activity_type_water_skiing">Катание на водных лыжах</string>
     <string name="activity_type_wind_surfing">Виндсерфинг</string>
+    <!-- Description -->
     <string name="description_activity_type">Вид активности: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Средний темп при движении: %1$s мин/км (%2$s мин/мил)</string>
     <string name="description_average_moving_speed">Средняя скорость при движении: %1$.2f км/ч (%2$.1f мил/ч)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Темп (мин/мил)</string>
     <string name="description_pace_metric">Темп (мин/км)</string>
     <string name="description_recorded_time">Записано: %1$s</string>
+    <string name="description_speed_ms">Скорость (м/с)</string>
     <string name="description_sensor_cadence">Частота вращения педалей (об/мин)</string>
     <string name="description_sensor_heart_rate">Пульс (уд/мин)</string>
     <string name="description_sensor_power">Мощность (Вт)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Общее время: %1$s</string>
     <string name="description_track_point">Точка</string>
     <string name="description_track_segment">Сегмент</string>
+    <!-- Export -->
     <string name="export_all_option">Все как %1$s-файлы</string>
     <string name="export_all_title">Экспортировать на внешний накопитель</string>
     <string name="export_error">Экспортировано: %1$d из %2$s (в %3$s)</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Экспорт в папку %1$s…</string>
     <string name="export_success">Экспортировано: %1$s (в %2$s)</string>
     <string name="export_title">Экспорт в…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d файла</string>
     <string name="files_many">%1$d файлов</string>
     <string name="files_one">1 файл</string>
     <string name="files_other">%1$d файла</string>
     <string name="files_two">2 файла</string>
     <string name="files_zero">0 файлов</string>
+    <!-- Generic -->
     <string name="generic_add">Добавить</string>
     <string name="generic_cancel">Отмена</string>
     <string name="generic_delete_all_confirm_title">Удалить все?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Готово</string>
     <string name="generic_tracks">Треки</string>
     <string name="generic_yes">Да</string>
+    <!-- Gps -->
     <string name="gps_location_access">Мое местоположение</string>
     <string name="gps_disabled">GPS-модуль не включен. Нажмите здесь, чтобы открыть \"%1$s\". Нажмите \"Назад\", чтобы вернуться.</string>
     <string name="gps_disabled_my_location">Не удалось определить местоположение. Добавьте другие источники передачи данных в настройках (%1$s) и убедитесь, что приему сигнала ничего не препятствует. Затем повторите попытку.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Включение GPS-модуля…</string>
     <string name="gps_wait_for_better_signal">Поиск спутников GPS…</string>
     <string name="gps_wait_for_signal">Ожидание сигнала GPS…</string>
+    <!-- Image -->
     <string name="image_application">Приложение</string>
     <string name="image_arrow">Стрелка</string>
     <string name="image_marker">Маркер</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Запись</string>
     <string name="image_stop">Стоп</string>
     <string name="image_track">Трек</string>
+    <!-- Import -->
     <string name="import_error">Импортировано: %1$d из %2$s (из %3$s)</string>
     <string name="import_no_directory">%1$s не существует</string>
     <string name="import_no_file">Нет файлов для импорта. Подсоедините устройство к компьютеру и укажите путь к файлам, которые нужно импортировать в %1$s.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">Все %1$s-файлы</string>
     <string name="import_selection_title">Импорт с накопителя</string>
     <string name="import_success">Импортировано: %1$s (из %2$s)</string>
+    <!-- Marker -->
     <string name="marker_add_error">Невозможно добавить маркер. Нет сигнала GPS. Повторите попытку.</string>
     <string name="marker_add_success">Маркер добавлен</string>
     <string name="marker_add_canceled">Действие отменено, маркер не добавлен</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">Маркер %1$d</string>
     <string name="marker_split_name_format">Разделительный маркер %1$d</string>
     <string name="marker_title">%1$d из %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">С последнего разделительного маркера:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип маркера (например, водопад)</string>
     <string name="marker_edit_marker_type_hint">Тип маркера</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Вы пока не добавили ни одного маркера</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Статистика</string>
     <string name="menu_delete">Удалить</string>
     <string name="menu_edit">Изменить</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">Отключить GPS</string>
     <string name="menu_view_photo">Открыть фото</string>
     <string name="menu_voice_frequency">Голосовые оповещения</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Служба записи треков</string>
+    <!-- Search -->
     <string name="search_global_description">Треки и маркеры</string>
     <string name="search_list_empty_message">По вашему запросу ничего не найдено</string>
     <string name="search_list_marker_track_location">В треке \"%1$s\".</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Уровень заряда батареи</string>
     <string name="sensor_state_cadence">Вращение педалей</string>
     <string name="sensor_state_cadence_value">%1$d об/мин</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d Вт</string>
     <string name="settings_not_while_recording">Недоступно во время записи трека</string>
     <string name="settings_show">Показать</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Расширенные</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Расстояние</string>
     <string name="settings_chart_by_time">Время</string>
     <string name="settings_chart_x_axis">Ось X</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">Дата (по умолчанию)</string>
     <string name="settings_recording_track_name_number_option">Номер</string>
     <string name="settings_recording_track_name_title">Название по умолчанию</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Сброс настроек</string>
     <string name="settings_reset_confirm_message">Будут восстановлены значения по умолчанию.</string>
     <string name="settings_reset_confirm_title">Сбросить настройки?</string>
     <string name="settings_reset_done">Настройки по умолчанию восстановлены</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Датчик</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Датчик Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Широта/долгота</string>
     <string name="settings_stats_rate_title">Предпочтение</string>
     <string name="settings_stats_units_imperial">Британская (мили, футы)</string>
     <string name="settings_stats_units_metric">Метрическая (км, м)</string>
     <string name="settings_stats_units_title">Система измерений</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Опубликовать трек</string>
     <string name="share_track_share_file_body">Я думаю этот маршрут покажется вам интересным.\n\nИспользуйте Google Планета Земля или другое картографическое ПО для просмотра трека.\n\n%1$s</string>
     <string name="share_track_subject">Хочу поделиться треком</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Средняя длина шага</string>
     <string name="stats_average_moving_speed">Средняя скорость движения</string>
     <string name="stats_average_pace">Средний шаг</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">Скорость</string>
     <string name="stats_distance">Расстояние</string>
     <string name="stats_total_time">Общее время</string>
+    <!-- Track -->
     <string name="track_name_format">Трек %1$d</string>
     <string name="track_record_notification">Запись трека…</string>
     <string name="track_markers">%1$s – маркеры</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Трек и связанные с ним маркеры будут удалены без возможности восстановления.</string>
     <string name="track_delete_one_confirm_title">Удалить трек?</string>
     <string name="track_delete_multiple_confirm_message">Треки и связанные с ними маркеры будут удалены без возможности восстановления.</string>
     <string name="track_delete_progress_message">Удаление…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">График</string>
     <string name="track_detail_stats_tab">Статистика</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Вид активности (например, пеший туризм)</string>
     <string name="track_edit_activity_type_hint">Вид активности</string>
     <string name="track_edit_new_track_title">Новый трек</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Запишите свой первый трек здесь</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d трека</string>
     <string name="tracks_many">%1$d треков</string>
     <string name="tracks_one">1 трек</string>
     <string name="tracks_other">%1$d трека</string>
     <string name="tracks_two">2 трека</string>
     <string name="tracks_zero">0 треков</string>
+    <!-- Unit -->
     <string name="unit_feet">фт</string>
     <string name="unit_kilometer">км</string>
     <string name="unit_kilometer_per_hour">км/ч</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">мил/ч</string>
     <string name="unit_minute_per_kilometer">мин/км</string>
     <string name="unit_minute_per_mile">мин/мил</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Макс. точность</string>
     <string name="value_adapt_battery_life">Мин. расход батареи</string>
     <string name="value_always">Всегда</string>
@@ -314,6 +363,7 @@
     <string name="value_off">Выкл.</string>
     <string name="value_smallest">Мин. время</string>
     <string name="value_smallest_recommended">Мин. время (рекомендуется)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d часа</string>
     <string name="voice_hours_many">%1$d часов</string>
     <string name="voice_hours_one">1 час</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">Общая длина: 2 мили</string>
     <string name="voice_total_distance_miles_zero">Общая длина: 0 миль</string>
     <string name="voice_total_distance_zero">Общая длина трека равна нулю.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Банкомат</string>
     <string name="waypoint_type_bank">Банк</string>
     <string name="waypoint_type_bar">Бар</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 05bd72fa6..304f037f7 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">lietadlo</string>
     <string name="activity_type_atv">Všetky terénne vozidlá</string>
     <string name="activity_type_biking">cyklistika</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">chôdza</string>
     <string name="activity_type_water_skiing">vodné lyžovanie</string>
     <string name="activity_type_wind_surfing">windsurfing</string>
+    <!-- Description -->
     <string name="description_activity_type">Typ aktivity: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Priemerné tempo pohybu: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Priemerná rýchlosť pohybu: %1$.2f km/h (%2$.1f míľ/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempo (min/mi)</string>
     <string name="description_pace_metric">Tempo (min/km)</string>
     <string name="description_recorded_time">Zaznamenané: %1$s</string>
+    <string name="description_speed_ms">Rýchlosť (m/s)</string>
     <string name="description_sensor_cadence">Rytmus (ot./min.)</string>
     <string name="description_sensor_heart_rate">Pulz (údery/min.)</string>
     <string name="description_sensor_power">Výkon (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Celkový čas: %1$s</string>
     <string name="description_track_point">Bod</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Všetky vo formáte %1$s</string>
     <string name="export_all_title">Exportovať do externého úložiska</string>
     <string name="export_error">Do adresára %3$s bol exportovaný nasledujúci počet trás: %1$d z %2$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Prebieha exportovanie do adresára %1$s…</string>
     <string name="export_success">Do adresára %2$s bol exportovaný nasledujúci počet trás: %1$s</string>
     <string name="export_title">Exportovať do…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d súbory</string>
     <string name="files_many">%1$d súborov</string>
     <string name="files_one">1 súbor</string>
     <string name="files_other">%1$d súborov</string>
     <string name="files_two">2 súbory</string>
     <string name="files_zero">0 súborov</string>
+    <!-- Generic -->
     <string name="generic_add">Pridať</string>
     <string name="generic_cancel">Zrušiť</string>
     <string name="generic_delete_all_confirm_title">Odstrániť všetko?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Úspech</string>
     <string name="generic_tracks">Trasy</string>
     <string name="generic_yes">Áno</string>
+    <!-- Gps -->
     <string name="gps_location_access">Prístup k polohe</string>
     <string name="gps_disabled">GPS nie je povolené. Kliknite sem pre prechod na %1$s . Stlačte tlačidlo \"späť\" pre návrat.</string>
     <string name="gps_disabled_my_location">Nemožno určiť aktuálnu polohu. Povoľte ďalšie zdroje určenia polohy v časti %1$s a uistite sa, že vidíte na oblohu. Skúste to znova neskôr.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Spúšťa sa systém GPS</string>
     <string name="gps_wait_for_better_signal">Čaká sa na lepší signál systému GPS</string>
     <string name="gps_wait_for_signal">Čaká sa na signál systému GPS</string>
+    <!-- Image -->
     <string name="image_application">Aplikácia</string>
     <string name="image_arrow">Šípka</string>
     <string name="image_marker">Značka</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Zaznamenať</string>
     <string name="image_stop">Zastaviť</string>
     <string name="image_track">Trasa</string>
+    <!-- Import -->
     <string name="import_error">Z adresára %3$s bol importovaný nasledujúci počet súborov: %1$d z %2$s</string>
     <string name="import_no_directory">Adresár %1$s neexistuje</string>
     <string name="import_no_file">Neboli nájdené žiadne súbory na importovanie. Pripojte svoje zariadenie k počítaču a súbory určené na importovanie umiestnite do adresára %1$s.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">Všetky súbory vo formáte %1$s</string>
     <string name="import_selection_title">Importovať z externého úložiska</string>
     <string name="import_success">Z adresára %2$s bol importovaný nasledujúci počet súborov: %1$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Značku sa nepodarilo vložiť. Nie je k dispozícii signál GPS. Skúste to znova.</string>
     <string name="marker_add_success">Značka bola vložená</string>
     <string name="marker_add_canceled">Zrušené, nebola pridaná žiadna značka</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">Značka %1$d</string>
     <string name="marker_split_name_format">Rozdeliť %1$d</string>
     <string name="marker_title">%1$d z %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Od poslednej rozdeľovacej značky:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Typ značky (napr. vodopád…)</string>
     <string name="marker_edit_marker_type_hint">Typ značky</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Nemáte žiadne značky</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Súhrnné štatistiky</string>
     <string name="menu_delete">Odstrániť</string>
     <string name="menu_edit">Upraviť</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">Deaktivovať GPS</string>
     <string name="menu_view_photo">Zobraziť fotografiu</string>
     <string name="menu_voice_frequency">Hlasová frekvencia</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Služba na záznam</string>
+    <!-- Search -->
     <string name="search_global_description">Trasy a značky</string>
     <string name="search_list_empty_message">Vyhľadávaniu nezodpovedajú žiadne trasy ani značky</string>
     <string name="search_list_marker_track_location">Na trase „%1$s“.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Stav batérie</string>
     <string name="sensor_state_cadence">Kadencia</string>
     <string name="sensor_state_cadence_value">%1$d otáčok/min.</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Počas záznamu trasy nie je k dispozícii</string>
     <string name="settings_show">Zobraziť</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Rozšírené</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Podľa vzdialenosti</string>
     <string name="settings_chart_by_time">Podľa času</string>
     <string name="settings_chart_x_axis">Os X</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">Dátum (miestny)</string>
     <string name="settings_recording_track_name_number_option">Číslovanie</string>
     <string name="settings_recording_track_name_title">Predvolený názov trasy</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Obnoviť</string>
     <string name="settings_reset_confirm_message">Obnovia sa predvolené hodnoty všetkých nastavení.</string>
     <string name="settings_reset_confirm_title">Obnoviť?</string>
     <string name="settings_reset_done">Boli vrátené predvolené hodnoty všetkých nastavení</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Senzor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Senzor Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Zemepis. šírka/dĺžka</string>
     <string name="settings_stats_rate_title">Preferovaná hodnota</string>
     <string name="settings_stats_units_imperial">Imperiálne jednotky (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrické jednotky (km, m)</string>
     <string name="settings_stats_units_title">Preferované jednotky</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Zdieľať súbor trasy</string>
     <string name="share_track_share_file_body">Táto trasa by ťa mohla zaujímať.\n\nPre zobrazenie tejto trasy použi aplikáciu Google zem alebo iný mapový softvér.\n\n%1$s</string>
     <string name="share_track_subject">Chcem s vami zdieľať trasu</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Priem. tempo pohybu</string>
     <string name="stats_average_moving_speed">Priem. rýchlosť pohybu</string>
     <string name="stats_average_pace">Priem. tempo</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">Rýchlosť</string>
     <string name="stats_distance">Vzdialenosť</string>
     <string name="stats_total_time">Celkový čas</string>
+    <!-- Track -->
     <string name="track_name_format">Trasa %1$d</string>
     <string name="track_record_notification">Vaša trasa sa zaznamenáva…</string>
     <string name="track_markers">Značky pre %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Trasa a jej značky sa natrvalo odstránia zo zariadenia.</string>
     <string name="track_delete_one_confirm_title">Odstrániť trasu?</string>
     <string name="track_delete_multiple_confirm_message">Zvolené trasy a ich značky budú zo zariadenia natrvalo odstránené.</string>
     <string name="track_delete_progress_message">Prebieha odstraňovanie…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Graf</string>
     <string name="track_detail_stats_tab">Štatistiky</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Typ aktivity (napr. turistika)</string>
     <string name="track_edit_activity_type_hint">Typ aktivity</string>
     <string name="track_edit_new_track_title">Nová trasa</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Tu spustite zaznamenávanie ďalšieho dobrodružstva</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d trasy</string>
     <string name="tracks_many">%1$d trás</string>
     <string name="tracks_one">1 trasa</string>
     <string name="tracks_other">%1$d trás</string>
     <string name="tracks_two">2 trasy</string>
     <string name="tracks_zero">0 trás</string>
+    <!-- Unit -->
     <string name="unit_feet">st.</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">mi./h</string>
     <string name="unit_minute_per_kilometer">min./km</string>
     <string name="unit_minute_per_mile">min./mi.</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Prispôsobiť na presnosť</string>
     <string name="value_adapt_battery_life">Prispôsobiť na výdrž batérie</string>
     <string name="value_always">Vždy</string>
@@ -314,6 +363,7 @@
     <string name="value_off">Vypnúť</string>
     <string name="value_smallest">Najmenšie</string>
     <string name="value_smallest_recommended">Najmenšia (odporúčané)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d hodiny</string>
     <string name="voice_hours_many">%1$d hodín</string>
     <string name="voice_hours_one">1 hodina</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">celková vzdialenosť 2 míle</string>
     <string name="voice_total_distance_miles_zero">celková vzdialenosť 0 míľ</string>
     <string name="voice_total_distance_zero">Moje trasy – celková vzdialenosť nula.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">bankomat</string>
     <string name="waypoint_type_bank">banka</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index ce4cd02bf..a07add7a0 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">letalo</string>
     <string name="activity_type_atv">štirikolesniki</string>
     <string name="activity_type_biking">kolesarjenje</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">hoja</string>
     <string name="activity_type_water_skiing">smučanje na vodi</string>
     <string name="activity_type_wind_surfing">jadranje na deski</string>
+    <!-- Description -->
     <string name="description_activity_type">Vrsta dejavnosti: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Povprečni tempo gibanja: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Povprečna hitrost gibanja: %1$.2f km/h (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempo (min/mi)</string>
     <string name="description_pace_metric">Tempo (min/km)</string>
     <string name="description_recorded_time">Posneto: %1$s</string>
+    <string name="description_speed_ms">Hitrost (m/s)</string>
     <string name="description_sensor_cadence">Ritem (rpm)</string>
     <string name="description_sensor_heart_rate">Srčni utrip (bpm)</string>
     <string name="description_sensor_power">Moč (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Skupni čas: %1$s</string>
     <string name="description_track_point">Točka</string>
     <string name="description_track_segment">Odsek</string>
+    <!-- Export -->
     <string name="export_all_option">Vse kot %1$s</string>
     <string name="export_all_title">Izvozi v zunanji pomnilnik</string>
     <string name="export_error">Izvoženih %1$d od %2$s v %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Izvažanje v %1$s …</string>
     <string name="export_success">Izvoženih %1$s v %2$s</string>
     <string name="export_title">Izvozi v …</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">št. datotek: %1$d</string>
     <string name="files_many">št. datotek: %1$d</string>
     <string name="files_one">1 datoteka</string>
     <string name="files_other">%1$d datotek</string>
     <string name="files_two">2 datoteki</string>
     <string name="files_zero">0 datotek</string>
+    <!-- Generic -->
     <string name="generic_add">Dodaj</string>
     <string name="generic_cancel">Prekliči</string>
     <string name="generic_delete_all_confirm_title">Izbriši vse?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Uspešno</string>
     <string name="generic_tracks">Poti</string>
     <string name="generic_yes">Da</string>
+    <!-- Gps -->
     <string name="gps_location_access">»Dostop do lokacije«</string>
     <string name="gps_disabled">GPS ni omogočen. Tapnite tukaj, da odprete %1$s. Za vrnitev nazaj pritisnite gumb Nazaj.</string>
     <string name="gps_disabled_my_location">Trenutne lokacije ni mogoče določiti. V možnosti %1$s omogočite več virov lokacij in zagotovite,
@@ -139,6 +161,7 @@
     <string name="gps_starting">Zagon GPS-a</string>
     <string name="gps_wait_for_better_signal">Čakanje na boljši signal GPS</string>
     <string name="gps_wait_for_signal">Čakanje na signal GPS</string>
+    <!-- Image -->
     <string name="image_application">Aplikacija</string>
     <string name="image_arrow">Puščica</string>
     <string name="image_marker">Oznaka</string>
@@ -149,6 +172,7 @@
     <string name="image_record">Snemaj</string>
     <string name="image_stop">Ustavi</string>
     <string name="image_track">Pot</string>
+    <!-- Import -->
     <string name="import_error">Uvoženih %1$d od %2$s iz %3$s</string>
     <string name="import_no_directory">%1$s ne obstaja</string>
     <string name="import_no_file">Ni datotek za uvoz. Povežite napravo z računalnikom in postavite datoteke za uvoz v %1$s.</string>
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Vse %1$s</string>
     <string name="import_selection_title">Uvozi iz zunanjega pomnilnika</string>
     <string name="import_success">Uvoženih %1$s iz %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Oznake ni mogoče vstaviti. Ni signala GPS. Poskusite znova.</string>
     <string name="marker_add_success">Oznaka je bila vstavljena</string>
     <string name="marker_add_canceled">Preklicano, nobena oznaka ni bila dodana</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Oznaka %1$d</string>
     <string name="marker_split_name_format">Vmesni čas %1$d</string>
     <string name="marker_title">%1$d od %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Od zadnje oznake vmesnega časa:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Vrsta oznake (npr. slap)</string>
     <string name="marker_edit_marker_type_hint">Vrsta oznake</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Nimate nobene oznake</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Združeni statistični podatki</string>
     <string name="menu_delete">Izbriši</string>
     <string name="menu_edit">Uredi</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Ustavi GPS</string>
     <string name="menu_view_photo">Prikaži fotografijo</string>
     <string name="menu_voice_frequency">Pogostost glas. obv.</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Storitev snemanja</string>
+    <!-- Search -->
     <string name="search_global_description">Poti in oznake</string>
     <string name="search_list_empty_message">Nobena pot ali oznaka ne ustreza iskalni poizvedbi</string>
     <string name="search_list_marker_track_location">Na poti »%1$s«.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Raven napolnjenosti baterije</string>
     <string name="sensor_state_cadence">Ritem</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Ni na voljo med snemanjem poti</string>
     <string name="settings_show">Prikaži</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Dodatno</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Po razdalji</string>
     <string name="settings_chart_by_time">Po času</string>
     <string name="settings_chart_x_axis">Os X</string>
@@ -229,22 +263,28 @@
     <string name="settings_recording_track_name_date_local_option">Datum (lokalni)</string>
     <string name="settings_recording_track_name_number_option">Številka</string>
     <string name="settings_recording_track_name_title">Privzeto ime poti</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Ponastavi</string>
     <string name="settings_reset_confirm_message">Vse nastavitve bodo povrnjene na privzete vrednosti.</string>
     <string name="settings_reset_confirm_title">Ponastavi zdaj?</string>
     <string name="settings_reset_done">Vse nastavitve so bile povrnjene na privzete vrednosti</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Senzor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Senzor Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Zemlj. širina/dolžina</string>
     <string name="settings_stats_rate_title">Pred. enot. za hitr.</string>
     <string name="settings_stats_units_imperial">Imperialni sistem (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrični sistem (km, m)</string>
     <string name="settings_stats_units_title">Prednostne enote</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Datoteko poti dajte v skupno rabo</string>
     <string name="share_track_share_file_body">Zdi se mi, da bi te ta pot utegnila zanimati.\n\nPot si lahko ogledaš v storitvi Google Earth ali drugi
     programski opremi za zemljevide.\n\n%1$s</string>
     <string name="share_track_subject">V skupno rabo z vami želim dati progo</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Povprečni tempo gibanja</string>
     <string name="stats_average_moving_speed">Povprečna hitrost gibanja</string>
     <string name="stats_average_pace">Povprečni tempo</string>
@@ -263,25 +303,33 @@
     <string name="stats_speed">Hitrost</string>
     <string name="stats_distance">Razdalja</string>
     <string name="stats_total_time">Skupni čas</string>
+    <!-- Track -->
     <string name="track_name_format">Proga %1$d</string>
     <string name="track_record_notification">Snemanje vaše poti …</string>
     <string name="track_markers">Oznake %1$s</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Pot in njene oznake bodo trajno izbrisane iz naprave.</string>
     <string name="track_delete_one_confirm_title">Izbriši pot?</string>
     <string name="track_delete_multiple_confirm_message">Izbrane poti in njihove oznake bodo trajno izbrisane iz naprave.</string>
     <string name="track_delete_progress_message">Brisanje …</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Grafikon</string>
     <string name="track_detail_stats_tab">Statistika</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Vrsta dejavnosti (npr. pohodništvo)</string>
     <string name="track_edit_activity_type_hint">Vrsta dejavnosti</string>
     <string name="track_edit_new_track_title">Nova pot</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Tukaj začnite snemati svojo naslednjo pustolovščino</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">št. poti: %1$d</string>
     <string name="tracks_many">št. poti: %1$d</string>
     <string name="tracks_one">1 pot</string>
     <string name="tracks_other">%1$d poti</string>
     <string name="tracks_two">2 poti</string>
     <string name="tracks_zero">0 poti</string>
+    <!-- Unit -->
     <string name="unit_feet">čevljev</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -290,6 +338,7 @@
     <string name="unit_mile_per_hour">mi/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Prilagodi za natančnost</string>
     <string name="value_adapt_battery_life">Prilagodi za življenjsko dobo baterije</string>
     <string name="value_always">Vedno</string>
@@ -316,6 +365,7 @@
     <string name="value_off">Izklopi</string>
     <string name="value_smallest">Najmanjša</string>
     <string name="value_smallest_recommended">Najmanjše (priporočeno)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d ur</string>
     <string name="voice_hours_many">%1$d ur</string>
     <string name="voice_hours_one">1 ura</string>
@@ -362,6 +412,7 @@
     <string name="voice_total_distance_miles_two">skupna razdalja 2 milji</string>
     <string name="voice_total_distance_miles_zero">skupna razdalja 0 milj</string>
     <string name="voice_total_distance_zero">Skupna razdalja Mojih poti je nič.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">bankomat</string>
     <string name="waypoint_type_bank">banka</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index ccc1389dd..9e0acc3c1 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">авион</string>
     <string name="activity_type_atv">Возила за све терене</string>
     <string name="activity_type_biking">бициклизам</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">ходање</string>
     <string name="activity_type_water_skiing">скијање на води</string>
     <string name="activity_type_wind_surfing">једрење на дасци</string>
+    <!-- Description -->
     <string name="description_activity_type">Тип активности: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Просечни темпо кретања: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Просечна брзина кретања: %1$.2f км/ч (%2$.1f ми/ч)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Темпо (min/mi)</string>
     <string name="description_pace_metric">Темпо (min/km)</string>
     <string name="description_recorded_time">Забележено: %1$s</string>
+    <string name="description_speed_ms">Брзина (м/с)</string>
     <string name="description_sensor_cadence">Каденца (обртаја у минуту)</string>
     <string name="description_sensor_heart_rate">Пулс (откуцаја у минуту)</string>
     <string name="description_sensor_power">Снага (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Укупно време: %1$s</string>
     <string name="description_track_point">Тачка</string>
     <string name="description_track_segment">Сегмент</string>
+    <!-- Export -->
     <string name="export_all_option">Све као %1$s</string>
     <string name="export_all_title">Извоз у спољну меморију</string>
     <string name="export_error">Датотеке (%1$d од %2$s) су извезене у %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Извоз у %1$s…</string>
     <string name="export_success">Датотеке (%1$s) су извезене у %2$s</string>
     <string name="export_title">Извоз у…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d датотеке</string>
     <string name="files_many">%1$d датотека</string>
     <string name="files_one">1 датотека</string>
     <string name="files_other">%1$d датотека</string>
     <string name="files_two">2 датотеке</string>
     <string name="files_zero">0 датотека</string>
+    <!-- Generic -->
     <string name="generic_add">Додај</string>
     <string name="generic_cancel">Откажи</string>
     <string name="generic_delete_all_confirm_title">Желите да избришете све?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Успело je</string>
     <string name="generic_tracks">Праћења</string>
     <string name="generic_yes">Да</string>
+    <!-- Gps -->
     <string name="gps_location_access">„Приступ локацији“</string>
     <string name="gps_disabled">GPS није омогућен. Додирните овде да бисте отишли на %1$s. Притисните дугме за назад да бисте се вратили.</string>
     <string name="gps_disabled_my_location">Није могуће утврдити тренутну локацију. Омогућите још извора локације у %1$s и проверите да ли је небо видљиво. Покушајте поново касније.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">GPS се покреће</string>
     <string name="gps_wait_for_better_signal">Чека се бољи GPS сигнал</string>
     <string name="gps_wait_for_signal">Чека се GPS сигнал</string>
+    <!-- Image -->
     <string name="image_application">Апликација</string>
     <string name="image_arrow">Стрелица</string>
     <string name="image_marker">Означивач</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Снимите</string>
     <string name="image_stop">Зауставите</string>
     <string name="image_track">Праћење</string>
+    <!-- Import -->
     <string name="import_error">Датотеке (%1$d од %2$s) су увезене са %3$s</string>
     <string name="import_no_directory">%1$s не постоји</string>
     <string name="import_no_file">Нема датотека за увоз. Повежите уређај са рачунаром и ставите датотеке за увоз у %1$s.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">Све %1$s датотеке</string>
     <string name="import_selection_title">Увоз из спољне меморије</string>
     <string name="import_success">Датотеке (%1$s) су увезене са %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Није могуће уметнути означивач. Нема GPS сигнала. Покушајте поново.</string>
     <string name="marker_add_success">Означивач је уметнут</string>
     <string name="marker_add_canceled">Отказано је, није додат ниједан означивач</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">Означивач %1$d</string>
     <string name="marker_split_name_format">Подела %1$d</string>
     <string name="marker_title">%1$d. од %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Од последњег разделног означивача:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип означивача (нпр. водопад)</string>
     <string name="marker_edit_marker_type_hint">Тип означивача</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Немате ниједан означивач</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Обједињена статистика</string>
     <string name="menu_delete">Избриши</string>
     <string name="menu_edit">Измени</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">Заустави GPS</string>
     <string name="menu_view_photo">Прикажи слику</string>
     <string name="menu_voice_frequency">Учесталост гласа</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Услуга бележења</string>
+    <!-- Search -->
     <string name="search_global_description">Праћења и означивачи</string>
     <string name="search_list_empty_message">Ниједно праћење ни означивач не одговарају претрази</string>
     <string name="search_list_marker_track_location">У праћењу „%1$s“.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Ниво батерије</string>
     <string name="sensor_state_cadence">Каденца</string>
     <string name="sensor_state_cadence_value">%1$d обртаја у минуту</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Није доступно при снимању праћења</string>
     <string name="settings_show">Прикажи</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Напредно</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Према раздаљини</string>
     <string name="settings_chart_by_time">Према времену</string>
     <string name="settings_chart_x_axis">X оса</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">Датум (локални)</string>
     <string name="settings_recording_track_name_number_option">Број</string>
     <string name="settings_recording_track_name_title">Подразумевано име</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Ресетуј</string>
     <string name="settings_reset_confirm_message">Сва подешавања ће бити враћена на подразумеване вредности.</string>
     <string name="settings_reset_confirm_title">Желите да ресетујете?</string>
     <string name="settings_reset_done">Сва подешавања су враћена на подразумеване вредности</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Сензор</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth сензор</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Географска шир./дуж.</string>
     <string name="settings_stats_rate_title">Жељени темпо</string>
     <string name="settings_stats_units_imperial">Империјалне (ми, ст)</string>
     <string name="settings_stats_units_metric">Метричке (км, м)</string>
     <string name="settings_stats_units_title">Жељене јединице</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Дели датотеку праћења</string>
     <string name="share_track_share_file_body">Мислим да ће вас можда занимати ово праћење.\n\nДа бисте погледали ово праћење, користите Google Earth или други софтвер за мапирање.\n\n%1$s</string>
     <string name="share_track_subject">Желим да делим праћење са вама</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Прос. темпо кретања</string>
     <string name="stats_average_moving_speed">Прос. брзина кретања</string>
     <string name="stats_average_pace">Прос. темпо</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">Брзина</string>
     <string name="stats_distance">Раздаљина</string>
     <string name="stats_total_time">Укупно време</string>
+    <!-- Track -->
     <string name="track_name_format">Праћење %1$d</string>
     <string name="track_record_notification">Снимање праћења…</string>
     <string name="track_markers">%1$s – означивачи</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Праћење и његови означивачи ће бити трајно избрисани са уређаја.</string>
     <string name="track_delete_one_confirm_title">Желите да избришете праћење?</string>
     <string name="track_delete_multiple_confirm_message">Изабрана праћења и њихови означивачи ће бити трајно избрисани са уређаја.</string>
     <string name="track_delete_progress_message">Брисање…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Графикон</string>
     <string name="track_detail_stats_tab">Статистика</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Тип активности (нпр. пешачење)</string>
     <string name="track_edit_activity_type_hint">Тип активности</string>
     <string name="track_edit_new_track_title">Ново праћење</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Започните бележење следеће авантуре овде</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d праћења</string>
     <string name="tracks_many">%1$d праћења</string>
     <string name="tracks_one">1 праћење</string>
     <string name="tracks_other">%1$d праћења</string>
     <string name="tracks_two">2 праћења</string>
     <string name="tracks_zero">0 праћења</string>
+    <!-- Unit -->
     <string name="unit_feet">ст</string>
     <string name="unit_kilometer">км</string>
     <string name="unit_kilometer_per_hour">км/ч</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">ми/с</string>
     <string name="unit_minute_per_kilometer">мин/км</string>
     <string name="unit_minute_per_mile">мин/ми</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Прилагоди за прецизност</string>
     <string name="value_adapt_battery_life">Прилагоди трајању батерије</string>
     <string name="value_always">Увек</string>
@@ -314,6 +363,7 @@
     <string name="value_off">Искључено</string>
     <string name="value_smallest">Најмање</string>
     <string name="value_smallest_recommended">Најмање (препоручено)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d сата</string>
     <string name="voice_hours_many">%1$d сати</string>
     <string name="voice_hours_one">1 сат</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">укупна раздаљина 2 миље</string>
     <string name="voice_total_distance_miles_zero">укупна раздаљина 0 миља</string>
     <string name="voice_total_distance_zero">Укупна раздаљина у Мојим праћењима је једнака нули.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">банкомат</string>
     <string name="waypoint_type_bank">банка</string>
     <string name="waypoint_type_bar">бар</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 21796d397..e6729cd82 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">flygplan</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">cykling</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">gång</string>
     <string name="activity_type_water_skiing">vattenskidåkning</string>
     <string name="activity_type_wind_surfing">vindsurfning</string>
+    <!-- Description -->
     <string name="description_activity_type">Aktivitetstyp: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Genomsnittligt rörelsetempo: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Medelhastighet: %1$.2f km/tim (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempo (min/mi)</string>
     <string name="description_pace_metric">Tempo (min/km)</string>
     <string name="description_recorded_time">Tidtagning: %1$s</string>
+    <string name="description_speed_ms">Hastighet (m/s)</string>
     <string name="description_sensor_cadence">Rytm (rpm)</string>
     <string name="description_sensor_heart_rate">Puls (bpm)</string>
     <string name="description_sensor_power">Effekt (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Total tid: %1$s</string>
     <string name="description_track_point">Punkt</string>
     <string name="description_track_segment">Sträcka</string>
+    <!-- Export -->
     <string name="export_all_option">Alla som %1$s</string>
     <string name="export_all_title">Exportera till extern lagringsenhet</string>
     <string name="export_error">Exporterade %1$d av %2$s till %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Exporterar till %1$s …</string>
     <string name="export_success">Exporterade %1$s till %2$s</string>
     <string name="export_title">Exportera till …</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d filer</string>
     <string name="files_many">%1$d filer</string>
     <string name="files_one">1 fil</string>
     <string name="files_other">%1$d filer</string>
     <string name="files_two">2 filer</string>
     <string name="files_zero">0 filer</string>
+    <!-- Generic -->
     <string name="generic_add">Lägg till</string>
     <string name="generic_cancel">Avbryt</string>
     <string name="generic_delete_all_confirm_title">Ta bort alla?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Klart</string>
     <string name="generic_tracks">Spår</string>
     <string name="generic_yes">Ja</string>
+    <!-- Gps -->
     <string name="gps_location_access">Platsåtkomst</string>
     <string name="gps_disabled">GPS inte aktiverad. Tryck här för att gå till %1$s. Tryck på knappen Tillbaka för att återvända.</string>
     <string name="gps_disabled_my_location">Aktuell plats går inte att fastställa. Aktivera fler platskällor i %1$s och kontrollera att himlen är synlig. Försök igen senare.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Startar GPS</string>
     <string name="gps_wait_for_better_signal">Väntar på en bättre GPS-signal</string>
     <string name="gps_wait_for_signal">Väntar på GPS-signal</string>
+    <!-- Image -->
     <string name="image_application">App</string>
     <string name="image_arrow">Pil</string>
     <string name="image_marker">Markör</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Spela in</string>
     <string name="image_stop">Stopp</string>
     <string name="image_track">Spåra</string>
+    <!-- Import -->
     <string name="import_error">Importerade %1$d av %2$s från %3$s</string>
     <string name="import_no_directory">%1$s finns inte</string>
     <string name="import_no_file">Det fanns inga filer att importera. Anslut enheten till datorn och lägg filerna som ska importeras i %1$s.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">Alla %1$s</string>
     <string name="import_selection_title">Importera från extern lagringsenhet</string>
     <string name="import_success">Importerade %1$s från %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Det går inte att infoga en markör. Ingen GPS-signal. Försök igen.</string>
     <string name="marker_add_success">En markör infogades</string>
     <string name="marker_add_canceled">Avbruten, ingen markör tillagd</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">Markör %1$d</string>
     <string name="marker_split_name_format">Dela %1$d</string>
     <string name="marker_title">%1$d av %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Sedan förra delningsmarkören:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Markörtyp (t.ex. vattenfall)</string>
     <string name="marker_edit_marker_type_hint">Markörtyp</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Du har inga markörer</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Samlad statistik</string>
     <string name="menu_delete">Ta bort</string>
     <string name="menu_edit">Redigera</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">Stoppa GPS</string>
     <string name="menu_view_photo">Visa foto</string>
     <string name="menu_voice_frequency">Röstfrekvens</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Inspelningstjänst</string>
+    <!-- Search -->
     <string name="search_global_description">Spår och markörer</string>
     <string name="search_list_empty_message">Inga spår eller markörer matchade sökningen</string>
     <string name="search_list_marker_track_location">På spåret %1$s.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Batterinivå</string>
     <string name="sensor_state_cadence">Kadens</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Inte tillgängligt under inspelning av ett spår</string>
     <string name="settings_show">Visa</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Avancerat</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Efter avstånd</string>
     <string name="settings_chart_by_time">Efter tid</string>
     <string name="settings_chart_x_axis">X-axel</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">Datum (lokalt)</string>
     <string name="settings_recording_track_name_number_option">Siffra</string>
     <string name="settings_recording_track_name_title">Standardnamn</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Återställ</string>
     <string name="settings_reset_confirm_message">Alla inställningar återställs till standardvärdena.</string>
     <string name="settings_reset_confirm_title">Återställ nu?</string>
     <string name="settings_reset_done">Alla inställningar har återställts till standardvärdena</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth-sensor</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitud/longitud</string>
     <string name="settings_stats_rate_title">Föredragen mätning</string>
     <string name="settings_stats_units_imperial">Imperial (mi, ft)</string>
     <string name="settings_stats_units_metric">Metrisk (km, m)</string>
     <string name="settings_stats_units_title">Föredragna enheter</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Dela spårfil</string>
     <string name="share_track_share_file_body">Du kanske är intresserad av det här spåret.\n\nVisa spåret med Google Earth eller ett annat kartprogram.\n\n%1$s</string>
     <string name="share_track_subject">Jag vill dela ett spår med dig.</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Genomsnittstempo</string>
     <string name="stats_average_moving_speed">Medelhastighet</string>
     <string name="stats_average_pace">Genomsnittligt tempo</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">Hastighet</string>
     <string name="stats_distance">Avstånd</string>
     <string name="stats_total_time">Total tid</string>
+    <!-- Track -->
     <string name="track_name_format">Spår %1$d</string>
     <string name="track_record_notification">Spelar in ditt spår…</string>
     <string name="track_markers">%1$s markörer</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Spåret och dess markörer tas bort permanent från enheten.</string>
     <string name="track_delete_one_confirm_title">Ta bort spår?</string>
     <string name="track_delete_multiple_confirm_message">De valda spåren och deras markörer tas permanent bort från enheten.</string>
     <string name="track_delete_progress_message">Tar bort …</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Diagram</string>
     <string name="track_detail_stats_tab">Statistik</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Aktivitetstyp (t.ex. vandring)</string>
     <string name="track_edit_activity_type_hint">Aktivitetstyp</string>
     <string name="track_edit_new_track_title">Nytt spår</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Börja spela in ditt nästa äventyr här</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d spår</string>
     <string name="tracks_many">%1$d spår</string>
     <string name="tracks_one">1 spår</string>
     <string name="tracks_other">%1$d spår</string>
     <string name="tracks_two">2 spår</string>
     <string name="tracks_zero">0 spår</string>
+    <!-- Unit -->
     <string name="unit_feet">fot</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">mile/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mile</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Anpassa för noggrannhet</string>
     <string name="value_adapt_battery_life">Anpassa för batterilivslängd</string>
     <string name="value_always">Alltid</string>
@@ -314,6 +363,7 @@
     <string name="value_off">Av</string>
     <string name="value_smallest">Lägsta</string>
     <string name="value_smallest_recommended">Minsta (rekommenderas)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d timmar</string>
     <string name="voice_hours_many">%1$d timmar</string>
     <string name="voice_hours_one">1 timme</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">total sträcka 2 miles</string>
     <string name="voice_total_distance_miles_zero">totalt avstånd 0 miles</string>
     <string name="voice_total_distance_zero">Mina spår: totalt avstånd noll.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">bankomat</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 966455999..0d7b7080a 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">เครื่องบิน</string>
     <string name="activity_type_atv">รถ ATV</string>
     <string name="activity_type_biking">ขี่จักรยาน</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">เดิน</string>
     <string name="activity_type_water_skiing">สกีน้ำ</string>
     <string name="activity_type_wind_surfing">เล่นวินด์เซิร์ฟ</string>
+    <!-- Description -->
     <string name="description_activity_type">ประเภทกิจกรรม: %1$s</string>
     <string name="description_average_moving_pace_in_minute">ความเร็วก้าวเฉลี่ย: %1$s นาที/กม. (%2$s นาที/ไมล์)</string>
     <string name="description_average_moving_speed">ความเร็วการเคลื่อนที่เฉลี่ย: %1$.2f กม./ชม. (%2$.1f ไมล์/ชม.)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">อัตราก้าว (นาที/ไมล์)</string>
     <string name="description_pace_metric">อัตราก้าว (นาที/กม.)</string>
     <string name="description_recorded_time">เวลาบันทึก: %1$s</string>
+    <string name="description_speed_ms">ความเร็ว (ม./วินาที)</string>
     <string name="description_sensor_cadence">จังหวะ (รอบต่อนาที)</string>
     <string name="description_sensor_heart_rate">อัตราการเต้นหัวใจ (ครั้งต่อนาที)</string>
     <string name="description_sensor_power">กำลัง (วัตต์)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">เวลาทั้งหมด: %1$s</string>
     <string name="description_track_point">จุด</string>
     <string name="description_track_segment">ส่วน</string>
+    <!-- Export -->
     <string name="export_all_option">ทั้งหมดเป็น %1$s</string>
     <string name="export_all_title">ส่งออกไปยังที่จัดเก็บข้อมูลภายนอก</string>
     <string name="export_error">ส่งออกแล้ว %1$d จาก %2$s ไปยัง %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">ส่งออกลงใน %1$s…</string>
     <string name="export_success">ส่งออก %1$s ไปยัง %2$s แล้ว</string>
     <string name="export_title">ส่งออกลงใน…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d ไฟล์</string>
     <string name="files_many">%1$d ไฟล์</string>
     <string name="files_one">1 ไฟล์</string>
     <string name="files_other">%1$d ไฟล์</string>
     <string name="files_two">2 ไฟล์</string>
     <string name="files_zero">0 ไฟล์</string>
+    <!-- Generic -->
     <string name="generic_add">เพิ่ม</string>
     <string name="generic_cancel">ยกเลิก</string>
     <string name="generic_delete_all_confirm_title">ลบทั้งหมดใช่ไหม</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">สำเร็จ</string>
     <string name="generic_tracks">เส้นการเดินทาง</string>
     <string name="generic_yes">ใช่</string>
+    <!-- Gps -->
     <string name="gps_location_access">การเข้าถึงข้อมูลตำแหน่ง</string>
     <string name="gps_disabled">ไม่ได้เปิดใช้งาน GPS กดที่นี่เพื่อไปที่ %1$s โปรดกดปุ่มย้อนกลับเพื่อกลับไป</string>
     <string name="gps_disabled_my_location">ไม่สามารถกำหนดตำแหน่งปัจจุบันได้ เปิดใช้งานแหล่งข้อมูลตำแหน่งเพิ่มเติมที่ %1$s และตรวจดูให้แน่ใจว่าสามารถมองเห็นท้องฟ้าได้ แล้วลองอีกครั้งในภายหลัง</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">กำลังเริ่ม GPS</string>
     <string name="gps_wait_for_better_signal">กำลังรอสัญญาณ GPS ที่ดีกว่านี้</string>
     <string name="gps_wait_for_signal">กำลังรอสัญญาณ GPS</string>
+    <!-- Image -->
     <string name="image_application">แอปพลิเคชัน</string>
     <string name="image_arrow">ลูกศร</string>
     <string name="image_marker">เครื่องหมาย</string>
@@ -148,6 +171,7 @@
     <string name="image_record">บันทึก</string>
     <string name="image_stop">หยุด</string>
     <string name="image_track">เส้นการเดินทาง</string>
+    <!-- Import -->
     <string name="import_error">นำเข้าแล้ว %1$d จากทั้งหมด %2$s จาก %3$s</string>
     <string name="import_no_directory">ไม่มี %1$s</string>
     <string name="import_no_file">ไม่มีไฟล์ให้นำเข้า โปรดเชื่อมต่ออุปกรณ์เข้ากับคอมพิวเตอร์ และวางไฟล์ที่จะนำเข้าลงใน %1$s</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">ทั้งหมด %1$s</string>
     <string name="import_selection_title">นำเข้าจากที่จัดเก็บข้อมูลภายนอก</string>
     <string name="import_success">นำเข้าแล้ว %1$s จาก %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">ไม่สามารถใส่เครื่องหมายได้ เนื่องจากไม่มีสัญญาณ GPS โปรดลองอีกครั้ง</string>
     <string name="marker_add_success">ใส่เครื่องหมายแล้ว</string>
     <string name="marker_add_canceled">ยกเลิกแล้ว ไม่มีการเพิ่มเครื่องหมาย</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">เครื่องหมาย %1$d</string>
     <string name="marker_split_name_format">แยก %1$d</string>
     <string name="marker_title">%1$d จาก %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">ตั้งแต่เครื่องหมายแยกล่าสุด:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">ประเภทเครื่องหมาย (เช่น น้ำตก)</string>
     <string name="marker_edit_marker_type_hint">ประเภทเครื่องหมาย</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">คุณไม่มีเครื่องหมายเลย</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">สถิติที่รวบรวม</string>
     <string name="menu_delete">ลบ</string>
     <string name="menu_edit">แก้ไข</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">หยุด GPS</string>
     <string name="menu_view_photo">ดูรูปภาพ</string>
     <string name="menu_voice_frequency">ความถี่เสียง</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">บริการการบันทึก</string>
+    <!-- Search -->
     <string name="search_global_description">เส้นการเดินทางและเครื่องหมาย</string>
     <string name="search_list_empty_message">ไม่มีเส้นการเดินทางหรือเครื่องหมายที่ตรงกับการค้นหาของคุณ</string>
     <string name="search_list_marker_track_location">ในเส้นการเดินทาง \"%1$s\"</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">ระดับแบตเตอรี่</string>
     <string name="sensor_state_cadence">รอบขา</string>
     <string name="sensor_state_cadence_value">%1$d รอบต่อนาที</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d วัตต์</string>
     <string name="settings_not_while_recording">ไม่สามารถใช้งานได้ในขณะบันทึกเส้นการเดินทาง</string>
     <string name="settings_show">แสดง</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">ขั้นสูง</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">ตามระยะทาง</string>
     <string name="settings_chart_by_time">ตามเวลา</string>
     <string name="settings_chart_x_axis">แกน X</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">วันที่ (ท้องถิ่น)</string>
     <string name="settings_recording_track_name_number_option">หมายเลข</string>
     <string name="settings_recording_track_name_title">ชื่อเส้นการเดินทางเริ่มต้น</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">รีเซ็ต</string>
     <string name="settings_reset_confirm_message">การตั้งค่าทั้งหมดจะกลับไปเป็นค่าเริ่มต้น </string>
     <string name="settings_reset_confirm_title">รีเซ็ตเลยไหม</string>
     <string name="settings_reset_done">การตั้งค่าทั้งหมดถูกเปลี่ยนกลับไปเป็นค่าเริ่มต้นแล้ว</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">เซ็นเซอร์</string>
     <string name="settings_sensor_bluetooth">บลูทูธ</string>
     <string name="settings_sensor_bluetooth_sensor">เซ็นเซอร์บลูทูธ</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">ละติจูด/ลองจิจูด</string>
     <string name="settings_stats_rate_title">อัตราที่ต้องการ</string>
     <string name="settings_stats_units_imperial">หน่วยอังกฤษ (ไมล์, ฟุต)</string>
     <string name="settings_stats_units_metric">หน่วยเมตริก (กม., เมตร)</string>
     <string name="settings_stats_units_title">หน่วยที่ต้องการ</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">แบ่งปันไฟล์เส้นการเดินทาง</string>
     <string name="share_track_share_file_body">ฉันคิดว่าคุณอาจจะสนใจในเส้นการเดินทางนี้\n\nเมื่อต้องการดูเส้นการเดินทางนี้ ให้ใช้ Google Earth หรือซอฟแวร์แผนที่อื่นๆ\n\n%1$s</string>
     <string name="share_track_subject">ฉันต้องการแบ่งปันเส้นทางกับคุณ</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">การก้าวโดยเฉลี่ย</string>
     <string name="stats_average_moving_speed">ความเร็วในการเคลื่อนที่เฉลี่ย</string>
     <string name="stats_average_pace">ก้าวเฉลี่ย</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">ความเร็ว</string>
     <string name="stats_distance">ระยะทาง</string>
     <string name="stats_total_time">เวลารวม</string>
+    <!-- Track -->
     <string name="track_name_format">เส้นทาง %1$d</string>
     <string name="track_record_notification">กำลังบันทึกเส้นการเดินทางของคุณ…</string>
     <string name="track_markers">%1$s เครื่องหมาย</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">ส้นการเดินทางและเครื่องหมายจะถูกลบออกจากอุปกรณ์อย่างถาวร</string>
     <string name="track_delete_one_confirm_title">ลบเส้นการเดินทางนี้ไหม</string>
     <string name="track_delete_multiple_confirm_message">ส้นการเดินทางและเครื่องหมายที่เลือกจะถูกลบออกจากอุปกรณ์อย่างถาวร</string>
     <string name="track_delete_progress_message">กำลังลบ…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">แผนภูมิ</string>
     <string name="track_detail_stats_tab">สถิติ</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">ประเภทกิจกรรม (เช่น เดินป่า)</string>
     <string name="track_edit_activity_type_hint">ประเภทกิจกรรม</string>
     <string name="track_edit_new_track_title">เส้นการเดินทางใหม่</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">เริ่มบันทึกผจญภัยต่อไปของคุณที่นี่</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d เส้นการเดินทาง</string>
     <string name="tracks_many">%1$d เส้นการเดินทาง</string>
     <string name="tracks_one">1 เส้นการเดินทาง</string>
     <string name="tracks_other">%1$d เส้นการเดินทาง</string>
     <string name="tracks_two">2 เส้นการเดินทาง</string>
     <string name="tracks_zero">0 เส้นการเดินทาง</string>
+    <!-- Unit -->
     <string name="unit_feet">ฟุต</string>
     <string name="unit_kilometer">กม.</string>
     <string name="unit_kilometer_per_hour">กม./ชม.</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">ไมล์/ชม.</string>
     <string name="unit_minute_per_kilometer">นาที/กม.</string>
     <string name="unit_minute_per_mile">นาที/ไมล์</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">ปรับความแม่นยำ</string>
     <string name="value_adapt_battery_life">ปรับเพื่อแบตเตอรี่</string>
     <string name="value_always">เปิดใช้งานเสมอ</string>
@@ -314,6 +363,7 @@
     <string name="value_off">ปิด</string>
     <string name="value_smallest">น้อยที่สุด</string>
     <string name="value_smallest_recommended">น้อยที่สุด (แนะนำ)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d ชั่วโมง</string>
     <string name="voice_hours_many">%1$d ชั่วโมง</string>
     <string name="voice_hours_one">1 ชั่วโมง</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">รวมระยะทาง 2 ไมล์</string>
     <string name="voice_total_distance_miles_zero">รวมระยะทาง 0 ไมล์</string>
     <string name="voice_total_distance_zero">ระยะเส้นการเดินทางทั้งหมดของฉันเป็นศูนย์</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">เอทีเอ็ม</string>
     <string name="waypoint_type_bank">ธนาคาร</string>
     <string name="waypoint_type_bar">บาร์</string>
diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml
index 79a7ac1c4..2f32192d2 100644
--- a/src/main/res/values-tl/strings.xml
+++ b/src/main/res/values-tl/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">eroplano</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">pagbibisikleta</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">naglalakad</string>
     <string name="activity_type_water_skiing">water skiing</string>
     <string name="activity_type_wind_surfing">wind surfing</string>
+    <!-- Description -->
     <string name="description_activity_type">Uri ng aktibidad: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Average na bilis ng paglipat: %1$s min/km (%2$s min/mi)</string>
     <string name="description_average_moving_speed">Average na bilis ng paglipat: %1$.2f km/h (%2$.1f mi/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Bilis (min/mi)</string>
     <string name="description_pace_metric">Bilis (min/km)</string>
     <string name="description_recorded_time">Naitala: %1$s</string>
+    <string name="description_speed_ms">Bilis (m/s)</string>
     <string name="description_sensor_cadence">Cadence (rpm)</string>
     <string name="description_sensor_heart_rate">Heart rate (bpm)</string>
     <string name="description_sensor_power">Power (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Kabuuang oras: %1$s</string>
     <string name="description_track_point">Punto</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Lahat bilang %1$s</string>
     <string name="export_all_title">I-export sa external storage</string>
     <string name="export_error">In-export ang %1$d ng %2$s patungo sa %3$s.</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Ine-export sa %1$s…</string>
     <string name="export_success">In-export ang %1$s patungo sa %2$s</string>
     <string name="export_title">I-export sa…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d (na) file</string>
     <string name="files_many">%1$d (na) file</string>
     <string name="files_one">1 file</string>
     <string name="files_other">%1$d (na) file</string>
     <string name="files_two">2 file</string>
     <string name="files_zero">0 file</string>
+    <!-- Generic -->
     <string name="generic_add">Idagdag</string>
     <string name="generic_cancel">Kanselahin</string>
     <string name="generic_delete_all_confirm_title">Tanggalin lahat?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Tagumpay</string>
     <string name="generic_tracks">Mga Track</string>
     <string name="generic_yes">Oo</string>
+    <!-- Gps -->
     <string name="gps_location_access">\'Access sa lokasyon\'</string>
     <string name="gps_disabled">Hindi pinagagana ang GPS. I-tap dito upang pumunta sa %1$s . Pindutin ang back button upang bumalik.</string>
     <string name="gps_disabled_my_location">Hindi matukoy ang kasalukuyang lokasyon. I-enable ang mas maraming mapagkukunan ng lokasyon sa %1$s at tiyaking nakikita ang kalangitan. Subukang muli mamaya.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Sinisimulan ang GPS</string>
     <string name="gps_wait_for_better_signal">Naghihintay para sa isang mas mahusay na signal ng GPS</string>
     <string name="gps_wait_for_signal">Naghihintay para sa signal ng GPS</string>
+    <!-- Image -->
     <string name="image_application">Application</string>
     <string name="image_arrow">Arrow</string>
     <string name="image_marker">Marker</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Mag-record</string>
     <string name="image_stop">Huminto</string>
     <string name="image_track">Track</string>
+    <!-- Import -->
     <string name="import_error">In-import ang %1$d ng %2$s mula sa %3$s</string>
     <string name="import_no_directory">Hindi umiiral ang %1$s</string>
     <string name="import_no_file">Walang mga file na ii-import. Ikonekta ang iyong device sa iyong computer at ilagay ang mga ii-import na file sa %1$s.</string>
@@ -156,6 +180,7 @@
     <string name="import_selection_option">Lahat ng %1$ss</string>
     <string name="import_selection_title">Mag-import mula sa panlabas na storage</string>
     <string name="import_success">In-import ang %1$s mula sa %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Hindi makapaglagay ng marker. Walang signal ng GPS. Subukang muli.</string>
     <string name="marker_add_success">Ipinasok ang isang marker</string>
     <string name="marker_add_canceled">Kinansela, walang idinagdag na marker</string>
@@ -168,10 +193,14 @@
     <string name="marker_name_format">Marker %1$d</string>
     <string name="marker_split_name_format">Paghahati %1$d</string>
     <string name="marker_title">%1$d ng %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Mula sa huling split marker:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Uri ng marker (hal.talon)</string>
     <string name="marker_edit_marker_type_hint">Uri ng marker</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Wala kang anumang mga marker</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Pinagsamang stats</string>
     <string name="menu_delete">Tanggalin</string>
     <string name="menu_edit">I-edit</string>
@@ -192,11 +221,14 @@
     <string name="menu_stop_gps">Itigil ang GPS</string>
     <string name="menu_view_photo">Tingnan ang larawan</string>
     <string name="menu_voice_frequency">Dalas ng voice</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Serbisyo ng pagrerekord</string>
+    <!-- Search -->
     <string name="search_global_description">Mga track at marker</string>
     <string name="search_list_empty_message">Walang mga track o marker na tumugma sa iyong paghahanap</string>
     <string name="search_list_marker_track_location">Sa track na \'%1$s\'.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Antas ng baterya</string>
     <string name="sensor_state_cadence">Cadence</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -207,7 +239,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Hindi available habang inire-rekord ang isang track.</string>
     <string name="settings_show">Ipakita</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Advanced</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Ayon sa distansya</string>
     <string name="settings_chart_by_time">Ayon sa oras</string>
     <string name="settings_chart_x_axis">X axis</string>
@@ -228,21 +262,27 @@
     <string name="settings_recording_track_name_date_local_option">Petsa (lokal)</string>
     <string name="settings_recording_track_name_number_option">Numero</string>
     <string name="settings_recording_track_name_title">Default na pangalan ng track</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">I-reset</string>
     <string name="settings_reset_confirm_message">Ibabalik sa dati ang lahat ng mga setting sa mga default na value.</string>
     <string name="settings_reset_confirm_title">I-reset ngayon?</string>
     <string name="settings_reset_done">Ibinalik ang lahat ng setting sa mga default na value</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensor</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth sensor</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitude/Longtitude</string>
     <string name="settings_stats_rate_title">Gustong rate</string>
     <string name="settings_stats_units_imperial">Imperial (mi, ft)</string>
     <string name="settings_stats_units_metric">Metric (km, m)</string>
     <string name="settings_stats_units_title">Gustong mga unit</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Ibahagi ang track file</string>
     <string name="share_track_share_file_body">Tingin ko maaari kang maging interesado sa track na ito. \n\nUpang tingnan ang track na ito, gamitin ang Google Earth o iba pang software ng pagmamapa. \n\n%1$s</string>
     <string name="share_track_subject">Gusto kong magbahagi ng track sa iyo</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Avg na nakatakdang bilis ng pagkilos</string>
     <string name="stats_average_moving_speed">Avg na nakatakdang bilis ng pagkilos</string>
     <string name="stats_average_pace">Avg na nakatakdang bilis</string>
@@ -261,25 +301,33 @@
     <string name="stats_speed">Bilis</string>
     <string name="stats_distance">Layo</string>
     <string name="stats_total_time">Kabuuang oras</string>
+    <!-- Track -->
     <string name="track_name_format">Track bilang %1$d</string>
     <string name="track_record_notification">Nire-rekord ang iyong track…</string>
     <string name="track_markers">%1$s Mga Marker</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Ang track at ang mga marker nito ay permanenteng tatanggalin mula sa device.</string>
     <string name="track_delete_one_confirm_title">Tanggalin ang track?</string>
     <string name="track_delete_multiple_confirm_message">Ang mga napiling track at mga marker nito ay permanenteng matatanggal mula sa device.</string>
     <string name="track_delete_progress_message">Tinatanggal…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Chart</string>
     <string name="track_detail_stats_tab">Mga Istatistika</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Uri ng gawain (hal. hiking)</string>
     <string name="track_edit_activity_type_hint">Uri ng gawain</string>
     <string name="track_edit_new_track_title">Bagong Track</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Simulan ang pag-record ng iyong susunod na pakikipagsapalaran dito</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d (na) track</string>
     <string name="tracks_many">%1$d (na) track</string>
     <string name="tracks_one">1 track</string>
     <string name="tracks_other">%1$d (na) track</string>
     <string name="tracks_two">2 mga track</string>
     <string name="tracks_zero">0 track</string>
+    <!-- Unit -->
     <string name="unit_feet">ft</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -288,6 +336,7 @@
     <string name="unit_mile_per_hour">mi/h</string>
     <string name="unit_minute_per_kilometer">min/km</string>
     <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Iangkop para sa katumpakan</string>
     <string name="value_adapt_battery_life">Iangkop para sa antas ng baterya</string>
     <string name="value_always">Palagi</string>
@@ -314,6 +363,7 @@
     <string name="value_off">I-off</string>
     <string name="value_smallest">Pinakamaliit</string>
     <string name="value_smallest_recommended">Pinakamaliit (inirerekomenda)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d (na) oras</string>
     <string name="voice_hours_many">%1$d (na) oras</string>
     <string name="voice_hours_one">1 oras</string>
@@ -360,6 +410,7 @@
     <string name="voice_total_distance_miles_two">kabuuang distansya 2 milya</string>
     <string name="voice_total_distance_miles_zero">kabuuang distansya 0 milya</string>
     <string name="voice_total_distance_zero">Kabuuang distansya ng Aking Mga Track ay zero.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">bangko</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index f6ec74c12..709b154dc 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">uçak</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">bisiklet</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">yürüyüş</string>
     <string name="activity_type_water_skiing">su kayağı</string>
     <string name="activity_type_wind_surfing">rüzgâr sörfü</string>
+    <!-- Description -->
     <string name="description_activity_type">Etkinlik türü: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Ortalama tempo (hareket halinde): %1$s dk/km (%2$s dk/mil)</string>
     <string name="description_average_moving_speed">Ortalama hareket hızı: %1$.2f km/sa (%2$.1f mil/sa)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Tempo (dk/mil)</string>
     <string name="description_pace_metric">Tempo (dk/km)</string>
     <string name="description_recorded_time">Kayıt zamanı: %1$s</string>
+    <string name="description_speed_ms">Hız (m/sn)</string>
     <string name="description_sensor_cadence">Kadans (rpm)</string>
     <string name="description_sensor_heart_rate">Kalp atış hızı (bmp)</string>
     <string name="description_sensor_power">Güç (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Toplam süre: %1$s</string>
     <string name="description_track_point">Nokta</string>
     <string name="description_track_segment">Segment</string>
+    <!-- Export -->
     <string name="export_all_option">Tümünü %1$s biçiminde</string>
     <string name="export_all_title">Harici depolama ortamına aktar</string>
     <string name="export_error">%1$d/%2$s %3$s hedefine dışa aktarıldı</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">%1$s dizinine aktarılıyor…</string>
     <string name="export_success">%1$s %2$s hedefine dışa aktarıldı</string>
     <string name="export_title">Şuraya aktar…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d dosya</string>
     <string name="files_many">%1$d dosya</string>
     <string name="files_one">1 dosya</string>
     <string name="files_other">%1$d dosya</string>
     <string name="files_two">2 dosya</string>
     <string name="files_zero">0 dosya</string>
+    <!-- Generic -->
     <string name="generic_add">Ekle</string>
     <string name="generic_cancel">İptal</string>
     <string name="generic_delete_all_confirm_title">Tümü silinsin mi?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Başarılı</string>
     <string name="generic_tracks">Parkurlar</string>
     <string name="generic_yes">Evet</string>
+    <!-- Gps -->
     <string name="gps_location_access">\"Konum erişimi\"</string>
     <string name="gps_disabled">GPS etkin değil. %1$s bölümüne gitmek için buraya hafifçe vurun. Geri dönmek için geri düğmesine basın.</string>
     <string name="gps_disabled_my_location">Geçerli konum belirlenemiyor. Daha fazla konum kaynağını etkinleştirmek için %1$s bölümüne gidin ve gökyüzünün görünür olduğundan emin olun. Daha sonra tekrar deneyin.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">GPS başlatılıyor</string>
     <string name="gps_wait_for_better_signal">Daha iyi bir GPS sinyali bekleniyor</string>
     <string name="gps_wait_for_signal">GPS sinyali bekleniyor</string>
+    <!-- Image -->
     <string name="image_application">Uygulama</string>
     <string name="image_arrow">Ok</string>
     <string name="image_marker">İşaretçi</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Kaydet</string>
     <string name="image_stop">Durdur</string>
     <string name="image_track">Parkur</string>
+    <!-- Import -->
     <string name="import_error">%1$d/%2$s %3$s kaynağından içe aktarıldı</string>
     <string name="import_no_directory">%1$s mevcut değil</string>
     <string name="import_no_file">İçe aktarılacak dosya bulunamadı. Cihazınızı bilgisayarınıza bağlayın ve içe aktaracağınız
@@ -157,6 +181,7 @@
     <string name="import_selection_option">%1$s biçimindeki tüm dosyalar</string>
     <string name="import_selection_title">Harici depolama ortamından aktar</string>
     <string name="import_success">%1$s %2$s kaynağından içe aktarıldı</string>
+    <!-- Marker -->
     <string name="marker_add_error">İşaretçi eklenemiyor. GPS sinyali yok. Tekrar deneyin.</string>
     <string name="marker_add_success">Bir işaretçi eklendi</string>
     <string name="marker_add_canceled">İptal edildi, işaretçi eklenmedi</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">İşaretçi %1$d</string>
     <string name="marker_split_name_format">Bölüm %1$d</string>
     <string name="marker_title">%1$d/%2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Son bölüm işaretçisinden beri:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">İşaretçi türü (ör. şelale)</string>
     <string name="marker_edit_marker_type_hint">İşaretçi türü</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Hiç işaretçiniz yok</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Toplu istatistikler</string>
     <string name="menu_delete">Sil</string>
     <string name="menu_edit">Düzenle</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">GPS\'i kapat</string>
     <string name="menu_view_photo">Fotoğraf görüntüle</string>
     <string name="menu_voice_frequency">Ses sıklığı</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Kayıt hizmeti</string>
+    <!-- Search -->
     <string name="search_global_description">Parkurlar ve işaretçiler</string>
     <string name="search_list_empty_message">Aramanızla eşleşen parkur veya işaretçi yok</string>
     <string name="search_list_marker_track_location">\"%1$s\" parkurunda.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Pil seviyesi</string>
     <string name="sensor_state_cadence">Ritim</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Parkur kaydı sırasında kullanılamaz</string>
     <string name="settings_show">Göster</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Gelişmiş</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Mesafeye göre</string>
     <string name="settings_chart_by_time">Zamana göre</string>
     <string name="settings_chart_x_axis">X ekseni</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">Tarih (yerel)</string>
     <string name="settings_recording_track_name_number_option">Sayı</string>
     <string name="settings_recording_track_name_title">Varsayılan parkur adı</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Sıfırla</string>
     <string name="settings_reset_confirm_message">Tüm ayarlar varsayılan değerlerine geri alınacak.</string>
     <string name="settings_reset_confirm_title">Şimdi sıfırlansın mı?</string>
     <string name="settings_reset_done">Tüm ayarlar varsayılan değerlere döndürüldü</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Sensör</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Bluetooth sensörü</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Enlem/Boylam</string>
     <string name="settings_stats_rate_title">Tercih edilen oran</string>
     <string name="settings_stats_units_imperial">İngiliz (mil, fit)</string>
     <string name="settings_stats_units_metric">Metrik (km, m)</string>
     <string name="settings_stats_units_title">Not sure.</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Parkur dosyasını paylaş</string>
     <string name="share_track_share_file_body">Bu parkurun ilgini çekebileceğini düşünüyorum.\n\nBu parkuru görüntülemek için Google Earth\'ü veya başka bir harita yazılımını kullanabilirsin.\n\n%1$s</string>
     <string name="share_track_subject">Seninle bir parkur paylaşmak istiyorum</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Ort. hareket temposu</string>
     <string name="stats_average_moving_speed">Ort. hareket hızı</string>
     <string name="stats_average_pace">Ort. tempo</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Hız</string>
     <string name="stats_distance">Mesafe</string>
     <string name="stats_total_time">Toplam süre</string>
+    <!-- Track -->
     <string name="track_name_format">Parkur %1$d</string>
     <string name="track_record_notification">Parkurunuz kaydediliyor…</string>
     <string name="track_markers">%1$s İşaretçileri</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Parkur ve işaretçileri cihazdan kalıcı olarak silinecek.</string>
     <string name="track_delete_one_confirm_title">Parkur silinsin mi?</string>
     <string name="track_delete_multiple_confirm_message">Seçilen parkurlar ve işaretçileri cihazdan kalıcı olarak silinecek.</string>
     <string name="track_delete_progress_message">Siliniyor…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Grafik</string>
     <string name="track_detail_stats_tab">İstatistikler</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Aktivite türü (ör. yürüyüş)</string>
     <string name="track_edit_activity_type_hint">Aktivite türü</string>
     <string name="track_edit_new_track_title">Yeni Parkur</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Bir sonraki maceranızı kaydetmeye buradan başlayın</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d parkur</string>
     <string name="tracks_many">%1$d parkur</string>
     <string name="tracks_one">1 parkur</string>
     <string name="tracks_other">%1$d parkur</string>
     <string name="tracks_two">2 parkur</string>
     <string name="tracks_zero">0 parkur</string>
+    <!-- Unit -->
     <string name="unit_feet">ft</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/sa.</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">mil/sa.</string>
     <string name="unit_minute_per_kilometer">dk./km</string>
     <string name="unit_minute_per_mile">dk./mil</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Doğruluk için uyarla</string>
     <string name="value_adapt_battery_life">Pil ömrü için uyarla</string>
     <string name="value_always">Her zaman</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Kapalı</string>
     <string name="value_smallest">En küçük</string>
     <string name="value_smallest_recommended">En küçük (önerilir)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d saat</string>
     <string name="voice_hours_many">%1$d saat</string>
     <string name="voice_hours_one">1 saat</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">toplam mesafe 2 mil</string>
     <string name="voice_total_distance_miles_zero">toplam mesafe 0 mil</string>
     <string name="voice_total_distance_zero">OpenTracks toplam mesafe sıfır.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">banka</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 7d6843a39..c5d7b53b2 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">літак</string>
     <string name="activity_type_atv">Мотовсюдиходи</string>
     <string name="activity_type_biking">велосипедний спорт</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">ходьба</string>
     <string name="activity_type_water_skiing">водні лижі</string>
     <string name="activity_type_wind_surfing">віндсерфінг</string>
+    <!-- Description -->
     <string name="description_activity_type">Вид активного відпочинку: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Середній темп: %1$s хв/км (%2$s хв/мл)</string>
     <string name="description_average_moving_speed">Середня швидкість: %1$.2f км/год (%2$.1f мл/год)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Темп (хв/мл)</string>
     <string name="description_pace_metric">Темп (хв/км)</string>
     <string name="description_recorded_time">Записано: %1$s</string>
+    <string name="description_speed_ms">Швидкість (м/с)</string>
     <string name="description_sensor_cadence">Темп (об/хв)</string>
     <string name="description_sensor_heart_rate">Пульс (уд/хв)</string>
     <string name="description_sensor_power">Потужність (Вт)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Загальний час: %1$s</string>
     <string name="description_track_point">Точка</string>
     <string name="description_track_segment">Відрізок</string>
+    <!-- Export -->
     <string name="export_all_option">Усе як %1$s</string>
     <string name="export_all_title">Експортувати в зовнішню пам’ять</string>
     <string name="export_error">Файли експортовано в папку %3$s: %1$d з %2$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Триває експорт у %1$s…</string>
     <string name="export_success">Експортовано в папку %2$s: %1$s</string>
     <string name="export_title">Експорт у…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d файли</string>
     <string name="files_many">%1$d файлів</string>
     <string name="files_one">1 файл</string>
     <string name="files_other">%1$d файлу</string>
     <string name="files_two">2 файли</string>
     <string name="files_zero">0 файлів</string>
+    <!-- Generic -->
     <string name="generic_add">Додати</string>
     <string name="generic_cancel">Скасувати</string>
     <string name="generic_delete_all_confirm_title">Видалити все?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Виконано</string>
     <string name="generic_tracks">Шляхи</string>
     <string name="generic_yes">Так</string>
+    <!-- Gps -->
     <string name="gps_location_access">\"Доступ до місцезнаходження\"</string>
     <string name="gps_disabled">GPS вимкнено. Натисніть тут, щоб перейти до меню %1$s. Щоб повернутися, натисніть кнопку \"Назад\".</string>
     <string name="gps_disabled_my_location">Неможливо визначити поточне місцезнаходження. Запустіть кілька джерел визначення місцезнаходження в меню %1$s і переконайтеся, що видно небо. Після цього повторіть спробу.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Запуск GPS…</string>
     <string name="gps_wait_for_better_signal">Очікується кращий GPS-сигнал…</string>
     <string name="gps_wait_for_signal">Очікується GPS-сигнал…</string>
+    <!-- Image -->
     <string name="image_application">Програма</string>
     <string name="image_arrow">Стрілка</string>
     <string name="image_marker">Маркер</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Записати</string>
     <string name="image_stop">Зупинити</string>
     <string name="image_track">Шлях</string>
+    <!-- Import -->
     <string name="import_error">Імпортовано файли з каталогу %3$s: %1$d з %2$s</string>
     <string name="import_no_directory">Каталог %1$s не існує</string>
     <string name="import_no_file">Немає файлів для імпорту. Підключіть пристрій до комп’ютера та скопіюйте файли
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Усі %1$s</string>
     <string name="import_selection_title">Імпортувати із зовнішньої пам’яті</string>
     <string name="import_success">Імпортовано %1$s з каталогу %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Неможливо вставити маркер, оскільки відсутній сигнал GPS. Повторіть спробу.</string>
     <string name="marker_add_success">Маркер вставлено</string>
     <string name="marker_add_canceled">Помилка: не додано маркер</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Маркер %1$d</string>
     <string name="marker_split_name_format">Сегмент %1$d</string>
     <string name="marker_title">%1$d із %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Починаючи з останнього розділювального маркера:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип маркера (наприклад, водоспад)</string>
     <string name="marker_edit_marker_type_hint">Тип маркера</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Немає маркерів</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Сукупна статистика</string>
     <string name="menu_delete">Видалити</string>
     <string name="menu_edit">Редагувати</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Вимкнути GPS</string>
     <string name="menu_view_photo">Переглянути фото</string>
     <string name="menu_voice_frequency">Голосові сповіщення</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Служба запису</string>
+    <!-- Search -->
     <string name="search_global_description">Шляхи та маркери</string>
     <string name="search_list_empty_message">За вашим запитом не знайдено жодних шляхів і маркерів</string>
     <string name="search_list_marker_track_location">На шляху \"%1$s\".</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Рівень заряду батареї</string>
     <string name="sensor_state_cadence">Темп</string>
     <string name="sensor_state_cadence_value">%1$d об/хв</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d В</string>
     <string name="settings_not_while_recording">Недоступно під час записування шляху.</string>
     <string name="settings_show">Показати</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Розширені</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">За відстанню</string>
     <string name="settings_chart_by_time">За часом</string>
     <string name="settings_chart_x_axis">Вісь X</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">Дата (локаль. формат)</string>
     <string name="settings_recording_track_name_number_option">Номер</string>
     <string name="settings_recording_track_name_title">Назва шляху за умовчанням</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Скинути</string>
     <string name="settings_reset_confirm_message">Усі налаштування буде скинуто до значень за умовчанням.</string>
     <string name="settings_reset_confirm_title">Скинути зараз?</string>
     <string name="settings_reset_done">Для всіх налаштувань відновлено значення за умовчанням</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Датчик</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Датчик Bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Широта/довгота</string>
     <string name="settings_stats_rate_title">Система вимірювання</string>
     <string name="settings_stats_units_imperial">Британська (милі, фути)</string>
     <string name="settings_stats_units_metric">Метрична (км, м)</string>
     <string name="settings_stats_units_title">Одиниці вимірювання</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Надати доступ до файлу шляху</string>
     <string name="share_track_share_file_body">Цей шлях може вас зацікавити.\n\nЩоб переглянути його, скористайтеся програмою Google Планета Земля або іншою програмою для відображення карт.\n\n%1$s</string>
     <string name="share_track_subject">Я хочу поділитися з вами інформацією про шлях.</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Середній темп руху</string>
     <string name="stats_average_moving_speed">Середня швидкість руху</string>
     <string name="stats_average_pace">Середній темп</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Швидкість</string>
     <string name="stats_distance">Відстань</string>
     <string name="stats_total_time">Загальний час</string>
+    <!-- Track -->
     <string name="track_name_format">Шлях %1$d</string>
     <string name="track_record_notification">Записування шляху…</string>
     <string name="track_markers">Маркери шляху \"%1$s\"</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Шлях і його маркери буде остаточно видалено з пристрою.</string>
     <string name="track_delete_one_confirm_title">Видалити шлях?</string>
     <string name="track_delete_multiple_confirm_message">Вибрані шляхи та їх маркери буде остаточно видалено з пристрою.</string>
     <string name="track_delete_progress_message">Видалення…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Діаграма</string>
     <string name="track_detail_stats_tab">Статистика</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Вид активного відпочинку (наприклад, піший туризм)</string>
     <string name="track_edit_activity_type_hint">Вид активного відпочинку</string>
     <string name="track_edit_new_track_title">Новий шлях</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Запишіть свою наступну пригоду тут</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d шляхи</string>
     <string name="tracks_many">%1$d шляхів</string>
     <string name="tracks_one">1 шлях</string>
     <string name="tracks_other">%1$d шляху</string>
     <string name="tracks_two">2 шляхи</string>
     <string name="tracks_zero">0 шляхів</string>
+    <!-- Unit -->
     <string name="unit_feet">фут.</string>
     <string name="unit_kilometer">км</string>
     <string name="unit_kilometer_per_hour">км/год.</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">миль/год.</string>
     <string name="unit_minute_per_kilometer">хв/км</string>
     <string name="unit_minute_per_mile">хв./милю</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Адаптувати для точності</string>
     <string name="value_adapt_battery_life">Адаптувати до часу роботи батареї</string>
     <string name="value_always">Завжди</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Вимк.</string>
     <string name="value_smallest">Найменше</string>
     <string name="value_smallest_recommended">Найменше (рекомендовано)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d години</string>
     <string name="voice_hours_many">%1$d годин</string>
     <string name="voice_hours_one">1 година</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">загальна відстань: 2 милі</string>
     <string name="voice_total_distance_miles_zero">загальна відстань: 0 миль</string>
     <string name="voice_total_distance_zero">Загальна відстань Моїх шляхів дорівнює нулю.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Банкомат</string>
     <string name="waypoint_type_bank">банк</string>
     <string name="waypoint_type_bar">бар</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index d338220ab..c2b3ee9b6 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">máy bay</string>
     <string name="activity_type_atv">ATV</string>
     <string name="activity_type_biking">đi xe đạp</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">đi bộ</string>
     <string name="activity_type_water_skiing">lướt ván nước</string>
     <string name="activity_type_wind_surfing">lướt ván buồm</string>
+    <!-- Description -->
     <string name="description_activity_type">Loại hoạt động: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Nhịp độ di chuyển bình quân: %1$s phút/km (%2$s phút/dặm)</string>
     <string name="description_average_moving_speed">Tốc độ di chuyển trung bình: %1$.2f km/h (%2$.1f dặm/h)</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">Nhịp độ (phút/dặm)</string>
     <string name="description_pace_metric">Nhịp độ (phút/km)</string>
     <string name="description_recorded_time">Đã lưu lại: %1$s</string>
+    <string name="description_speed_ms">Tốc độ (m/s)</string>
     <string name="description_sensor_cadence">Nhịp (vòng/phút)</string>
     <string name="description_sensor_heart_rate">Nhịp tim (lần/phút)</string>
     <string name="description_sensor_power">Công suất (W)</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">Tổng thời gian: %1$s</string>
     <string name="description_track_point">Điểm</string>
     <string name="description_track_segment">Đoạn đường</string>
+    <!-- Export -->
     <string name="export_all_option">Tất cả dưới dạng %1$s</string>
     <string name="export_all_title">Xuất sang bộ nhớ ngoài</string>
     <string name="export_error">Đã xuất %1$d / %2$s sang %3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">Đang xuất sang %1$s…</string>
     <string name="export_success">Đã xuất %1$s sang %2$s</string>
     <string name="export_title">Xuất sang…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d tệp</string>
     <string name="files_many">%1$d tệp</string>
     <string name="files_one">1 tệp</string>
     <string name="files_other">%1$d tệp</string>
     <string name="files_two">2 tệp</string>
     <string name="files_zero">0 tệp</string>
+    <!-- Generic -->
     <string name="generic_add">Thêm</string>
     <string name="generic_cancel">Hủy</string>
     <string name="generic_delete_all_confirm_title">Xóa tất cả?</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">Thành công</string>
     <string name="generic_tracks">Đường đi</string>
     <string name="generic_yes">Có</string>
+    <!-- Gps -->
     <string name="gps_location_access">‘Quyền truy cập thông tin vị trí’</string>
     <string name="gps_disabled">GPS chưa được bật. Hãy chạm vào đây để chuyển tới %1$s. Nhấn nút quay lại để trở về.</string>
     <string name="gps_disabled_my_location">Không xác định được vị trí hiện tại. Hãy bật thêm nguồn vị trí tại %1$s và chắc chắn rằng bạn có thể nhìn thấy bầu trời. Vui lòng thử lại sau.</string>
@@ -138,6 +160,7 @@
     <string name="gps_starting">Đang khởi động GPS</string>
     <string name="gps_wait_for_better_signal">Đang chờ tín hiệu GPS tốt hơn</string>
     <string name="gps_wait_for_signal">Đang chờ tín hiệu GPS</string>
+    <!-- Image -->
     <string name="image_application">Ứng dụng</string>
     <string name="image_arrow">Mũi tên</string>
     <string name="image_marker">Điểm đánh dấu</string>
@@ -148,6 +171,7 @@
     <string name="image_record">Ghi</string>
     <string name="image_stop">Dừng</string>
     <string name="image_track">Đường đi</string>
+    <!-- Import -->
     <string name="import_error">Đã nhập %1$d / %2$s từ %3$s</string>
     <string name="import_no_directory">%1$s không tồn tại</string>
     <string name="import_no_file">Không có tệp nào để nhập. Hãy kết nối thiết bị của bạn với máy tính của bạn và đặt các tệp để
@@ -157,6 +181,7 @@
     <string name="import_selection_option">Tất cả %1$s</string>
     <string name="import_selection_title">Nhập từ bộ nhớ ngoài</string>
     <string name="import_success">Đã nhập %1$s từ %2$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">Không thể chèn điểm đánh dấu. Không có tín hiệu GPS. Hãy thử lại.</string>
     <string name="marker_add_success">Đã chèn vào một điểm đánh dấu</string>
     <string name="marker_add_canceled">Đã hủy, điểm đánh dấu chưa được thêm vào</string>
@@ -169,10 +194,14 @@
     <string name="marker_name_format">Điểm đánh dấu %1$d</string>
     <string name="marker_split_name_format">Tách %1$d</string>
     <string name="marker_title">%1$d / %2$d</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">Kể từ điểm đánh dấu phân chia cuối cùng:</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Loại điểm đánh dấu (ví dụ: thác nước)</string>
     <string name="marker_edit_marker_type_hint">Loại điểm đánh dấu</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">Bạn không có bất kỳ điểm đánh dấu nào</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">Số liệu thống kê tổng hợp</string>
     <string name="menu_delete">Xóa</string>
     <string name="menu_edit">Chỉnh sửa</string>
@@ -193,11 +222,14 @@
     <string name="menu_stop_gps">Dừng GPS</string>
     <string name="menu_view_photo">Xem ảnh</string>
     <string name="menu_voice_frequency">Tần suất giọng nói</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">Dịch vụ ghi</string>
+    <!-- Search -->
     <string name="search_global_description">Các tuyến đường và điểm đánh dấu</string>
     <string name="search_list_empty_message">Không có tuyến đường hoặc điểm đánh dấu nào phù hợp với tìm kiếm của bạn</string>
     <string name="search_list_marker_track_location">Trong tuyến đường \'%1$s\'.</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">Mức pin</string>
     <string name="sensor_state_cadence">Nhịp</string>
     <string name="sensor_state_cadence_value">%1$d rpm</string>
@@ -208,7 +240,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">Không khả dụng khi đang ghi tuyến đường</string>
     <string name="settings_show">Hiển thị</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">Nâng cao</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">Theo khoảng cách</string>
     <string name="settings_chart_by_time">Theo thời gian</string>
     <string name="settings_chart_x_axis">Trục X</string>
@@ -229,21 +263,27 @@
     <string name="settings_recording_track_name_date_local_option">Ngày (địa phương)</string>
     <string name="settings_recording_track_name_number_option">Số</string>
     <string name="settings_recording_track_name_title">Tên mặc định của tuyến đường</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">Đặt lại</string>
     <string name="settings_reset_confirm_message">Tất cả cài đặt của bạn sẽ được hoàn nguyên về giá trị mặc định.</string>
     <string name="settings_reset_confirm_title">Đặt lại bây giờ?</string>
     <string name="settings_reset_done">Tất cả cài đặt đã được hoàn nguyên về giá trị mặc định</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">Cảm biến</string>
     <string name="settings_sensor_bluetooth">Bluetooth</string>
     <string name="settings_sensor_bluetooth_sensor">Cảm biến bluetooth</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Vĩ độ/Kinh độ</string>
     <string name="settings_stats_rate_title">Tốc độ ưa thích</string>
     <string name="settings_stats_units_imperial">Hệ đo lường Anh (mi, ft)</string>
     <string name="settings_stats_units_metric">Hệ mét (km, m)</string>
     <string name="settings_stats_units_title">Đơn vị ưa thích</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">Chia sẻ tệp tuyến đường</string>
     <string name="share_track_share_file_body">Tôi nghĩ rằng bạn có thể quan tâm đến tuyến đường này.\n\nĐể xem tuyến đường này, hãy sử dụng Google Earth hoặc phần mềm vẽ bản đồ khác.\n\n%1$s</string>
     <string name="share_track_subject">Tôi muốn chia sẻ một tuyến đường với bạn</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">Nhịp độ di chuyển trung bình</string>
     <string name="stats_average_moving_speed">Tốc độ di chuyển trung bình</string>
     <string name="stats_average_pace">Nhịp độ trung bình</string>
@@ -262,25 +302,33 @@
     <string name="stats_speed">Tốc độ</string>
     <string name="stats_distance">Khoảng cách</string>
     <string name="stats_total_time">Tổng thời gian</string>
+    <!-- Track -->
     <string name="track_name_format">Tuyến đường %1$d</string>
     <string name="track_record_notification">Đang ghi tuyến đường của bạn…</string>
     <string name="track_markers">%1$s Điểm đánh dấu</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">Tuyến đường và các điểm đánh dấu của nó sẽ bị xóa vĩnh viễn khỏi thiết bị.</string>
     <string name="track_delete_one_confirm_title">Xóa tuyến đường</string>
     <string name="track_delete_multiple_confirm_message">Các tuyến đường được chọn và điểm đánh dấu của chúng sẽ bị xóa vĩnh viễn khỏi thiết bị.</string>
     <string name="track_delete_progress_message">Đang xóa…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">Biểu đồ</string>
     <string name="track_detail_stats_tab">Thống kê</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">Loại hoạt động (ví dụ: đi bộ đường dài)</string>
     <string name="track_edit_activity_type_hint">Loại hoạt động</string>
     <string name="track_edit_new_track_title">Tuyến đường mới</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">Bắt đầu ghi lại cuộc phiêu lưu tiếp theo của bạn ở đây</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d tuyến đường</string>
     <string name="tracks_many">%1$d tuyến đường</string>
     <string name="tracks_one">1 tuyến đường</string>
     <string name="tracks_other">%1$d tuyến đường</string>
     <string name="tracks_two">2 tuyến đường</string>
     <string name="tracks_zero">0 tuyến đường</string>
+    <!-- Unit -->
     <string name="unit_feet">ft</string>
     <string name="unit_kilometer">km</string>
     <string name="unit_kilometer_per_hour">km/h</string>
@@ -289,6 +337,7 @@
     <string name="unit_mile_per_hour">dặm/giờ</string>
     <string name="unit_minute_per_kilometer">phút/km</string>
     <string name="unit_minute_per_mile">phút/dặm</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">Thích ứng với độ chính xác</string>
     <string name="value_adapt_battery_life">Thích ứng với tuổi thọ pin</string>
     <string name="value_always">Luôn luôn</string>
@@ -315,6 +364,7 @@
     <string name="value_off">Tắt</string>
     <string name="value_smallest">Nhỏ nhất</string>
     <string name="value_smallest_recommended">Nhỏ nhất (được đề nghị)</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d giờ</string>
     <string name="voice_hours_many">%1$d giờ</string>
     <string name="voice_hours_one">1 giờ</string>
@@ -361,6 +411,7 @@
     <string name="voice_total_distance_miles_two">tổng khoảng cách là 2 dặm</string>
     <string name="voice_total_distance_miles_zero">tổng khoảng cách là 0 dặm</string>
     <string name="voice_total_distance_zero">Tổng khoảng cách Tuyến đường của tôi là 0.</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">ATM</string>
     <string name="waypoint_type_bank">ngân hàng</string>
     <string name="waypoint_type_bar">bar</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 8ce3d0177..40e09d93d 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <!-- Activity Type -->
     <string name="activity_type_airplane">坐飞机</string>
     <string name="activity_type_atv">全地形越野</string>
     <string name="activity_type_biking">自行车</string>
@@ -66,6 +81,7 @@
     <string name="activity_type_walking">步行</string>
     <string name="activity_type_water_skiing">划水</string>
     <string name="activity_type_wind_surfing">帆板运动</string>
+    <!-- Description -->
     <string name="description_activity_type">活动类型：%1$s</string>
     <string name="description_average_moving_pace_in_minute">平均移动步速：%1$s分钟/公里（%2$s分钟/英里）</string>
     <string name="description_average_moving_speed">平均移动速度：%1$.2f 公里/小时（%2$.1f 英里/小时）</string>
@@ -90,6 +106,7 @@
     <string name="description_pace_imperial">步速（分钟/英里）</string>
     <string name="description_pace_metric">步速（分钟/公里）</string>
     <string name="description_recorded_time">记录时间：%1$s</string>
+    <string name="description_speed_ms">速度（米/秒）</string>
     <string name="description_sensor_cadence">蹬踏频率（转数/分钟）</string>
     <string name="description_sensor_heart_rate">心率（次/分钟）</string>
     <string name="description_sensor_power">功率（瓦）</string>
@@ -100,6 +117,7 @@
     <string name="description_total_time">总时间：%1$s</string>
     <string name="description_track_point">点</string>
     <string name="description_track_segment">路段</string>
+    <!-- Export -->
     <string name="export_all_option">全部以 %1$s 格式导</string>
     <string name="export_all_title">导出到外部存储设备</string>
     <string name="export_error">已将%1$d条路线（共%2$s条）导出到%3$s</string>
@@ -107,12 +125,15 @@
     <string name="export_progress_message">正在导出到 %1$s…</string>
     <string name="export_success">已将%1$s导出到%2$s</string>
     <string name="export_title">导出到…</string>
+    <!-- External Storage -->
+    <!-- Files -->
     <string name="files_few">%1$d个文件</string>
     <string name="files_many">%1$d个文件</string>
     <string name="files_one">1个文件</string>
     <string name="files_other">%1$d个文件</string>
     <string name="files_two">2个文件</string>
     <string name="files_zero">0个文件</string>
+    <!-- Generic -->
     <string name="generic_add">添加</string>
     <string name="generic_cancel">取消</string>
     <string name="generic_delete_all_confirm_title">全部删除？</string>
@@ -131,6 +152,7 @@
     <string name="generic_success_title">成功</string>
     <string name="generic_tracks">路线</string>
     <string name="generic_yes">是</string>
+    <!-- Gps -->
     <string name="gps_location_access">‘位置信息使用权’</string>
     <string name="gps_disabled">GPS 未启用，请点按此处转至 %1$s。按“后退”按钮返回。</string>
     <string name="gps_disabled_my_location">无法确定当前位置。请进入%1$s启用更多位置来源，并确保
@@ -139,6 +161,7 @@
     <string name="gps_starting">正在启动GPS</string>
     <string name="gps_wait_for_better_signal">正在等待更好的GPS信号</string>
     <string name="gps_wait_for_signal">正在等待GPS信号</string>
+    <!-- Image -->
     <string name="image_application">应用</string>
     <string name="image_arrow">箭头</string>
     <string name="image_marker">标记</string>
@@ -149,6 +172,7 @@
     <string name="image_record">记录</string>
     <string name="image_stop">停止</string>
     <string name="image_track">跟踪</string>
+    <!-- Import -->
     <string name="import_error">从%3$s导入了%2$s中的%1$d个</string>
     <string name="import_no_directory">%1$s不存在</string>
     <string name="import_no_file">没有可以导入的文件。请将设备连接到计算机，然后将要导入的文件
@@ -158,6 +182,7 @@
     <string name="import_selection_option">所有 %1$s</string>
     <string name="import_selection_title">从外部存储设备导入</string>
     <string name="import_success">已从%2$s导入%1$s</string>
+    <!-- Marker -->
     <string name="marker_add_error">无法插入标记，无 GPS 信号。请重试。</string>
     <string name="marker_add_success">已插入标记</string>
     <string name="marker_add_canceled">已取消，未添加标记</string>
@@ -170,10 +195,14 @@
     <string name="marker_name_format">标记 %1$d</string>
     <string name="marker_split_name_format">分割标记 %1$d</string>
     <string name="marker_title">第%1$d个（共%2$d个）</string>
+    <!-- Marker Detail -->
     <string name="marker_detail_statistics_title">上一个分割标记之后的数据：</string>
+    <!-- Marker Edit -->
     <string name="marker_edit_marker_type">标记类型（如瀑布）</string>
     <string name="marker_edit_marker_type_hint">标记类型</string>
+    <!-- Marker List -->
     <string name="marker_list_empty_message">您没有任何标记</string>
+    <!-- Menu -->
     <string name="menu_aggregated_statistics">汇总统计数据</string>
     <string name="menu_delete">删除</string>
     <string name="menu_edit">修改</string>
@@ -194,11 +223,14 @@
     <string name="menu_stop_gps">关闭 GPS</string>
     <string name="menu_view_photo">查看照片</string>
     <string name="menu_voice_frequency">语音提示频率</string>
+    <!-- OpenTracks -->
     <string name="app_name">OpenTracks</string>
     <string name="recording_service">记录服务</string>
+    <!-- Search -->
     <string name="search_global_description">路线和标记</string>
     <string name="search_list_empty_message">没有与您的搜索相符的路线或标记</string>
     <string name="search_list_marker_track_location">位于“%1$s”路线。</string>
+    <!-- Sensor State -->
     <string name="sensor_state_battery">电池电量</string>
     <string name="sensor_state_cadence">蹬车频率</string>
     <string name="sensor_state_cadence_value">%1$d RPM</string>
@@ -209,7 +241,9 @@
     <string name="sensor_state_power_value">%1$d W</string>
     <string name="settings_not_while_recording">记录路线时不可用</string>
     <string name="settings_show">显示</string>
+    <!-- Settings Advanced -->
     <string name="settings_advanced">高级</string>
+    <!-- Settings Chart -->
     <string name="settings_chart_by_distance">按距离</string>
     <string name="settings_chart_by_time">按时间</string>
     <string name="settings_chart_x_axis">X 轴</string>
@@ -230,22 +264,28 @@
     <string name="settings_recording_track_name_date_local_option">日期（本地）</string>
     <string name="settings_recording_track_name_number_option">编号</string>
     <string name="settings_recording_track_name_title">默认路线名称</string>
+    <!-- Settings Reset -->
     <string name="settings_reset">重置</string>
     <string name="settings_reset_confirm_message">所有设置都将恢复为默认值。</string>
     <string name="settings_reset_confirm_title">立即重置？</string>
     <string name="settings_reset_done">所有设置都已恢复为默认值</string>
+    <!-- Settings Sensor -->
     <string name="settings_sensor">传感器</string>
     <string name="settings_sensor_bluetooth">蓝牙</string>
     <string name="settings_sensor_bluetooth_sensor">蓝牙传感器</string>
+    <!-- Settings Stats -->
     <string name="settings_stats_coordinate">纬度/经度</string>
     <string name="settings_stats_rate_title">首选速率</string>
     <string name="settings_stats_units_imperial">英制（英里、英尺）</string>
     <string name="settings_stats_units_metric">公制（公里、米）</string>
     <string name="settings_stats_units_title">首选单位</string>
+
+    <!-- Share Track -->
     <string name="share_track_share_file">分享路线文件</string>
     <string name="share_track_share_file_body">您可能会对此路线感兴趣。\n\n要查看此路线，请使用 Google 地图或其他
     地图软件。\n\n%1$s</string>
     <string name="share_track_subject">我要与您分享路线</string>
+    <!-- Stats -->
     <string name="stats_average_moving_pace">平均移动步速</string>
     <string name="stats_average_moving_speed">平均移动速度</string>
     <string name="stats_average_pace">平均步速</string>
@@ -264,25 +304,33 @@
     <string name="stats_speed">速度</string>
     <string name="stats_distance">距离</string>
     <string name="stats_total_time">总时间</string>
+    <!-- Track -->
     <string name="track_name_format">路线 %1$d</string>
     <string name="track_record_notification">正在记录路线…</string>
     <string name="track_markers">%1$s标记</string>
+    <!-- Track Delete -->
     <string name="track_delete_one_confirm_message">系统将从设备中永久删除路线及其标记。</string>
     <string name="track_delete_one_confirm_title">删除路线？</string>
     <string name="track_delete_multiple_confirm_message">系统将从设备中永久删除选定的路线及其标记。</string>
     <string name="track_delete_progress_message">正在删除…</string>
+    <!-- Track Detail -->
     <string name="track_detail_chart_tab">图表</string>
     <string name="track_detail_stats_tab">统计信息</string>
+    <!-- Track Edit -->
     <string name="track_edit_activity_type">活动类型（如徒步）</string>
     <string name="track_edit_activity_type_hint">活动类型</string>
     <string name="track_edit_new_track_title">新路线</string>
+    <!-- Track List -->
     <string name="track_list_empty_message">在这里开始记录您的新冒险</string>
+    <!-- Track Widget -->
+    <!-- Tracks -->
     <string name="tracks_few">%1$d条路线</string>
     <string name="tracks_many">%1$d条路线</string>
     <string name="tracks_one">1条路线</string>
     <string name="tracks_other">%1$d条路线</string>
     <string name="tracks_two">2条路线</string>
     <string name="tracks_zero">0条路线</string>
+    <!-- Unit -->
     <string name="unit_feet">英尺</string>
     <string name="unit_kilometer">公里</string>
     <string name="unit_kilometer_per_hour">公里/小时</string>
@@ -291,6 +339,7 @@
     <string name="unit_mile_per_hour">英里/小时</string>
     <string name="unit_minute_per_kilometer">分钟/公里</string>
     <string name="unit_minute_per_mile">分钟/英里</string>
+    <!-- Value -->
     <string name="value_adapt_accuracy">适应精度</string>
     <string name="value_adapt_battery_life">视电池电量而定</string>
     <string name="value_always">一律启用</string>
@@ -317,6 +366,7 @@
     <string name="value_off">关闭</string>
     <string name="value_smallest">最小</string>
     <string name="value_smallest_recommended">最小（建议）</string>
+    <!-- Voice -->
     <string name="voice_hours_few">%1$d 小时</string>
     <string name="voice_hours_many">%1$d 小时</string>
     <string name="voice_hours_one">1 小时</string>
@@ -363,6 +413,7 @@
     <string name="voice_total_distance_miles_two">总距离 2 英里</string>
     <string name="voice_total_distance_miles_zero">总距离 0 英里</string>
     <string name="voice_total_distance_zero">“我的足迹”总距离为零。</string>
+    <!-- Waypoint Type -->
     <string name="waypoint_type_atm">自动取款机</string>
     <string name="waypoint_type_bank">银行</string>
     <string name="waypoint_type_bar">酒吧</string>