diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
new file mode 100644
index 0000000..8acfff4
--- /dev/null
+++ b/res/values-ca/strings.xml
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- APRSdroid strings.xml - this file contains strings which need to be translated -->
+<resources>
+<string name="app_name">APRSdroid</string>
+<string name="app_prefs">APRSdroid Preferences</string>
+<string name="app_map">APRSdroid Mapa</string>
+<string name="app_hub">APRSdroid Hub</string>
+<string name="app_sta">Informació de l\'estació</string>
+<string name="app_messages">Missatges</string>
+<!-- APRSdroid activity -->
+<string name="firstrun">¡Has de configurar APRSdroid amb el teu indicatiu  i la contrasenya!</string>
+<string name="wrongpasscode">¡El codi d\'accés no coincideix amb el teu indicatiu!</string>
+<string name="anon_warning">Without a passcode, your reports will not be propagated!</string>
+<string name="mininterval">Minimum update time is 1 minute!</string>
+<string name="singlelog">Single Shot</string>
+<string name="startlog">Start Tracking</string>
+<string name="stoplog">Stop Tracking</string>
+
+<string name="empty_logview">You have not yet sent or received any packets.\n\n
+	Press the \"Menu\" button to send a single report or to start tracking your position.\n\n
+	You can also change the application preferences from the menu.</string>
+
+<!-- Maps activity -->
+<string name="sta_lastreport">%s Last Report</string>
+<string name="map_track_call">Tracking %s...</string>
+
+<string name="map_loading">Loading...</string>
+
+<!-- StationInfo activity -->
+<string name="sta_ssids">Station SSIDs</string>
+<string name="sta_history">Station History</string>
+<string name="sta_map">Map</string>
+<string name="sta_aprsfi">aprs.fi</string>
+<string name="sta_qrzcom">QRZ.com</string>
+
+<!-- Conversations activity -->
+<string name="msg_send_new">Send message to...</string>
+<string name="msg_message_text">Message text</string>
+<string name="msg_empty_list">There are no stored conversations.</string>
+<string name="msg_stored_offline">The message will be sent as soon as you start tracking.</string>
+<!-- Message activity -->
+<string name="msg_from">Message from %s</string>
+<string name="msg_to">Message to %s</string>
+<string name="msg_abort">Abort transmission</string>
+<string name="msg_restart">Restart transmission</string>
+<string name="msg_type_rejected">rejected</string>
+<string name="msg_type_aborted">aborted</string>
+
+<!-- AprsService -->
+<string name="aprsservice">APRSdroid Service</string>
+<string name="service_once">APRS Service single shot.</string>
+<string name="service_start">APRS Service started. Updates every %1$d minutes, %2$d km.</string>
+<string name="service_stop">APRS Service stopped.</string>
+<string name="service_no_location">You need to enable either GPS or Network Location for APRSdroid to work properly!</string>
+<!-- service result codes -->
+<string name="post_error">Error</string>
+<string name="post_incmg">received</string>
+<string name="post_info"/>
+<string name="post_connecting">Connecting to %1$s:%2$d...</string>
+<string name="post_reconnect">Connection lost. Reconnect in %d seconds...</string>
+
+<!-- first run dialog -->
+<string name="fr_title">Welcome to APRSdroid!</string>
+<string name="fr_text">This software may only be used by licensed amateur radio
+	operators!</string>
+<string name="fr_text2">You need to enter your callsign to use this software.
+	To forward your packets, an APRS-IS passcode is required as well.</string>
+
+<!-- about dialog -->
+<string name="ad_title">About APRSdroid v%s</string>
+<string name="ad_copyright">Copyright © 2009-2011 Georg Lukas (DO1GL)\n
+	http://aprsdroid.org
+	\n\n
+	APRS® is a registered trademark of Bob Bruninga (WB4APR)
+</string>
+<string name="ad_gpl">This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+	\n\n
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	\n\n
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+	\n\n
+	http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+	</string>
+<string name="ad_thanks">Thanks to:</string>
+<string name="ad_thanks_0">My YL ♥♥♥</string>
+<string name="ad_thanks_1">Michael, DO3BOX: idea</string>
+<string name="ad_thanks_2">Dirk, DB5OY: motivation and support</string>
+<string name="ad_thanks_3">Bastian, DB1BM: AFSK implementation</string>
+<string name="ad_thanks_4">Matti, OH2MQK and John, AB0OO: Java APRS</string>
+<string name="ad_thanks_5">SmartBeaconing™ by HamHUD Nichetronix, LLC, http://hamhud.net</string>
+<string name="ad_trans">\n\nTranslation:</string>
+<string name="ad_homepage">Home Page</string>
+
+<!-- map view -->
+<string name="map_overlays">Overlays</string>
+<string name="map_satellite">Satellite</string>
+<string name="map_objects">APRS Objects</string>
+
+<!-- map view -->
+<string name="age">Show last...</string>
+<string name="age_30">30 minutes</string>
+<string name="age_2h">2 hours</string>
+<string name="age_12h">12 hours</string>
+<string name="age_1d">1 day</string>
+<string name="age_2d">2 days</string>
+
+
+<!-- options menu -->
+<string name="about">About</string>
+<string name="show_hub">Show Hub</string>
+<string name="show_map">Show Map</string>
+<string name="show_log">Show Log</string>
+<string name="clear_log">Clear Log</string>
+<string name="quit">Quit</string>
+<string name="preferences">Preferences</string>
+<!-- preferences -->
+<string name="p__ham">Amateur Radio</string>
+<string name="p_callsign">Callsign</string>
+<string name="p_callsign_nossid">Callsign (without SSID)</string>
+<string name="p_callsign_summary">Your HAM radio callsign</string>
+<string name="p_callsign_entry">Enter your callsign</string>
+<string name="p_passcode">APRS-IS Passcode</string>
+<string name="p_passcode_summary">APRS-IS validation passcode</string>
+<string name="p_passcode_entry">Enter the passcode for your call</string>
+<string name="p_passreq">Request Passcode</string>
+<string name="p_passreq_summary">Request APRS-IS passcode online</string>
+<string name="p__aprs">APRS Settings</string>
+<string name="p_ssid">SSID</string>
+<string name="p_ssid_summary">Station type (1..15; 9=Mobile, 10=APRS-IS)</string>
+<string name="p_ssid_entry">Enter the SSID for your station</string>
+<!-- array of station types (SSID) -->
+<string-array name="p_ssid_e">
+	<item>(none) Primary Station</item>
+	<item>1: Generic additional station</item>
+	<item>2: Generic additional station</item>
+	<item>3: Generic additional station</item>
+	<item>4: Generic additional station</item>
+	<item>5: Other network (D-Star, 3G)</item>
+	<item>6: Satellite</item>
+	<item>7: Handheld radio</item>
+	<item>8: Boat / ship</item>
+	<item>9: Mobile station</item>
+	<item>10: APRS-IS (no radio)</item>
+	<item>11: Balloon, aircraft, spacecraft</item>
+	<item>12: APRStt, DTMF, ... (one way)</item>
+	<item>13: Weather station</item>
+	<item>14: Freight vehicle</item>
+	<item>15: Generic additional station</item>
+</string-array>
+<string name="p_symbol">APRS symbol</string>
+<string name="p_symbol_summary">Your symbol for map display</string>
+<string name="p_symbol_entry">Enter the symbol encoded as two characters</string>
+<string name="p_status">Comment field</string>
+<string name="p_status_summary">The text after your coordinates</string>
+<string name="p_status_entry">Enter your beacon comment</string>
+<string name="p__connection">APRS Connection</string>
+<string name="p_conntype">Connection Protocol</string>
+<string name="p_conntype_summary">AFSK, HTTP, TCP or UDP</string>
+<string name="p_conntype_entry">Choose the connection protocol</string>
+<string name="p_connsetup">Connection Preferences</string>
+<string name="p_connsetup_summary">Configuration of Connection</string>
+<string name="p_connlog">Connection Logging</string>
+<string name="p_connlog_summary">Verbose status output in Log</string>
+<!-- array of connection types -->
+<string name="p_conn_tcp">TCP connection</string>
+<string name="p_conn_udp">UDP (send only)</string>
+<string name="p_conn_http">HTTP POST (send only)</string>
+<string name="p_conn_afsk">AFSK via Speaker</string>
+<string name="p_conn_bt">Bluetooth TNC</string>
+<!-- array of location sources -->
+<string name="p_source_manual">Manual Position</string>
+<string name="p_source_periodic">Periodic GPS/Network Position</string>
+<string name="p_source_smart">SmartBeaconing™ Position</string>
+<!-- manual position -->
+<string name="p_source_lat">Latitude</string>
+<string name="p_source_lon">Longitude</string>
+<string name="p_source_get_last">Use last GPS position</string>
+
+<!-- connection type properties -->
+<string name="p_host">Server</string>
+<string name="p_host_summary">APRS-IS server (port 8080) to send beacons</string>
+<string name="p_host_entry">Enter the APRS-IS server hostname</string>
+<string name="p_host_hint">host:port</string>
+<string name="p__position">Position Reports</string>
+<string name="p_locsource">Location Source</string>
+<string name="p_locsource_summary">Manual, Periodic or SmartBeaconing™</string>
+<string name="p__location">Location Settings</string>
+<string name="p__location_summary">Configuration for sending position reports</string>
+<string name="p_smartbeaconing">SmartBeaconing™</string>
+<string name="p_interval">Minimum update time</string>
+<string name="p_interval_summary">Minutes between beacon transmissions</string>
+<string name="p_interval_entry">Enter the update interval [min]</string>
+<string name="p_distance">Minimum update distance</string>
+<string name="p_distance_summary">Kilometers before beacon transmission (set to 0 for time-only)</string>
+<string name="p_distance_entry">Enter the update distance [km]</string>
+<string name="p_speedbrg">Await speed &amp; bearing</string>
+<string name="p_speedbrg_summary">Keep GPS on longer to get more precise data</string>
+<string name="p_netloc">Use network location</string>
+<string name="p_netloc_summary">Acquire position from the cellular network</string>
+<string name="p_gps">GPS Precision</string>
+<string name="p_gps_summary">Battery usage vs. position quality</string>
+<string name="p_gps_entry">Please set the GPS Precision</string>
+<!-- array of GPS precisions -->
+<string name="p_gps_always">High (Always on)</string>
+<string name="p_gps_med">Medium</string>
+<string name="p_gps_low">Low</string>
+<string name="p_keepscreen">Keep screen awake</string>
+<string name="p_keepscreen_summary">Do not turn off screen when APRSdroid is in the foreground</string>
+
+<!-- messaging -->
+<string name="p__display">Display and Notifications</string>
+<string name="p__notification">Notifications</string>
+<string name="p__notification_summary">Alert for messages and position reports</string>
+<string name="p_msg">Incoming Messages</string>
+<string name="p_msg_led">Blinking LED</string>
+<string name="p_msg_led_on">LED notifications are on</string>
+<string name="p_msg_led_off">LED notifications are off</string>
+<string name="p_msg_vibr">Vibration</string>
+<string name="p_msg_vibr_on">Vibration notifications are on</string>
+<string name="p_msg_vibr_off">Vibration notification are off</string>
+<string name="p_msg_ring">Ringtone</string>
+<string name="p_msg_ring_summary">Tone for incoming messages</string>
+<string name="p_pos">Own Position Reports</string>
+<string name="p_pos_ring">Ringtone</string>
+<string name="p_pos_ring_summary">Tone for sent position reports</string>
+
+<!-- AFSK settings -->
+<string name="p_aprs_path">APRS digi path</string>
+<string name="p_aprs_path_hint">hop 1, hop 2, ...</string>
+<string name="p_aprs_path_summary">Sequence of digipeaters</string>
+<string name="p_aprs_path_entry">Enter the comma separated digi path</string>
+<string name="p_afsk_prefix">Frame Sync Prefix</string>
+<string name="p_afsk_prefix_summary">No-Op Preamble (e.g. for VOX control)</string>
+<string name="p_afsk_prefix_entry">Enter the prefix time [ms]</string>
+
+<!-- TCP server settings -->
+<string name="p_tcp_server_summary">APRS-IS TCP server (port 14580) to contact</string>
+<string name="p_filterdist">Neighbor radius</string>
+<string name="p_filterdist_summary">Receive packets from stations in this radius</string>
+<string name="p_filterdist_entry">Radius around you to monitor for packets [km]</string>
+<string name="p_filter">Message filter</string>
+<string name="p_filter_hint">b/BUDDY o/OBJECT ...</string>
+<string name="p_filter_summary">Filter for incoming packets</string>
+<string name="p_filter_entry">Enter a filter for incoming messages</string>
+
+<string name="p_filterhelp">Message filter help</string>
+<string name="p_filterhelp_summary">Online reference for APRS-IS filters</string>
+
+<string name="p_sotimeout">TCP socket timeout</string>
+<string name="p_sotimeout_summary">Time before resetting the connection</string>
+<string name="p_sotimeout_entry">Timeout value in seconds (0 = disable)</string>
+
+<string name="translator_credits">Launchpad Contributions:
+  Paco-EB5TC https://launchpad.net/~paco-eb5tc</string>
+
+<!-- Bluetooth TNC settings -->
+<string name="p_bt_client">Client Mode</string>
+<string name="p_bt_client_summary">APRSdroid establishes the connection (Keep this on!)</string>
+<string name="p_bt_tnc_device">TNC Bluetooth Device</string>
+<string name="p_bt_tnc_device_summary">Choose your TNC from paired devices</string>
+<string name="p_bt_tnc_device_entry">Choose device</string>
+<string name="p_bt_channel">Channel</string>
+<string name="p_bt_channel_summary">Bluetooth channel on the TNC</string>
+<string name="p_bt_channel_entry">Enter channel (most often: "1"; empty for SPP)</string>
+
+<string name="p_bt_prefs">Bluetooth settings</string>
+<string name="p_bt_prefs_summary">Enable Bluetooth, pair devices...</string>
+
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0a8c236..f7ee7d5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -34,7 +34,7 @@
 <!-- Conversations activity -->
 <string name="msg_send_new">メッセージを送信する</string>
 <string name="msg_message_text">内容</string>
