am 9a0e1df2: am 1644a3c7: Merge "Update French and Italian separators." into jb-mr1-dev

* commit '9a0e1df25c1f679b1458d2205d1bc09e2af0ccbd':
  Update French and Italian separators.
main
Jean Chalard 2012-08-03 08:11:05 -07:00 committed by Android Git Automerger
commit f4e139a7b5
2 changed files with 3 additions and 24 deletions

View File

@ -25,5 +25,7 @@
<!-- Symbols that should promote magic spaces into real space --> <!-- Symbols that should promote magic spaces into real space -->
<string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string> <string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>
<!-- Symbols that do NOT separate words --> <!-- Symbols that do NOT separate words -->
<string name="symbols_excluded_from_word_separators">\'</string> <!-- Note that this is identical to the default value, but since the above ones are different
and those variables only make sense together, this is kept here for readability. -->
<string name="symbols_excluded_from_word_separators">\'-</string>
</resources> </resources>

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2009, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Symbols that do NOT separate words -->
<string name="symbols_excluded_from_word_separators"></string>
</resources>