Mercurial > 510Connectbot
changeset 165:924523c03ca7
merge
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Tue, 24 Jun 2014 12:39:43 -0700 |
| parents | 284152c31335 (diff) be91eb9743fc (current diff) |
| children | 9d6b581b4656 |
| files | |
| diffstat | 5 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jun 24 12:39:26 2014 -0700 +++ b/.hgtags Tue Jun 24 12:39:43 2014 -0700 @@ -1,2 +1,4 @@ 5e52fa030308cdeda3d1feb551bca22fecfb20d3 stable-1.8.0 4bccac50fd0b08d8ce4089587704804c7ab30534 stable-1.8.1 +4bccac50fd0b08d8ce4089587704804c7ab30534 stable-1.8.1 +9904642c319e339f35838e8ecd59ce49a506125c stable-1.8.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/assets/help/5250Keys.html Tue Jun 24 12:39:43 2014 -0700 @@ -0,0 +1,14 @@ +<html> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /></head> +<body bgcolor="#000000" text="#FFFFFF" link="#00FFFF"> + +<h2>5250 Keys</h2> + +<ul> + <li><strong>ATTN</strong> = <strong>CTRL + A</strong></li> + <li><strong>SYSREQ</strong> = <strong>CTRL + S</strong></li> + <li><strong>RESET</strong> = <strong>CTRL + R</strong> or <strong>ESC</strong></li> +</ul> + +</body> +</html>
--- a/assets/help/About.html Tue Jun 24 12:39:26 2014 -0700 +++ b/assets/help/About.html Tue Jun 24 12:39:43 2014 -0700 @@ -2,7 +2,7 @@ <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /></head> <body bgcolor="#000000" text="#FFFFFF" link="#00FFFF"> -<h2>510 ConnectBot</h2> +<h2>510ConnectBot</h2> <p>Copyright © 2014 Carl Byington <carl@five-ten-sg.com></p>
--- a/res/values/arrays.xml Tue Jun 24 12:39:26 2014 -0700 +++ b/res/values/arrays.xml Tue Jun 24 12:39:43 2014 -0700 @@ -143,6 +143,7 @@ <item>About</item> <item>Hints</item> <item>PhysicalKeyboard</item> + <item>5250Keys</item> <item>ScreenGestures</item> <item>VirtualKeyboard</item> </string-array>
--- a/res/values/notrans.xml Tue Jun 24 12:39:26 2014 -0700 +++ b/res/values/notrans.xml Tue Jun 24 12:39:43 2014 -0700 @@ -19,6 +19,6 @@ --> <resources> <string name="app_name" translatable="false">510 ConnectBot</string> - <string name="copyright_info" translatable="false">510 ConnectBot is provided under the terms of the GPLv3 or later.</string> + <string name="copyright_info" translatable="false">Copyright © 2014 by 510 Software Group. Release under the GPLv3 or later.</string> <string name="copyright_location" translatable="false">You can view the full text of the license at https://www.gnu.org/licenses/gpl.txt</string> </resources>