Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 317075e0 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Suppress warnings related to string resource"

parents c4b558d3 a95e306d

java/res/values-ar-sw600dp/config-spacing-and-punctuations.xml→java/res/values-ar-sw600dp/donottranslate-config-spacing-and-punctuations.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ 
    <!-- Symbols that are suggested between words -->

    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>

    <string name="suggested_punctuations">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>

</resources>

java/res/values-ar/config-spacing-and-punctuations.xml→java/res/values-ar/donottranslate-config-spacing-and-punctuations.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+060C: "،" ARABIC COMMA

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>

    <string name="suggested_punctuations">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>

</resources>

java/res/values-fa-sw600dp/config-spacing-and-punctuations.xml→java/res/values-fa-sw600dp/donottranslate-config-spacing-and-punctuations.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ 
    <!-- Symbols that are suggested between words -->

    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>

    <string name="suggested_punctuations">!,&#x061F;,:,&#x061B;,\",\',(|),)|(,-,/,@,_</string>

</resources>

java/res/values-fa/config-spacing-and-punctuations.xml→java/res/values-fa/donottranslate-config-spacing-and-punctuations.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
    <!-- U+061F: "؟" ARABIC QUESTION MARK

         U+060C: "،" ARABIC COMMA

         U+061B: "؛" ARABIC SEMICOLON -->

    <string name="suggested_punctuations" translatable="false">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>

    <string name="suggested_punctuations">!,&#x061F;,&#x060C;,:,&#x061B;,\",(|),)|(,\',-,/,@,_</string>

</resources>

java/res/values-fr-rCA/config-spacing-and-punctuations.xml→java/res/values-fr-rCA/donottranslate-config-spacing-and-punctuations.xml

+4 −4
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Symbols that are normally preceded by a space (used to add an auto-space before these) -->

    <!-- This is similar to French with the exception of "!" "?" and ";" which do not take a space before in Canadian French. Note that ":" does take a space before according to Canadian rules. -->

    <string name="symbols_preceded_by_space" translatable="false">([{&amp;:</string>

    <string name="symbols_preceded_by_space">([{&amp;:</string>

    <!-- Symbols that are normally followed by a space (used to add an auto-space after these) -->

    <string name="symbols_followed_by_space" translatable="false">.,;:!?)]}&amp;</string>

    <string name="symbols_followed_by_space">.,;:!?)]}&amp;</string>

    <!-- Symbols that separate words -->

    <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->

    <string name="symbols_word_separators" translatable="false">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>

    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>

    <!-- Word connectors -->

    <string name="symbols_word_connectors" translatable="false">\'-</string>

    <string name="symbols_word_connectors">\'-</string>

</resources>