commit 1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1
author Ken Wakasa <kwakasa@google.com> Fri Nov 16 18:23:53 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 16 18:23:53 2012 -0800
tree d88e49619cee4c0ff10c0e36f346858e367127f7
parent 7acd310d02f060f3e3e29000db902dffb6b0df9c
parent 66cee1f92de0413756b8f306275d3508cd2b040f

am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev

* commit '66cee1f92de0413756b8f306275d3508cd2b040f':
  Revert "Correctly add double quote to the space strippers"

java/res/values-fr/donottranslate.xml

diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml
index 10feb71..5288bd7 100644
--- a/java/res/values-fr/donottranslate.xml
+++ b/java/res/values-fr/donottranslate.xml
@@ -21,7 +21,7 @@
     <!-- Symbols that should be swapped with a magic space -->
     <string name="weak_space_swapping_symbols">.,\")]}</string>
     <!-- Symbols that should strip a magic space -->
-    <string name="weak_space_stripping_symbols">&#x0009;&#x0020;\'\n-/_\"</string>
+    <string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\'\n-/_"</string>
     <!-- Symbols that should promote magic spaces into real space -->
     <string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>
     <!-- Symbols that do NOT separate words -->

java/res/values/donottranslate.xml

diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index f7802a8..9e07b22 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -23,7 +23,7 @@
     <!-- Symbols that should be swapped with a weak space -->
     <string name="weak_space_swapping_symbols">.,;:!?)]}\"</string>
     <!-- Symbols that should strip a weak space -->
-    <string name="weak_space_stripping_symbols">&#x0009;&#x0020;\n/_\'-\"@</string>
+    <string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\n/_\'-"@</string>
     <!-- Symbols that should convert weak spaces into real space -->
     <string name="phantom_space_promoting_symbols">([*&amp;{&lt;&gt;+=|</string>
     <!-- Symbols that do NOT separate words -->