# HG changeset patch # User Eugene Ostroukhov # Date 1269624330 25200 # Node ID 5a06888861c3028e6cb4f6edaba069a28fa94ca3 # Parent c035b31473c1682682f7f391f68d39157ac18999# Parent 7f932d48152115d8e0dae1f8e97c1a20f465e7dd Merged heads diff -r c035b31473c1 -r 5a06888861c3 org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch --- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch Thu Mar 25 14:10:40 2010 -0700 +++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch Fri Mar 26 10:25:30 2010 -0700 @@ -1,4 +1,4 @@ - + diff -r c035b31473c1 -r 5a06888861c3 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/deploy/PhoneTarget.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/deploy/PhoneTarget.java Thu Mar 25 14:10:40 2010 -0700 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/deploy/PhoneTarget.java Fri Mar 26 10:25:30 2010 -0700 @@ -47,7 +47,7 @@ if (isResolved()) { return MessageFormat.format("Bluetooth address: {0}", getAddr()); } else { - return "This deviced was used in the previous session and might not be available"; + return "This device was used in the previous session and might not be available"; } }