diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7cc7add2..4dc290f3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -83,6 +83,8 @@
   <string name="osm_upload_bad_response">Ο εξυπηρετητής OSM απέδωσε σφάλμα: ({0}) μήνυμα {1}</string>
   <string name="osm_upload_unauthorized">Σφάλμα επαλήθευσης. Θελε να εκκαθαρίσετε τα αποθηκευμένα πιστοποιητικά για το OSM;</string>
   <string name="osm_upload_sucess">Αποστολή στο OpenStreetMap επιτυχής</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Ακύρωση</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Ηχογράφηση</string>
   <string name="gpsstatus_record_stillimage">Φωτογράφιση</string>
@@ -94,6 +96,12 @@
   <string name="edit_waypoint_bt_cancel">Ακύρωση</string>
   <string name="delete_waypoint_confirm_bt_ok">Διαγραφή</string>
   <string name="delete_waypoint_confirm_bt_cancel">Ακύρωση</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Αποθήκευση</string>
+  <string name="edit_note_bt_delete">Διαγραφή</string>
+  <string name="edit_note_bt_cancel">Ακύρωση</string>
+  <string name="delete_note_confirm_bt_ok">Διαγραφή</string>
+  <string name="delete_note_confirm_bt_cancel">Ακύρωση</string>
   <!--Menu-->
   <string name="menu_settings">Ρυθμίσεις</string>
   <string name="menu_waypointlist">Σημεία</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 21e871f0..a1414783 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -82,6 +82,8 @@
   <string name="osm_upload_bad_response">El servidor OSM ha devuelto un error: ({0}) mensaje {1}</string>
   <string name="osm_upload_unauthorized">Error de autorización. ¿Desea borrar las credenciales de OSM guardadas?</string>
   <string name="osm_upload_sucess">La subida a OpenStreetMap tuvo éxito</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Cancelar</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Grabar voz</string>
   <string name="gpsstatus_record_stillimage">Tomar foto</string>
@@ -97,6 +99,12 @@
   <string name="delete_waypoint_confirm_dialog_msg">¿Eliminar este punto?</string>
   <string name="delete_waypoint_confirm_bt_ok">Eliminar</string>
   <string name="delete_waypoint_confirm_bt_cancel">Cancelar</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Guardar</string>
+  <string name="edit_note_bt_delete">Eliminar</string>
+  <string name="edit_note_bt_cancel">Cancelar</string>
+  <string name="delete_note_confirm_bt_ok">Eliminar</string>
+  <string name="delete_note_confirm_bt_cancel">Cancelar</string>
   <!--Menu-->
   <string name="menu_settings">Configuración</string>
   <string name="menu_waypointlist">Puntos</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3c786b6e..b70ae59e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -83,6 +83,8 @@ Selecteer het in de lijst om door te gaan.</string>
   <string name="osm_upload_bad_response">Foutmelding van de OSM server:  ({0}) bericht {1}</string>
   <string name="osm_upload_unauthorized">Foute naam/wachtwoord. Wilt u de opgeslagen OpenStreetMap aanmeldgegevens wissen?</string>
   <string name="osm_upload_sucess">Uploaden naar OpenStreetMap geslaagd</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Annuleren</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Stemopname</string>
   <string name="gpsstatus_record_stillimage">Foto nemen</string>
@@ -98,6 +100,12 @@ Selecteer het in de lijst om door te gaan.</string>
   <string name="delete_waypoint_confirm_dialog_msg">Dit referentiepunt verwijderen?</string>
   <string name="delete_waypoint_confirm_bt_ok">Verwijderen</string>
   <string name="delete_waypoint_confirm_bt_cancel">Annuleren</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Opslaan</string>
+  <string name="edit_note_bt_delete">Verwijderen</string>
+  <string name="edit_note_bt_cancel">Annuleren</string>
+  <string name="delete_note_confirm_bt_ok">Verwijderen</string>
+  <string name="delete_note_confirm_bt_cancel">Annuleren</string>
   <!--Menu-->
   <string name="menu_settings">Instellingen</string>
   <string name="menu_waypointlist">Referentiepunten</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4ec4eedb..6d69f1b5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -82,6 +82,8 @@
   <string name="osm_upload_bad_response">Serwer OSM zwrócił błąd ({0}) o treści {1}</string>
   <string name="osm_upload_unauthorized">Błąd uwierzytelniania. Czy chcesz usunąć zapisane ustawienia uwierzytelniania OSM?</string>
   <string name="osm_upload_sucess">Wysyłanie zakończone pomyślnie!</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Anulować</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Nagraj notkę 
 głosową</string>
