Merge "LatinIME: Update ukrainian layout." into cm-10.2 (9e58d716) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml/rowkeys_east_slavic3.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@
	<Key		<Key
	latin:keyLabel="с"		latin:keyLabel="с"
	latin:keyHintLabel="'"		latin:keyHintLabel="'"
	latin:additionalMoreKeys="'" />		latin:additionalMoreKeys="!text/more_keys_for_cyrillic_apostroph" />
	<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->		<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
	<Key		<Key
	latin:keyLabel="м"		latin:keyLabel="м"

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+17 −5

Original line number	Original line	Diff line number	Diff line
	@@ -250,6 +250,7 @@ public final class KeyboardTextsSet {
	/* 145 */ "more_keys_for_single_quote",		/* 145 */ "more_keys_for_single_quote",
	/* 146 */ "more_keys_for_double_quote",		/* 146 */ "more_keys_for_double_quote",
	/* 147 */ "more_keys_for_tablet_double_quote",		/* 147 */ "more_keys_for_tablet_double_quote",
			/* 148 */ "more_keys_for_cyrillic_apostroph",
	};		};

	private static final String EMPTY = "";		private static final String EMPTY = "";
	@@ -442,6 +443,8 @@ public final class KeyboardTextsSet {
	/* 145 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",		/* 145 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",
	/* 146 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",		/* 146 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
	/* 147 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",		/* 147 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
			// U+0027: "'" APOSTROPH
			/* 148 */ "'",
	};		};

	/* Language af: Afrikaans */		/* Language af: Afrikaans */
	@@ -2921,11 +2924,8 @@ public final class KeyboardTextsSet {
	/* 32 */ "\u0491",		/* 32 */ "\u0491",
	// U+0457: "ї" CYRILLIC SMALL LETTER YI		// U+0457: "ї" CYRILLIC SMALL LETTER YI
	/* 33 */ "\u0457",		/* 33 */ "\u0457",
	/* 34 */ null,		/* 34~ */
	// U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN		null, null, null, null, null, null, null, null,
	/* 35 */ "\u044A",
	/* 36~ */
	null, null, null, null, null, null,
	/* ~41 */		/* ~41 */
	// Label for "switch to alphabetic" key.		// Label for "switch to alphabetic" key.
	// U+0410: "А" CYRILLIC CAPITAL LETTER A		// U+0410: "А" CYRILLIC CAPITAL LETTER A
	@@ -2939,6 +2939,18 @@ public final class KeyboardTextsSet {
	/* ~47 */		/* ~47 */
	// U+20B4: "₴" HRYVNIA SIGN		// U+20B4: "₴" HRYVNIA SIGN
	/* 48 */ "\u20B4",		/* 48 */ "\u20B4",
			/* 49~ */
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null,
			/* ~147 */
			// U+0027: "'" APOSTROPH
			// U+02BC: "ʼ" CYRILLIC APOSTROPH
			/* 148 */ "',\u02BC",
	};		};

	/* Language vi: Vietnamese */		/* Language vi: Vietnamese */

tools/maketext/res/values-uk/donottranslate-more-keys.xml

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,8 +32,9 @@
	<string name="more_keys_for_cyrillic_ghe">ґ</string>		<string name="more_keys_for_cyrillic_ghe">ґ</string>
	<!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->		<!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->
	<string name="more_keys_for_east_slavic_row2_1">ї</string>		<string name="more_keys_for_east_slavic_row2_1">ї</string>
	<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->		<!-- U+0027: "'" APOSTROPH
	<string name="more_keys_for_cyrillic_soft_sign">ъ</string>		U+02BC: "ʼ" CYRILLIC APOSTROPH -->
			<string name="more_keys_for_cyrillic_apostroph">',ʼ</string>
	<!-- U+20B4: "₴" HRYVNIA SIGN -->		<!-- U+20B4: "₴" HRYVNIA SIGN -->
	<string name="keylabel_for_currency_generic">₴</string>		<string name="keylabel_for_currency_generic">₴</string>
	<!-- Label for "switch to alphabetic" key.		<!-- Label for "switch to alphabetic" key.

tools/maketext/res/values/donottranslate-more-keys.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -247,4 +247,6 @@
	<string name="more_keys_for_single_quote">!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes</string>		<string name="more_keys_for_single_quote">!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes</string>
	<string name="more_keys_for_double_quote">!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes</string>		<string name="more_keys_for_double_quote">!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes</string>
	<string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes</string>		<string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes</string>
			<!-- U+0027: "'" APOSTROPH -->
			<string name="more_keys_for_cyrillic_apostroph">'</string>
	</resources>		</resources>