commit d7dbaa9cb6d6b511ad80ac770bc1de328ad95d76
author Jean Chalard <jchalard@google.com> Wed Nov 14 20:36:54 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 14 20:36:54 2012 -0800
tree 4137a20226f11bd64f9570194a1a336c96e4c879
parent b1844a57e1d05ac398beed2695b883d2f736cd13
parent e4958d5c185ecf3a4e953c4a20f0208ac396da56

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

* commit 'e4958d5c185ecf3a4e953c4a20f0208ac396da56':
  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 5288bd7..10feb71 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 9e07b22..f7802a8 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 -->