Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorDa Risk <darisk972@gmail.com>
Mon, 31 Jan 2011 19:43:49 +0100
changeset 863 72df90388b3e
parent 862 cb6a21990a68 (diff)
parent 859 0a13b2f81fd8 (current diff)
child 864 deafac37ffa3
merge
--- a/AndroidManifest.xml	Fri Jan 28 15:42:52 2011 +0100
+++ b/AndroidManifest.xml	Mon Jan 31 19:43:49 2011 +0100
@@ -4,7 +4,7 @@
 	android:versionName="0.1.5-rc1">
 	<application android:label="@string/app_name"
 		android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
-		android:debuggable="true" android:name=".BeemApplication">
+		android:name=".BeemApplication">
 		<activity android:name=".ui.Login" android:label="@string/app_name"
 			android:launchMode="standard">
 			<intent-filter>
--- a/res/values-ru/strings.xml	Fri Jan 28 15:42:52 2011 +0100
+++ b/res/values-ru/strings.xml	Mon Jan 31 19:43:49 2011 +0100
@@ -178,7 +178,7 @@
 <string name="userinfo_label_re_subscription">Выслать приглашение ещё раз</string>
 <string name="userinfo_label_block">Заблокировать</string>
 <string name="userinfo_label_delete">Удалить</string>
-<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact?
 </string>
 <string name="userinfo_yes">Да</string>
 <string name="userinfo_no">Нет</string>
--- a/res/values/strings.xml	Fri Jan 28 15:42:52 2011 +0100
+++ b/res/values/strings.xml	Mon Jan 31 19:43:49 2011 +0100
@@ -130,8 +130,8 @@
 	<string name="SubscriptAccept">Subscription accepted</string>
 	<string name="SubscriptError">Subscription error</string>
 	<string name="SubscriptRefused">Subscription refused</string>
-	<string name="SubscriptText">%s wants to add you to his/her buddy list. Do you want to authorize him/her ?</string>
-	<string name="SubscriptTitle">Authorize buddy ?</string>
+	<string name="SubscriptText">%s wants to add you to his/her buddy list. Do you want to authorize him/her?</string>
+	<string name="SubscriptTitle">Authorize buddy?</string>
 
 	<!--  BeemChatManager -->
 	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
@@ -243,11 +243,11 @@
 	<string name="userinfo_label_block">Block</string>
 	<string name="userinfo_label_delete">Delete</string>
 	<string name="userinfo_resend">Suscription resend</string>
-	<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+	<string name="userinfo_sure2delete">Are you sure you want to delete this contact?
 	</string>
 	<string name="userinfo_yes">Yes</string>
 	<string name="userinfo_no">No</string>
-	<string name="userinfo_sureresend">Are you sure you want to resend invit ?</string>
+	<string name="userinfo_sureresend">Are you sure you want to resend invit?</string>
 
 	<string name="chat_name">Beem - Chat</string>
 	<string name="chat_input_default_value">Type your message</string>
@@ -280,7 +280,7 @@
 	<string name="privacy_list_select_dialog_buddies">Buddies</string>
 	<string name="privacy_list_select_dialog_groups">Groups</string>
 	<string name="privacy_list_select_dialog_delete">Delete</string>
-	<string name="privacy_list_delete_dialog_msg">Do you really want to delete the privacy list entitled \'%s\' ?</string>
+	<string name="privacy_list_delete_dialog_msg">Do you really want to delete the privacy list entitled \'%s\'?</string>
 	<string name="privacy_list_delete_dialog_yes">Yes</string>
 	<string name="privacy_list_delete_dialog_no">No</string>
BEEM-OTR