@@ -98,6 +100,12 @@ głosową</string>
   <string name="delete_waypoint_confirm_dialog_msg">Usunąć ten punkt nawigacji?</string>
   <string name="delete_waypoint_confirm_bt_ok">Usuwać</string>
   <string name="delete_waypoint_confirm_bt_cancel">Anulować</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Ratować</string>
+  <string name="edit_note_bt_delete">Usuwać</string>
+  <string name="edit_note_bt_cancel">Anulować</string>
+  <string name="delete_note_confirm_bt_ok">Usuwać</string>
+  <string name="delete_note_confirm_bt_cancel">Anulować</string>
   <!--Menu-->
   <string name="menu_settings">Ustawienia</string>
   <string name="menu_waypointlist">Punkty nawigacji</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5d7ac2ec..53ff769b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -82,6 +82,8 @@
   <string name="osm_upload_bad_response">O servidor do OSM retornou um erro: ({0}) message {1}</string>
   <string name="osm_upload_unauthorized">Erro de autorização. Gostaria de limpar as credencias do OpenStreetMaps salvas?</string>
   <string name="osm_upload_sucess">Enviado com sucesso para o OpenStreetMap</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Cancelar</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Gravar voz</string>
   <string name="gpsstatus_record_stillimage">Tirar foto</string>
@@ -97,6 +99,12 @@
   <string name="delete_waypoint_confirm_dialog_msg">Apagar este ponto de referência?</string>
   <string name="delete_waypoint_confirm_bt_ok">Apagar</string>
   <string name="delete_waypoint_confirm_bt_cancel">Cancelar</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Salvar</string>
+  <string name="edit_note_bt_delete">Apagar</string>
+  <string name="edit_note_bt_cancel">Cancelar</string>
+  <string name="delete_note_confirm_bt_ok">Apagar</string>
+  <string name="delete_note_confirm_bt_cancel">Cancelar</string>
   <!--Menu-->
   <string name="menu_settings">Configurações</string>
   <string name="menu_waypointlist">Pontos de referência</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5eeecd94..b653ab5f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -82,6 +82,8 @@
   <string name="osm_upload_bad_response">Сервер OSM вернул ошибку:  ({0}) текст {1}</string>
   <string name="osm_upload_unauthorized">Ошибка авторизации.  Удалить сохраненные учетные данные OpenStreetMap?</string>
   <string name="osm_upload_sucess">Загрузка на OpenStreetMap завершена</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Отмена</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Запись аудио</string>
   <string name="gpsstatus_record_stillimage">Сделать фото</string>
@@ -97,6 +99,12 @@
   <string name="delete_waypoint_confirm_dialog_msg">Удалить эту точку?</string>
   <string name="delete_waypoint_confirm_bt_ok">Удалить</string>
   <string name="delete_waypoint_confirm_bt_cancel">Отмена</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Сохранить</string>
+  <string name="edit_note_bt_delete">Удалить</string>
+  <string name="edit_note_bt_cancel">Отмена</string>
+  <string name="delete_note_confirm_bt_ok">Удалить</string>
+  <string name="delete_note_confirm_bt_cancel">Отмена</string>
   <!--Menu-->
   <string name="menu_settings">Настройки</string>
   <string name="menu_waypointlist">Путевые точки</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6d856b0d..aaeda263 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -82,6 +82,8 @@
   <string name="osm_upload_bad_response">Server OSM vrátil chybu: ({0}) správa o chybe {1}</string>
   <string name="osm_upload_unauthorized">Chyba autorizácie. Chcete odstrániť poverenia pre OpenStreetMap uložené v zariadení?</string>
   <string name="osm_upload_sucess">Odovzdávanie do OpenStreetMap bolo úspešné</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Zrušiť</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Hlasový záznam</string>
   <string name="gpsstatus_record_stillimage">Zachytiť fotografiu</string>
