Resolve merge conflicts

2014-11-12 09:41:12 +01:00
parent d317c5bf03 9d72314b9c
commit 88f139873c
26 changed files with 750 additions and 389 deletions
@@ -678,8 +678,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 			e.printStackTrace();
 			
 			stopConnection();
-			Dialog.displayDialog(this, getResources().getString(R.string.conn_fail_title),
-					getResources().getString(R.string.conn_fail_msg), true);
+			Dialog.displayDialog(this, getResources().getString(R.string.conn_terminated_title),
+					getResources().getString(R.string.conn_terminated_msg), true);
 		}
 	}