diff --git a/README b/README index fa7521b..ef1f59f 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ TVHGuide is an Android application that enables you to interact with a -TVHeadend server. It allows you to browse programme listings, schedual +TVHeadend server. It allows you to browse programme listings, schedule recordings and search the EPG. Depending on your hardware, it can also do some actual playback of either live TV or a recorded stream. diff --git a/res/values/strings.xml b/res/values/strings.xml index ec275ac..4048ed2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -45,7 +45,7 @@ Subtitle codec to use with the transcoder Media container - Prefered media container + Preferred media container Playback diff --git a/src/org/tvheadend/tvhguide/SettingsActivity.java b/src/org/tvheadend/tvhguide/SettingsActivity.java index 9cea132..5b7fd0b 100644 --- a/src/org/tvheadend/tvhguide/SettingsActivity.java +++ b/src/org/tvheadend/tvhguide/SettingsActivity.java @@ -76,7 +76,7 @@ protected void onPause() { reconnect |= !oldPw.equals(prefs.getString("passwordPref", "")); if (reconnect) { - Log.d("SettingsActivity", "Connectivity settings chaned, forcing a reconnect"); + Log.d("SettingsActivity", "Connectivity settings changed, forcing a reconnect"); Intent intent = new Intent(SettingsActivity.this, HTSService.class); intent.setAction(HTSService.ACTION_CONNECT); intent.putExtra("hostname", prefs.getString("serverHostPref", "")); diff --git a/src/org/tvheadend/tvhguide/htsp/HTSMessage.java b/src/org/tvheadend/tvhguide/htsp/HTSMessage.java index 13c1fb5..cb93f66 100644 --- a/src/org/tvheadend/tvhguide/htsp/HTSMessage.java +++ b/src/org/tvheadend/tvhguide/htsp/HTSMessage.java @@ -241,7 +241,7 @@ public static HTSMessage parse(ByteBuffer buf) throws IOException { if (len + 4 > buf.capacity()) { buf.clear(); - throw new IOException("Mesage is to long"); + throw new IOException("Message is to long"); } if (buf.limit() == 4) { diff --git a/src/org/tvheadend/tvhguide/htsp/SelectionThread.java b/src/org/tvheadend/tvhguide/htsp/SelectionThread.java index 64bdb67..49580c9 100644 --- a/src/org/tvheadend/tvhguide/htsp/SelectionThread.java +++ b/src/org/tvheadend/tvhguide/htsp/SelectionThread.java @@ -169,7 +169,7 @@ private void select(int timeout) { } private void processTcpSelectionKey(SelectionKey selKey) { - //Incomming connection established + //Incoming connection established if (selKey.isValid() && selKey.isAcceptable()) { try { ServerSocketChannel ssChannel = (ServerSocketChannel) selKey.channel(); @@ -214,7 +214,7 @@ private void processTcpSelectionKey(SelectionKey selKey) { } } - //Incomming data + //Incoming data if (selKey.isValid() && selKey.isReadable()) { SocketChannel sChannel = (SocketChannel) selKey.channel(); try {