Merged to head

2011-11-14 23:27:04 -02:00
parent a4ae9e8fd5
commit c3cda97692
193 changed files with 8457 additions and 11274 deletions
@@ -41,7 +41,7 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:textSize="16dip"
      android:textColor="#fff"
-      android:text="@string/wait_for_fix"
+      android:text="@string/gps_wait_for_fix"
      android:layout_weight="0"/>
    </LinearLayout>
    <LinearLayout android:id="@+id/busypane"