-<string name="msg_empty_list">There are no stored conversations.</string>
+<string name="msg_empty_list">まだ格納された会話はありません。</string>
 <string name="msg_stored_offline">あなたがトラッキングを始めると、メッセージが送信されます。</string>
 <!-- Message activity -->
 <string name="msg_from">%s からのメッセージ</string>
@@ -42,7 +42,7 @@
 <string name="msg_abort">送信中止</string>
 <string name="msg_restart">送信再開</string>
 <string name="msg_type_rejected">拒否された</string>
-<string name="msg_type_aborted">中断しました</string>
+<string name="msg_type_aborted">不達</string>
 
 <!-- AprsService -->
 <string name="aprsservice">APRSdroidサービス</string>
@@ -65,26 +65,11 @@
 <!-- about dialog -->
 <string name="ad_title">APRSdroidについて v%s</string>
 <string name="ad_copyright">著作権 © 2009-2011 Georg Lukas (DO1GL)\n http://aprsdroid.org \n\n APRS®は Bob Bruninga (WB4APR) の登録商標です。</string>
-<string name="ad_gpl">This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-	\n\n
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	\n\n
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-	\n\n
-	http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-	</string>
+<string name="ad_gpl">このプログラムはフリー・ソフトウェアです。; 再分配あるいはフリー・ソフトウェア・ファウンデーションによって公表されるようなGNU一般ライセンスの条件下で修正する事が出来ます。ライセンスver.2あるいは(貴方のオプションで)以降のバージョンの何れか。\n\n このプログラムは有用であることを願い,しかし一切の保証なしに提供されています。;特定の目的に対する商品性もしくは適合性についての暗黙の保証すらありません。 詳細についてはGNU一般ライセンスを参照してください。 \n\n あなたはこのプログラムと共にGNU一般公衆利用許諾契約書のコピーを受け取り承諾しているはずです。; そうでなければ、フリー・ソフトウェア財団に手紙を書いてください。, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. \n\n http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</string>
 <string name="ad_thanks">協力:</string>
 <string name="ad_thanks_0">私の彼女♥♥♥</string>
 <string name="ad_thanks_1">マイケル, DO3BOX: アイデア</string>