@@ -97,6 +99,12 @@
   <string name="delete_waypoint_confirm_dialog_msg">Vymazať tento prechodný bod?</string>
   <string name="delete_waypoint_confirm_bt_ok">Odstrániť</string>
   <string name="delete_waypoint_confirm_bt_cancel">Zrušiť</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Uložiť</string>
+  <string name="edit_note_bt_delete">Odstrániť</string>
+  <string name="edit_note_bt_cancel">Zrušiť</string>
+  <string name="delete_note_confirm_bt_ok">Odstrániť</string>
+  <string name="delete_note_confirm_bt_cancel">Zrušiť</string>
   <!--Menu-->
   <string name="menu_settings">Nastavenia</string>
   <string name="menu_waypointlist">Cestovné body</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 21e4e703..9762f4e7 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -82,6 +82,8 @@
   <string name="osm_upload_bad_response">OSM-servern returnerade ett fel: ({0}) meddelande {1}</string>
   <string name="osm_upload_unauthorized">Inloggningsfel. Vill du ta bort sparade inloggningsdata till OpenStreetMap</string>
   <string name="osm_upload_sucess">Uppladdning till OpenStreetMap klar</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload_cancel">Avboka</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">Röstnotering</string>
   <string name="gpsstatus_record_stillimage">Bildnotering</string>
@@ -97,6 +99,12 @@
   <string name="delete_waypoint_confirm_dialog_msg">Vill du ta bort den här waypointen?</string>
   <string name="delete_waypoint_confirm_bt_ok">Radera</string>
   <string name="delete_waypoint_confirm_bt_cancel">Avboka</string>
+  <!--osm Notes-->
+  <string name="edit_note_bt_update">Spara</string>
+  <string name="edit_note_bt_delete">Radera</string>
+  <string name="edit_note_bt_cancel">Avboka</string>
+  <string name="delete_note_confirm_bt_ok">Radera</string>
+  <string name="delete_note_confirm_bt_cancel">Avboka</string>
   <!--Menu-->
   <string name="menu_settings">Inställningar</string>
   <string name="menu_waypointlist">Vägpunkter</string>
diff --git a/app/src/main/res/values-zh-rTW/strings-preferences.xml b/app/src/main/res/values-zh-rTW/strings-preferences.xml
index 513d07a5..c6f6f6ee 100644
--- a/app/src/main/res/values-zh-rTW/strings-preferences.xml
+++ b/app/src/main/res/values-zh-rTW/strings-preferences.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Preferences-->
   <!--Preferences-->
   <string name="prefs">設定</string>
   <string name="prefs_gps">GPS</string>
@@ -11,6 +12,13 @@
   <string name="prefs_gps_ignore_clock_summary">忽略 GPS 的時間，改用 Android 系統時間</string>
   <string name="prefs_use_barometer">記錄氣壓 [hPa]</string>
   <string name="prefs_use_barometer_summary">切換需要重新啟動軌跡記錄</string>
+  <string name="prefs_notes">文字註解</string>
+  <string name="prefs_notes_summary">選取註解文字按鈕的值的儲存樣式</string>
+  <string-array name="prefs_notes_keys">
+    <item>路徑</item>
+    <item>OSM 註解</item>
+    <item>全部</item>
+  </string-array>
   <string name="prefs_gps_logging_interval">GPS 記錄頻率</string>
   <string name="prefs_gps_logging_interval_summary">使用 0 會盡可能的記錄資料 (會影響電池續航力)</string>
   <string name="prefs_gps_logging_interval_seconds">秒</string>
@@ -84,6 +92,14 @@
   <string name="prefs_output_gpx_hdop_approximation_summary">在 GPX 檔中填入 HDOP 近似值</string>
   <string name="prefs_sound_enabled">使用聲音</string>
   <string name="prefs_sound_enabled_summary">當錄製語音期間可播放聲音</string>
