Merge "Fix curves tool" into gb-ub-photos-arches
diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml
index d2af918..b619220 100644
--- a/res/layout/trim_menu.xml
+++ b/res/layout/trim_menu.xml
@@ -23,8 +23,10 @@
android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/done"
+ android:text="@string/save"
+ android:textAllCaps="true"
+ android:textSize="14sp"
android:gravity="left|center_vertical"
- android:drawableLeft="@drawable/ic_menu_save_holo_light"
+ android:drawableLeft="@drawable/ic_menu_savephoto"
android:drawablePadding="8dp" />
</FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f64538..c56af3f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -495,9 +495,6 @@
<!-- Toast if the trimmed video is too short to trim. [CHAR LIMIT=80] -->
<string name="trim_too_short">Can not trim : target video is too short</string>
- <!-- Toast if the trimmed video is the same as the original one. [CHAR LIMIT=80] -->
- <string name="trim_too_long">Did not trim : the same length as origin</string>
-
<!-- Text to show with progress bar while stitching in Gallery -->
<string name="pano_progress_text">Rendering panorama</string>