-<string name="ad_thanks_2">Dirk, DB5OY: サポート</string>
+<string name="ad_thanks_2">Dirk, DB5OY: モチベーション と サポート</string>
 <string name="ad_thanks_3">Bastian, DB1BM: AFSK機能充足</string>
 <string name="ad_thanks_4">マティ, OH2MQK and ジョーン, AB0OO: Java APRS</string>
 <string name="ad_thanks_5">スマートビーコニング™ by HamHUD Nichetronix, LLC, http://hamhud.net</string>
@@ -160,21 +145,21 @@
 <string name="p_connsetup">接続詳細設定</string>
 <string name="p_connsetup_summary">接続に関する設定</string>
 <string name="p_connlog">接続情報を記録</string>
-<string name="p_connlog_summary">Verbose status output in Log</string>
+<string name="p_connlog_summary">冗長状態をログに出力する(デバック)</string>
 <!-- array of connection types -->
 <string name="p_conn_tcp">TCP接続</string>
 <string name="p_conn_udp">UDP (送信のみ）</string>
 <string name="p_conn_http">HTTP POST (送信のみ）</string>
 <string name="p_conn_afsk">AFSK音声出力</string>
-<string name="p_conn_bt">ブルートゥース TNC</string>
+<string name="p_conn_bt">Bluetooth TNC</string>
 <!-- array of location sources -->
-<string name="p_source_manual">Manual Position</string>
-<string name="p_source_periodic">Periodic GPS/Network Position</string>
-<string name="p_source_smart">SmartBeaconing™ Position</string>
+<string name="p_source_manual">手動位置設定</string>
+<string name="p_source_periodic">周期的に GPS/ネットワーク で測位</string>
+<string name="p_source_smart">SmartBeaconing™測位</string>
 <!-- manual position -->
-<string name="p_source_lat">Latitude</string>
-<string name="p_source_lon">Longitude</string>
-<string name="p_source_get_last">Use last GPS position</string>
+<string name="p_source_lat">緯度</string>
+<string name="p_source_lon">経度</string>
+<string name="p_source_get_last">最後のGPS位置を使用</string>
 
 <!-- connection type properties -->
 <string name="p_host">送信先サーバ名</string>
@@ -182,11 +167,11 @@
 <string name="p_host_entry">APRS-ISサーバホスト名を入力</string>
 <string name="p_host_hint">ホスト名:ポート番号</string>
 <string name="p__position">レポート内容設定</string>
-<string name="p_locsource">Location Source</string>
-<string name="p_locsource_summary">Manual, Periodic or SmartBeaconing™</string>
+<string name="p_locsource">測位方法の選択</string>
+<string name="p_locsource_summary">固定,周期的 又は SmartBeaconing™</string>
 <string name="p__location">位置情報設定</string>
-<string name="p__location_summary">レポート内容設定</string>
-<string name="p_smartbeaconing">スマートビーコニング™</string>
+<string name="p__location_summary">測位方法の詳細設定</string>
+<string name="p_smartbeaconing">SmartBeaconing™</string>
 <string name="p_interval">位置情報取得間隔</string>
 <string name="p_interval_summary">GPSから位置情報を取得する間隔</string>
 <string name="p_interval_entry">取得する間隔[分]を入力</string>
@@ -208,10 +193,10 @@
 <string name="p_keepscreen_summary">APRSdroid画面が表示中の場合、画面をオフにしません。</string>
 
 <!-- messaging -->
-<string name="p__display">Display and Notifications</string>
-<string name="p__notification">Notifications</string>
-<string name="p__notification_summary">Alert for messages and position reports</string>
-<string name="p_msg">Incoming Messages</string>
+<string name="p__display">画面と通知</string>
+<string name="p__notification">通知の設定</string>
+<string name="p__notification_summary">メッセージと位置のアラート</string>
+<string name="p_msg">メッセージ受信時</string>
 <string name="p_msg_led">LED点滅</string>
 <string name="p_msg_led_on">LED通知ON</string>
 <string name="p_msg_led_off">LED通知OFF</string>
@@ -220,9 +205,9 @@
 <string name="p_msg_vibr_off">バイブレーションOFF</string>
 <string name="p_msg_ring">着信音選択</string>
 <string name="p_msg_ring_summary">メッセージ受信時の着信音を選択します。</string>
-<string name="p_pos">Own Position Reports</string>
+<string name="p_pos">位置ビーコン発信時</string>
 <string name="p_pos_ring">着信音選択</string>
-<string name="p_pos_ring_summary">Tone for sent position reports</string>
+<string name="p_pos_ring_summary">ビーコン発信時の音を選択</string>
 
 <!-- AFSK settings -->
 <string name="p_aprs_path">APRSデジピートパス</string>
@@ -239,7 +224,7 @@
 <string name="p_filterdist_summary">ここで指定した範囲内にある局のビーコンを受信表示する</string>
 <string name="p_filterdist_entry">ビーコンを受信する範囲[km]を指定</string>
 <string name="p_filter">メッセージフィルタ</string>
-<string name="p_filter_hint">b/BUDDY o/OBJECT ...</string>
+<string name="p_filter_hint">b/仲間 o/オブジェクト ...</string>
 <string name="p_filter_summary">受信パケットをフィルタリングする</string>
 <string name="p_filter_entry">受信文フィルタ構文を入力</string>
 
@@ -258,13 +243,13 @@
 <string name="p_bt_client">クライアント(子機)モード</string>
 <string name="p_bt_client_summary">APRSdroidは接続確立状態を維持する。</string>
 <string name="p_bt_tnc_device">BT-TNCデバイス選択</string>
-<string name="p_bt_tnc_device_summary">ブルートゥースTNCデバイスを選択</string>
+<string name="p_bt_tnc_device_summary">Bluetooth TNCデバイスを選択</string>
 <string name="p_bt_tnc_device_entry">デバイスを選択して下さい。</string>
 <string name="p_bt_channel">チャンネル選択</string>
 <string name="p_bt_channel_summary">Bluetooth信号チャンネルを選択</string>
 <string name="p_bt_channel_entry">Enter channel (most often: "1"; empty for SPP)</string>
 
 <string name="p_bt_prefs">Bluetooth設定</string>
-<string name="p_bt_prefs_summary">有効なブルートゥース・ペアデバイスの選択</string>
+<string name="p_bt_prefs_summary">有効なBluetoothペア機器</string>
 
 </resources>