Updated Japanese translations

Change-Id: Ic783b9de95ebf53dc2dcc15d8d057d68197e3031
Signed-off-by: rdgate <rdgate@gmail.com>
Updated Japanese translations

Change-Id: I139b27a2645cbd483869009114a1d88280c44c6f
Signed-off-by: rdgate <rdgate@gmail.com>
Mms - Insert Emoji and Smiley at Cursor position

Emoji and Smiley insertions in "Compose message" and "QuickMessage" append to the end of message text.
Enhance operation by inserting the Emoji or Smiley text at the current cursor position.

Patch Set 2:Revised with formatting and whitespace cleanup.
Patch Set 3:Add similar consistent 'insert' functionality for Template text insertion at cursor,
            Replace Tabs with spaces.

Change-Id: I651bc858be7a0807f5f53fb722597ecd85226126

Conflicts:

	src/com/android/mms/quickmessage/QuickMessagePopup.java
	src/com/android/mms/ui/ComposeMessageActivity.java

port from http://review.cyanogenmod.org/#/c/23981/

Signed-off-by: rdgate <rdgate@gmail.com>
Merge "Mms - Insert Emoji and Smiley at Cursor position" into jb-mr1
Mms: 'Open' in QR menu & resume sleep after sending msg from lockscreen

This adds an 'open' to the qr menu which allows you to enter
the current conversation(in turn clearing notification and
marking read/seen)

Second feature is optional and allows the device to be turned
back off when launching qr from lockscreen after its been relocked.
(device off->on->check notifs->use qr->relock->screen off)

Signed-off-by: bmc08gt <bmc08gt.teamb00sted@gmail.com>
Change-Id: Idd35e66f514ccf626995d2be5fc6af44500c5ba4
Port "Strip Unicode" feature from ICS branch into JB-MR1

This feature add support for strip unicode characters that are not
supported for 160 character SMS.

Change-Id: I10c8f35b86f009b5484754572ff6ea33c52a4df3
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Updated Japanese translations

- Add missing entries

Change-Id: I065885e2138f14b52fc1fc8c012c6c007fdf830e
Signed-off-by: rdgate <rdgate@gmail.com>
Merge branch 'aokp/jb-mr1' into jb-mr1-mod

Conflicts:
	res/values-ja/strings.xml
	src/com/android/mms/ui/ComposeMessageActivity.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java
	src/com/android/mms/ui/QuickReply.java

Change-Id: I56f77a32449b9dfc43f37379baeba4081def18b7