+  <string name="prefs_osm_visibility">軌跡可見度</string>
+  <string name="prefs_osm_visibility_summary">上傳到 openstreetmap.org 偏好的軌跡可見度</string>
+  <string-array name="prefs_osm_visibility_keys">
+    <item>私人</item>
+    <item>可追蹤</item>
+    <item>公開</item>
+    <item>可識別</item>
+  </string-array>
   <string name="prefs_osm_clear_oauth_data">重新設定 OSM 認證</string>
   <string name="prefs_osm_clear_oauth_data_summary">捨棄現存的 OSM 認證與權限資訊，強制 OSMTracker 重新取得它們</string>
   <string name="prefs_osm_clear_oauth_data_dialog">您必須重新認證 OSMTracker 方能繼續上傳軌跡資料，確定嗎？</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 08732e85..3a9a6ab7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -30,6 +30,7 @@
   <string name="trackmgr_tracklist">軌跡清單：</string>
   <string name="trackmgr_waypoints_count">航點：</string>
   <string name="trackmgr_trackpoints_count">軌跡點：</string>
+  <string name="trackmgr_notes_count">註記：</string>
   <string name="trackmgr_empty">您尚未有任何的軌跡紀錄資料。</string>
   <string name="trackmgr_newtrack_hint">按壓來開始記錄新的軌跡。</string>
   <string name="trackmgr_newtrack_error">無法開始記錄新軌跡： {0}</string>
@@ -67,6 +68,7 @@
   <string name="trackdetail_description">描述</string>
   <string name="trackdetail_tags">標籤 (以半形逗號分隔)</string>
   <string name="trackdetail_description_mandatory">您必須填寫描述欄</string>
+  <string name="trackdetail_visibility">能見度</string>
   <string name="osm_visibility_private">私人</string>
   <string name="osm_visibility_public">公開</string>
   <string name="osm_visibility_trackable">可追蹤的</string>
@@ -82,6 +84,14 @@
   <string name="osm_upload_bad_response">OSM 伺服器傳回錯誤: ({0}) 訊息 {1}</string>
   <string name="osm_upload_unauthorized">認證錯誤。您想要清除現存的 OpenStreetMap 認證資料嗎？</string>
   <string name="osm_upload_sucess">成功上傳至 OpenStreetMap</string>
+  <!--OSM Notes Upload-->
+  <string name="osm_note_upload">上傳開放街圖註解</string>
+  <string name="osm_note_upload_error">上傳註解時發生錯誤</string>
+  <string name="osm_note_label">註解文字</string>
+  <string name="osm_note_upload_ok">上傳</string>
+  <string name="osm_note_upload_cancel">取消</string>
+  <string name="osm_note_footer">經由%1$s%2$s</string>
+  <string name="osm_note_upload_unauthorized">認證錯誤，如果你先前允許上傳軌跡的權限，你必須先清除已儲存的憑證，才有辦法認證 app 上傳軌跡以及<b>註解</b>。你想要清除已儲存的憑證嗎？</string>
   <!--GPS Status & record bar-->
   <string name="gpsstatus_record_voicerec">錄製語音</string>
   <string name="gpsstatus_record_stillimage">拍照</string>
@@ -97,6 +107,17 @@
   <string name="delete_waypoint_confirm_dialog_msg">刪除這個路徑節點？</string>
   <string name="delete_waypoint_confirm_bt_ok">刪除</string>
   <string name="delete_waypoint_confirm_bt_cancel">取消</string>
+  <!--osm Notes-->
+  <string name="note_name_label">註解名稱/文字</string>
+  <string name="edit_note_bt_update">儲存</string>
+  <string name="edit_note_bt_delete">刪除</string>
+  <string name="edit_note_bt_cancel">取消</string>
+  <string name="delete_note_confirm_dialog_title">刪除註解</string>
+  <string name="delete_note_confirm_dialog_msg">刪除這個註解？</string>
+  <string name="delete_note_confirm_bt_ok">刪除</string>
+  <string name="delete_note_confirm_bt_cancel">取消</string>
+  <string name="notelist">註解清單</string>
+  <string name="osm_note_bt_upload">以 OSM 註解型式上傳</string>
   <!--Menu-->
   <string name="menu_settings">設定</string>
   <string name="menu_waypointlist">航點</string>