Merge with head.

2011-07-05 16:33:45 -07:00
parent b588bb02f4
commit 29df8762e2
83 changed files with 3928 additions and 2855 deletions
@@ -409,4 +409,6 @@ limitations under the License.
  <string name="searching">S\'està cercant</string>
  <string name="sending">S\'està enviant</string>

+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">Cap</string>
 </resources>