release-request-95cbb47d-b12d-4748-8934-a5ed56cbe040-for-git_oc-dr1-release-4116076 snap-temp-L12600000075746614

Change-Id: I3f889747de702a0679c2f476c28452a1625ac317

174 files changed, 2260 insertions, 668 deletions

diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index bc20c7314..63d29b514 100644
--- a/java/com/android/dialer/callcomposer/CallComposerActivity.java
+++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java
@@ -26,10 +26,11 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
-import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v7.app.AppCompatActivity;
@@ -42,6 +43,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.QuickContactBadge;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -53,6 +55,8 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.UiUtil;
 import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
@@ -67,6 +71,7 @@ import com.android.dialer.protos.ProtoParsers;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.ViewUtil;
 import com.android.dialer.widget.DialerToolbar;
+import com.android.dialer.widget.LockableViewPager;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.io.File;
 
@@ -96,10 +101,18 @@ public class CallComposerActivity extends AppCompatActivity
   private static final String ARG_CALL_COMPOSER_CONTACT_BASE64 = "CALL_COMPOSER_CONTACT_BASE64";
 
   private static final String ENTRANCE_ANIMATION_KEY = "entrance_animation_key";
+  private static final String SEND_AND_CALL_READY_KEY = "send_and_call_ready_key";
   private static final String CURRENT_INDEX_KEY = "current_index_key";
   private static final String VIEW_PAGER_STATE_KEY = "view_pager_state_key";
   private static final String SESSION_ID_KEY = "session_id_key";
 
+  private final Handler timeoutHandler = ThreadUtil.getUiThreadHandler();
+  private final Runnable sessionStartedTimedOut =
+      () -> {
+        LogUtil.i("CallComposerActivity.sessionStartedTimedOutRunnable", "session never started");
+        setFailedResultAndFinish();
+      };
+
   private DialerContact contact;
   private Long sessionId = Session.NO_SESSION_ID;
 
@@ -111,10 +124,11 @@ public class CallComposerActivity extends AppCompatActivity
   private View sendAndCall;
   private TextView sendAndCallText;
 
+  private ProgressBar loading;
   private ImageView cameraIcon;
   private ImageView galleryIcon;
   private ImageView messageIcon;
-  private ViewPager pager;
+  private LockableViewPager pager;
   private CallComposerPagerAdapter adapter;
 
   private FrameLayout background;
@@ -124,6 +138,7 @@ public class CallComposerActivity extends AppCompatActivity
   private boolean shouldAnimateEntrance = true;
   private boolean inFullscreenMode;
   private boolean isSendAndCallHidingOrHidden = true;
+  private boolean sendAndCallReady;
   private int currentIndex;
 
   public static Intent newIntent(Context context, DialerContact contact) {
@@ -150,6 +165,7 @@ public class CallComposerActivity extends AppCompatActivity
     toolbar = findViewById(R.id.toolbar);
     sendAndCall = findViewById(R.id.send_and_call_button);
     sendAndCallText = findViewById(R.id.send_and_call_text);
+    loading = findViewById(R.id.call_composer_loading);
 
     interpolator = new FastOutSlowInInterpolator();
     adapter =
@@ -168,6 +184,7 @@ public class CallComposerActivity extends AppCompatActivity
 
     if (savedInstanceState != null) {
       shouldAnimateEntrance = savedInstanceState.getBoolean(ENTRANCE_ANIMATION_KEY);
+      sendAndCallReady = savedInstanceState.getBoolean(SEND_AND_CALL_READY_KEY);
       pager.onRestoreInstanceState(savedInstanceState.getParcelable(VIEW_PAGER_STATE_KEY));
       currentIndex = savedInstanceState.getInt(CURRENT_INDEX_KEY);
       sessionId = savedInstanceState.getLong(SESSION_ID_KEY, Session.NO_SESSION_ID);
@@ -212,6 +229,7 @@ public class CallComposerActivity extends AppCompatActivity
   protected void onPause() {
     super.onPause();
     getEnrichedCallManager().unregisterStateChangedListener(this);
+    timeoutHandler.removeCallbacks(sessionStartedTimedOut);
   }
 
   @Override
@@ -231,12 +249,36 @@ public class CallComposerActivity extends AppCompatActivity
         "state: %s",
         StateExtension.toString(state));
 
-    if (state == EnrichedCallManager.STATE_START_FAILED
-        || state == EnrichedCallManager.STATE_CLOSED) {
-      setFailedResultAndFinish();
+    switch (state) {
+      case EnrichedCallManager.STATE_STARTING:
+        timeoutHandler.postDelayed(sessionStartedTimedOut, getSessionStartedTimeoutMillis());
+        if (sendAndCallReady) {
+          showLoadingUi();
+        }
+        break;
+      case EnrichedCallManager.STATE_STARTED:
+        timeoutHandler.removeCallbacks(sessionStartedTimedOut);
+        if (sendAndCallReady) {
+          sendAndCall();
+        }
+        break;
+      case EnrichedCallManager.STATE_START_FAILED:
+      case EnrichedCallManager.STATE_CLOSED:
+        setFailedResultAndFinish();
+        break;
+      case EnrichedCallManager.STATE_MESSAGE_FAILED:
+      case EnrichedCallManager.STATE_MESSAGE_SENT:
+      case EnrichedCallManager.STATE_NONE:
+      default:
+        break;
     }
   }
 
+  @VisibleForTesting
+  public long getSessionStartedTimeoutMillis() {
+    return ConfigProviderBindings.get(this).getLong("ec_session_started_timeout", 10_000);
+  }
+
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
@@ -262,6 +304,8 @@ public class CallComposerActivity extends AppCompatActivity
   @Override
   public void sendAndCall() {
     if (!sessionReady()) {
+      sendAndCallReady = true;
+      showLoadingUi();
       LogUtil.i("CallComposerActivity.onClick", "sendAndCall pressed, but the session isn't ready");
       Logger.get(this)
           .logImpression(
@@ -329,6 +373,11 @@ public class CallComposerActivity extends AppCompatActivity
     }
   }
 
+  private void showLoadingUi() {
+    loading.setVisibility(View.VISIBLE);
+    pager.setSwipingLocked(true);
+  }
+
   private boolean sessionReady() {
     Session session = getEnrichedCallManager().getSession(sessionId);
     return session != null && session.getState() == EnrichedCallManager.STATE_STARTED;
@@ -363,10 +412,6 @@ public class CallComposerActivity extends AppCompatActivity
     }
     if (currentIndex == CallComposerPagerAdapter.INDEX_MESSAGE) {
       UiUtil.hideKeyboardFrom(this, windowContainer);
-    } else if (position == CallComposerPagerAdapter.INDEX_MESSAGE
-        && inFullscreenMode
-        && !isLandscapeLayout()) {
-      UiUtil.openKeyboardFrom(this, windowContainer);
     }
     currentIndex = position;
     CallComposerFragment fragment = (CallComposerFragment) adapter.instantiateItem(pager, position);
@@ -385,6 +430,7 @@ public class CallComposerActivity extends AppCompatActivity
     super.onSaveInstanceState(outState);
     outState.putParcelable(VIEW_PAGER_STATE_KEY, pager.onSaveInstanceState());
     outState.putBoolean(ENTRANCE_ANIMATION_KEY, shouldAnimateEntrance);
+    outState.putBoolean(SEND_AND_CALL_READY_KEY, sendAndCallReady);
     outState.putInt(CURRENT_INDEX_KEY, currentIndex);
     outState.putLong(SESSION_ID_KEY, sessionId);
   }
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
index ecdc25822..1002b27b1 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -91,17 +91,17 @@ public class CameraComposerFragment extends CallComposerFragment
       LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle bundle) {
     View root = inflater.inflate(R.layout.fragment_camera_composer, container, false);
     permissionView = root.findViewById(R.id.permission_view);
-    loading = (ProgressBar) root.findViewById(R.id.loading);
-    cameraView = (CameraMediaChooserView) root.findViewById(R.id.camera_view);
+    loading = root.findViewById(R.id.loading);
+    cameraView = root.findViewById(R.id.camera_view);
     shutter = cameraView.findViewById(R.id.camera_shutter_visual);
-    exitFullscreen = (ImageButton) cameraView.findViewById(R.id.camera_exit_fullscreen);
-    fullscreen = (ImageButton) cameraView.findViewById(R.id.camera_fullscreen);
-    swapCamera = (ImageButton) cameraView.findViewById(R.id.swap_camera_button);
-    capture = (ImageButton) cameraView.findViewById(R.id.camera_capture_button);
-    cancel = (ImageButton) cameraView.findViewById(R.id.camera_cancel_button);
-    focus = (RenderOverlay) cameraView.findViewById(R.id.focus_visual);
-    preview = (CameraPreviewHost) cameraView.findViewById(R.id.camera_preview);
-    previewImageView = (ImageView) root.findViewById(R.id.preview_image_view);
+    exitFullscreen = cameraView.findViewById(R.id.camera_exit_fullscreen);
+    fullscreen = cameraView.findViewById(R.id.camera_fullscreen);
+    swapCamera = cameraView.findViewById(R.id.swap_camera_button);
+    capture = cameraView.findViewById(R.id.camera_capture_button);
+    cancel = cameraView.findViewById(R.id.camera_cancel_button);
+    focus = cameraView.findViewById(R.id.focus_visual);
+    preview = cameraView.findViewById(R.id.camera_preview);
+    previewImageView = root.findViewById(R.id.preview_image_view);
 
     exitFullscreen.setOnClickListener(this);
     fullscreen.setOnClickListener(this);
@@ -113,8 +113,8 @@ public class CameraComposerFragment extends CallComposerFragment
     if (!PermissionsUtil.hasCameraPermissions(getContext())) {
       LogUtil.i("CameraComposerFragment.onCreateView", "Permission view shown.");
       Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DISPLAYED);
-      ImageView permissionImage = (ImageView) permissionView.findViewById(R.id.permission_icon);
-      TextView permissionText = (TextView) permissionView.findViewById(R.id.permission_text);
+      ImageView permissionImage = permissionView.findViewById(R.id.permission_icon);
+      TextView permissionText = permissionView.findViewById(R.id.permission_text);
       allowPermission = permissionView.findViewById(R.id.allow);
 
       allowPermission.setOnClickListener(this);
@@ -345,6 +345,12 @@ public class CameraComposerFragment extends CallComposerFragment
       previewImageView.setVisibility(View.GONE);
     }
 
+    if (cameraDirection == CameraInfo.CAMERA_FACING_FRONT) {
+      swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_rear));
+    } else {
+      swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_facing));
+    }
+
     if (cameraUri == null && isCameraAvailable) {
       CameraManager.get().resetPreview();
       cancel.setVisibility(View.GONE);
diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java
index 977f063df..5915ce331 100644
--- a/java/com/android/dialer/callcomposer/camera/CameraManager.java
+++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java
@@ -509,54 +509,61 @@ public class CameraManager implements FocusOverlayManager.Listener {
     }.execute();
   }
 
-  /** Updates the orientation of the camera to match the orientation of the device */
-  private void updateCameraOrientation() {
-    if (mCamera == null || mCameraPreview == null || mTakingPicture) {
-      return;
+  /**
+   * Updates the orientation of the {@link Camera} w.r.t. the orientation of the device and the
+   * orientation that the physical camera is mounted on the device.
+   *
+   * @param camera that needs to be reorientated
+   * @param screenRotation rotation of the physical device
+   * @param cameraOrientation {@link CameraInfo#orientation}
+   * @param cameraIsFrontFacing {@link CameraInfo#CAMERA_FACING_FRONT}
+   * @return rotation that images returned from {@link
+   *     android.hardware.Camera.PictureCallback#onPictureTaken(byte[], Camera)} will be rotated.
+   */
+  @VisibleForTesting
+  static int updateCameraRotation(
+      @NonNull Camera camera,
+      int screenRotation,
+      int cameraOrientation,
+      boolean cameraIsFrontFacing) {
+    Assert.isNotNull(camera);
+    Assert.checkArgument(cameraOrientation % 90 == 0);
+
+    int rotation = screenRotationToDegress(screenRotation);
+    boolean portrait = rotation == 0 || rotation == 180;
+
+    if (!portrait && !cameraIsFrontFacing) {
+      rotation += 180;
     }
+    rotation += cameraOrientation;
+    rotation %= 360;
 
-    final WindowManager windowManager =
-        (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE);
+    // Rotate the camera
+    if (portrait && cameraIsFrontFacing) {
+      camera.setDisplayOrientation((rotation + 180) % 360);
+    } else {
+      camera.setDisplayOrientation(rotation);
+    }
+
+    // Rotate the images returned when a picture is taken
+    Camera.Parameters params = camera.getParameters();
+    params.setRotation(rotation);
+    camera.setParameters(params);
+    return rotation;
+  }
 
-    int degrees;
-    switch (windowManager.getDefaultDisplay().getRotation()) {
+  private static int screenRotationToDegress(int screenRotation) {
+    switch (screenRotation) {
       case Surface.ROTATION_0:
-        degrees = 0;
-        mCamera.setDisplayOrientation(90);
-        break;
+        return 0;
       case Surface.ROTATION_90:
-        degrees = 90;
-        break;
+        return 90;
       case Surface.ROTATION_180:
-        degrees = 180;
-        break;
+        return 180;
       case Surface.ROTATION_270:
-        degrees = 270;
-        mCamera.setDisplayOrientation(180);
-        break;
+        return 270;
       default:
-        throw Assert.createAssertionFailException("");
-    }
-
-    // The clockwise rotation angle relative to the orientation of the camera. This affects
-    // pictures returned by the camera in Camera.PictureCallback.
-    if (mCameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-      mRotation = (mCameraInfo.orientation + degrees) % 360;
-    } else { // back-facing
-      mRotation = (mCameraInfo.orientation - degrees + 360) % 360;
-    }
-    try {
-      final Camera.Parameters params = mCamera.getParameters();
-      params.setRotation(mRotation);
-      mCamera.setParameters(params);
-    } catch (final RuntimeException e) {
-      LogUtil.e(
-          "CameraManager.updateCameraOrientation",
-          "RuntimeException in CameraManager.updateCameraOrientation",
-          e);
-      if (mListener != null) {
-        mListener.onCameraError(ERROR_OPENING_CAMERA, e);
-      }
+        throw Assert.createIllegalStateFailException("Invalid surface rotation.");
     }
   }
 
@@ -586,7 +593,14 @@ public class CameraManager implements FocusOverlayManager.Listener {
     }
     try {
       mCamera.stopPreview();
-      updateCameraOrientation();
+      if (!mTakingPicture) {
+        mRotation =
+            updateCameraRotation(
+                mCamera,
+                getScreenRotation(),
+                mCameraInfo.orientation,
+                mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT);
+      }
 
       final Camera.Parameters params = mCamera.getParameters();
       final Camera.Size pictureSize = chooseBestPictureSize();
@@ -635,6 +649,14 @@ public class CameraManager implements FocusOverlayManager.Listener {
     }
   }
 
+  private int getScreenRotation() {
+    return mCameraPreview
+        .getContext()
+        .getSystemService(WindowManager.class)
+        .getDefaultDisplay()
+        .getRotation();
+  }
+
   public boolean isCameraAvailable() {
     return mCamera != null && !mTakingPicture && mIsHardwareAccelerationSupported;
   }
@@ -672,7 +694,14 @@ public class CameraManager implements FocusOverlayManager.Listener {
 
     @Override
     public void onOrientationChanged(final int orientation) {
-      updateCameraOrientation();
+      if (!mTakingPicture) {
+        mRotation =
+            updateCameraRotation(
+                mCamera,
+                getScreenRotation(),
+                mCameraInfo.orientation,
+                mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT);
+      }
     }
   }
 
diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
index b5542ab6c..7cb6921e9 100644
--- a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
+++ b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
@@ -98,11 +98,11 @@ public class ImagePersistTask extends FallibleAsyncTask<Void, Void, Uri> {
       // Couldn't get exif tags, not the end of the world
     }
 
+    ExifInterface.OrientationParams params = ExifInterface.getOrientationParams(orientation);
     Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length);
     final int clippedWidth;
     final int clippedHeight;
-    boolean invert = ExifInterface.getOrientationParams(orientation).invertDimensions;
-    if (invert) {
+    if (params.invertDimensions) {
       Assert.checkState(mWidth == bitmap.getHeight());
       Assert.checkState(mHeight == bitmap.getWidth());
       clippedWidth = (int) (mHeight * mHeightPercent);
@@ -120,7 +120,7 @@ public class ImagePersistTask extends FallibleAsyncTask<Void, Void, Uri> {
     mHeight = clippedHeight;
 
     Matrix matrix = new Matrix();
-    matrix.postRotate(invert ? 90 : 0);
+    matrix.postRotate(params.rotation);
 
     Bitmap clippedBitmap =
         Bitmap.createBitmap(
diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
index 92dee1c94..1bf9519ad 100644
--- a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
+++ b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
@@ -286,7 +286,7 @@ public class ExifInterface {
 
   /** Wrapper class to define some orientation parameters. */
   public static class OrientationParams {
-    int rotation = 0;
+    public int rotation = 0;
     int scaleX = 1;
     int scaleY = 1;
     public boolean invertDimensions = false;
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
index a4198fcf9..8169a3ded 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
@@ -24,7 +24,7 @@
   <FrameLayout
     android:id="@+id/mediapicker_enabled"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content">
 
     <!-- Default to using the hardware rendered camera preview, we will fall back to
     SoftwareCameraPreview in CameraMediaChooserView if needed -->
@@ -37,14 +37,14 @@
     <com.android.dialer.callcomposer.camera.camerafocus.RenderOverlay
       android:id="@+id/focus_visual"
       android:layout_width="match_parent"
-      android:layout_height="match_parent" />
+      android:layout_height="match_parent"/>
 
     <View
       android:id="@+id/camera_shutter_visual"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:background="@android:color/white"
-      android:visibility="gone" />
+      android:visibility="gone"/>
 
     <ImageView
       android:id="@+id/preview_image_view"
@@ -71,7 +71,8 @@
         android:layout_marginEnd="@dimen/camera_view_button_margin"
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_white_48"
-        android:background="?android:selectableItemBackgroundBorderless"/>
+        android:background="?android:selectableItemBackgroundBorderless"
+        android:contentDescription="@string/description_camera_switch_full_screen"/>
 
       <ImageButton
         android:id="@+id/camera_exit_fullscreen"
@@ -82,7 +83,8 @@
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_exit_white_48"
         android:visibility="gone"
-        android:background="?android:selectableItemBackgroundBorderless"/>
+        android:background="?android:selectableItemBackgroundBorderless"
+        android:contentDescription="@string/description_camera_switch_preview_screen"/>
 
       <ImageButton
         android:id="@+id/camera_capture_button"
@@ -93,7 +95,7 @@
         android:background="?android:selectableItemBackgroundBorderless"
         android:src="@drawable/ic_capture"
         android:scaleType="fitXY"
-        android:contentDescription="@string/camera_take_picture"/>
+        android:contentDescription="@string/description_camera_take_picture"/>
 
       <ImageButton
         android:id="@+id/swap_camera_button"
@@ -103,8 +105,7 @@
         android:layout_marginStart="@dimen/camera_view_button_margin"
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/front_back_switch_button_animation"
-        android:background="@drawable/transparent_button_background"
-        android:contentDescription="@string/camera_switch_camera_rear"/>
+        android:background="@drawable/transparent_button_background"/>
 
       <ImageButton
         android:id="@+id/camera_cancel_button"
@@ -116,7 +117,7 @@
         android:visibility="gone"
         android:background="@drawable/transparent_button_background"
         android:src="@drawable/quantum_ic_undo_white_48"
-        android:contentDescription="@string/camera_cancel_recording" />
+        android:contentDescription="@string/description_camera_cancel_photo" />
     </FrameLayout>
   </FrameLayout>
 
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
index 3892a2089..f6326c1ad 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skakel na volskerm-kamera oor"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knoppie is nou voorste kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knoppie is nou agterste kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop video-opname"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Gebruik tans voorste kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Gebruik tans agterste kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Neem foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skakel oor na volskerm-kamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skakel oor na kameravoorskou"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skakel oor na voorste kamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skakel oor na agterste kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Neem foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Neem foto weer"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
index e2717986e..87c70c75b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ወደ ሙሉ ማያ ገጽ ካሜራ ቀይር"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"አዝራር አሁን የፊት ካሜራ ነው"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"አዝራር አሁን የኋላ ካሜራ ነው"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ቪዲዮ መቅዳትን አቁም"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"የፊት ካሜራ በመጠቀም ላይ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"የኋላ ካሜራ በመጠቀም ላይ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ፎቶ ያንሱ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ወደ የፊት ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ወደ የኋላ ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ፎቶ ያንሱ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ፎቶ በድጋሚ ያንሱ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
index a045a1141..fa27db7b6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"التبديل إلى الكاميرا بملء الشاشة"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"يشير الزر الآن إلى الكاميرا الأمامية"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"يشير الزر الآن إلى الكاميرا الخلفية"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"إيقاف تسجيل الفيديو"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"استخدام الكاميرا الأمامية"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"استخدام الكاميرا الخلفية"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"التقاط صورة"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"التبديل إلى الكاميرا بملء الشاشة"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"التبديل إلى معاينة الكاميرا"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"تبديل إلى الكاميرا الأمامية"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"تبديل مرة أخرى إلى الكاميرا الأمامية"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"التقاط صورة"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"إعادة التقاط الصورة"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
index 514463c4d..bfbf204cd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tam ekranlı kameraya keçin"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Düymə indi ön kameradır"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Düymə indi arxa kameradır"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video qeydi dayandırın"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ön kamera istifadə olunur"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Arxa kamera istifadə olunur"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotoşəkil çəkin"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekranlı kameraya keçin"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizləməsinə keçin"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya keçin"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arxa kameraya keçin"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto çəkin"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotonu yenidən çəkin"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
index aad8d9dd8..565b18810 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Pređite na prikaz kamere preko celog ekrana"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dugme sad aktivira prednju kameru"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dugme sad aktivira zadnju kameru"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavite snimanje videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Koristimo prednju kameru"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Koristimo zadnju kameru"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimite sliku"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebacite na prikaz kamere preko celog ekrana"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebacite na pregled kamere"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebacite na prednju kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebacite na zadnju kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimite sliku"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimite sliku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
index 108ab7f63..f15bbb945 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Пераключыцца на поўнаэкранную камеру"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Кнопка зараз замацавана за пярэдняй камерай"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Кнопка зараз замацавана за задняй камерай"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Спыніць запіс відэа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Выкарыстанне пярэдняй камеры"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Выкарыстанне задняй камеры"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зрабіць фота"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пераключыцца на поўнаэкранную камеру"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пераключыцца ў рэжым перадпрагляду камеры"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пераключыцца на пярэднюю камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пераключыцца на заднюю камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зрабіць фота"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зрабіць фота яшчэ раз"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
index e965ed9b3..92352ffdb 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Превключване към камера на цял екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Бутонът сега е за предната камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Бутонът сега е за задната камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Спиране на видеозаписа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Използва се предната камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Използва се задната камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Правене на снимка"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Превключване към камера на цял екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Превключване към визуализация на камерата"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Превключване към предната камера"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Превключване към задната камера."</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимане"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Повторно снимане"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
index 447b7e36b..83774c767 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"পূর্ণ স্ক্রীন ক্যামেরাতে পাল্টান"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"বোতামটিকে এখন সামনের ক্যামেরার জন্য ব্যবহার করা হবে"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"বোতামটিকে এখন পিছনের ক্যামেরার জন্য ব্যবহার করা হবে"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ভিডিও রেকর্ডিং বন্ধ করুন"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"সামনের ক্যামেরা ব্যবহার করা হচ্ছে"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"পিছনের ক্যামেরা ব্যবহার করা হচ্ছে"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ফটো তুলুন"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"সম্পূর্ণ স্ক্রীন জুড়ে ক্যামেরা খুলুন"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ক্যামেরার পূর্বরূপ মোডে পাল্টান"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"সামনের ক্যামেরাতে পাল্টান"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"পিছনের ক্যামেরাতে পাল্টান"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ফটো তুলুন"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"আবার ফটো তুলুন"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
index 8946f4f4d..c77a5de8d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prebaci na kameru preko cijelog ekrana"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dugme je sada prednja kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dugme je sada zadnja kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavi snimanje videozapisa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Koristi se prednja kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Koristi se zadnja kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimi fotografiju"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na kameru preko cijelog ekrana"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled kamere"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednju kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnju kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimi fotografiju"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
index 6d8ffdc4e..39c069b88 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Canvia a la càmera en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botó ara és la càmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botó ara és la càmera posterior"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Deixa d\'enregistrar el vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"S\'està utilitzant la càmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"S\'està utilitzant la càmera posterior"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fes una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Canvia a la càmera en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Canvia a la previsualització de la càmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Canvia a la càmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Canvia a la càmera posterior"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fes una foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Torna a fer la foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
index 0e3110809..222eb812e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Přepnout na fotoaparát na celou obrazovku"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tlačítko nyní funguje pro přední fotoaparát"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tlačítko nyní funguje pro zadní fotoaparát"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zastavit natáčení videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Používá se přední fotoaparát"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Používá se zadní fotoaparát"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Vyfotit"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Přepnout na fotoaparát na celou obrazovku"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Přepnout na náhled fotoaparátu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Přepnout na přední fotoaparát"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Přepnout na zadní fotoaparát"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Vyfotit"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znovu vyfotit"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
index ca5a79e89..0de7e0861 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skift til kamera i fuld skærm"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knappen er nu frontkamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knappen er nu bagsidekamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stands optagelse af video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruger frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruger bagsidekameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tag billede"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skift til kamera i fuld skærm"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skift til forhåndsvisning af kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skift til kamera på forsiden"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skift til kamera på bagsiden"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tag billede"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tag billedet om"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
index 53d22eba5..1b0d63906 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Zur Vollbildkamera wechseln"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Schaltfläche ist jetzt Frontkamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Schaltfläche ist jetzt Rückkamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videoaufzeichnung beenden"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Frontkamera wird verwendet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Rückkamera wird verwendet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto aufnehmen"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Zur Vollbildkamera wechseln"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Zur Kameravorschau wechseln"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Zur Frontkamera wechseln"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Zur Rückkamera wechseln"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto aufnehmen"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto neu aufnehmen"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
index 5763dec95..d657f936f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Το κουμπί είναι τώρα η μπροστινή κάμερα"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Το κουμπί είναι τώρα η πίσω κάμερα"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Διακοπή εγγραφής βίντεο"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Χρήση μπροστινής κάμερας"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Χρήση πίσω κάμερας"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Λήψη φωτογραφίας"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Εναλλαγή σε προεπισκόπηση κάμερας"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Εναλλαγή σε κάμερα πρόσοψης"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Εναλλαγή σε πίσω κάμερα"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Λήψη φωτογραφίας"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Επανάληψη λήψης φωτογραφίας"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
index 5b8b4aa26..9e76a69a5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
index 5b8b4aa26..9e76a69a5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
index 5b8b4aa26..9e76a69a5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
index a98e74c08..f10356496 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar a cámara en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botón cambió a la cámara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botón cambió a la cámara trasera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Detener la grabación de video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando la cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando la cámara trasera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tomar una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a cámara en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a vista previa de la cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a cámara trasera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tomar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Volver a tomar foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
index 5c4391ebc..5afb8c8c3 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar a cámara en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botón se usa ahora para la cámara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botón se usa ahora para la cámara trasera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Detener la grabación de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Estás utilizando la cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Estás utilizando la cámara trasera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Hacer una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a la cámara en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a la vista previa de la cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a la cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a la cámara trasera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Hacer una foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repetir la foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
index d82dcd5df..d4c37fee9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Täisekraaniga kaamerale lülitamine"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nuppu kasutatakse nüüd esikaamera jaoks"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nuppu kasutatakse nüüd tagakaamera jaoks"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video salvestamise peatamine"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Esikaamera kasutamine"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Tagakaamera kasutamine"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto jäädvustamine"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Täisekraaniga kaamerale lülitumine"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kaamera eelvaatele lülitumine"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Esikaamerale lülitumine"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Tagakaamerale lülitumine"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto jäädvustamine"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto uuesti jäädvustamine"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
index b3c20c9e1..4271983ed 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Erabili pantaila osoko kamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Orain, aurreko kamera erabiltzeko da botoia"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Orain, atzeko kamera erabiltzeko da botoia"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Utzi bideoa grabatzeari"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Aurreko kamera erabiltzen"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Atzeko kamera erabiltzen"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Atera argazkia"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Erabili pantaila osoko kamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Erabili kameraren aurrebista"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Erabili aurreko kamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Erabili atzeko kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Atera argazkia"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atera berriro argazkia"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
index 24e757bae..5d5877101 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"جابه‌جایی به دوربین تمام صفحه"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"اکنون دکمه، دوربین جلو است"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"اکنون دکمه، دوربین عقب است"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"توقف ضبط ویدیو"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"استفاده از دوربین جلو"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"استفاده از دوربین عقب"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"عکس گرفتن"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"رفتن به دوربین تمام صفحه"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"رفتن به پیش‌نمایش دوربین"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"رفتن به دوربین جلو"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"رفتن به دوربین عقب"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"عکس گرفتن"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"عکس گرفتن مجدد"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
index 5a3ddd8ce..9d7cb0922 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Siirry koko näytön kameraan"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Painikkeeseen on nyt määritetty etukamera."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Painikkeeseen on nyt määritetty takakamera."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Lopeta videon tallentaminen"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Etukamera käytössä"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Takakamera käytössä"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ota kuva"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Siirry koko näytön kameraan"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Siirry kameran esikatseluun"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Vaihda etukameraan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Vaihda takakameraan"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ota kuva"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ota kuva uudelleen"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
index f0e644e18..b20284080 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passer au mode plein écran de l\'appareil photo"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Le bouton est maintenant utilisé pour l\'appareil photo avant"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Le bouton est maintenant utilisé pour l\'appareil photo arrière"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Arrêter l\'enregistrement vidéo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Utilisation de la caméra avant"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Utilisation de la caméra arrière"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Prendre une photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer au mode Plein écran de l\'appareil photo"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer au mode Aperçu de l\'appareil photo"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passer à l\'appareil photo avant"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passer à l\'appareil photo arrière"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
index 72de07f44..a9cfe7124 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passer en caméra plein écran"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Le bouton affiche désormais la caméra frontale."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Le bouton affiche désormais la caméra arrière."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Arrêter l\'enregistrement vidéo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Caméra frontale activée"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Caméra arrière activée"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Prendre une photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer en mode plein écran"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer en mode aperçu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Utiliser la caméra avant"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Utiliser la caméra arrière"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
index 2ab1ef04a..3568a0fc3 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar á cámara de pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Agora o botón é a cámara dianteira"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Agora o botón é a cámara traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Deter gravación de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Estase utilizando a cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Estase utilizando a cámara traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambia á cámara de pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambia á vista previa da cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambia á cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambia á cámara traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tira unha foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repite a foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
index 60780d940..88037b582 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"બટન હવે આગળનો કૅમેરો છે"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"બટન હવે પાછળનો કૅમેરો છે"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"વિડિઓ રેકોર્ડિંગ બંધ કરો"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"આગળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"પાછળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ફોટો લો"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"પાછળના કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ફોટો લો"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ફોટો ફરીથી લો"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
index cf89a7d16..09a441f08 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रीन कैमरा पर स्विच करें"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटन अब सामने का कैमरा है"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटन अब पीछे का कैमरा है"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"वीडियो रिकॉर्ड करना बंद करें"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"आगे वाले कैमरे का उपयोग करना"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"पीछे वाले कैमरे का उपयोग करना"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"फ़ोटो लें"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कैमरे में बदलें"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कैमरा पूर्वावलोकन में बदलें"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"सामने वाले कैमरे में बदलें"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पीछे वाले कैमरे में बदलें"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"फ़ोटो लें"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फि‍र से फ़ोटो लें"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
index 3d59fd40f..2dca9bd45 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prebaci na fotoaparat na punom zaslonu"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Gumb je sada za prednji fotoaparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Gumb je sada za stražnji fotoaparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavi snimanje videozapisa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Upotreba prednje kamere"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Upotreba stražnje kamere"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimi fotografiju"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na prikaz fotoaparata preko cijelog zaslona"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled fotoaparata"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednji fotoaparat"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnji fotoaparat"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovno snimi fotografiju"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
index 1639ca7d2..5007b3f73 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Váltás teljes képernyős kameranézetre"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"A gomb beállítása jelenleg: elülső kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"A gomb beállítása jelenleg: hátsó kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videofelvétel leállítása"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Első kamera használata"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Hátsó kamera használata"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotó készítése"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Váltás teljes képernyős kameranézetre"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Váltás kamera-előnézetre"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Váltás az első kamerára"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Váltás a hátsó kamerára"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotó készítése"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Új felvétel"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
index 1da5c684d..2c1bd79e6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Միացնել լիաէկրան ռեժիմը"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Կոճակն այժմ առջևի տեսախցիկը միացնելու կոճակն է"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Կոճակն այժմ հետևի տեսախցիկը միացնելու կոճակն է"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Դադարեցնել տեսագրումը"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Օգտագործվում է առջևի տեսախցիկը"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Օգտագործվում է հետևի տեսախցիկը"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Լուսանկարել"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Միացնել լիաէկրան ռեժիմը"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Միացնել նախադիտման ռեժիմը"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Միացնել առջևի տեսախցիկը"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Միացնել հետևի տեսախցիկը"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Լուսանկարել"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Նորից լուսանկարել"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
index 6073d8e3e..4c922cd41 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Beralih ke kamera layar penuh"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tombol kini berfungsi untuk kamera depan"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tombol kini berfungsi untuk kamera belakang"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Berhenti merekam video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Menggunakan kamera depan"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Menggunakan kamera belakang"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ambil foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera layar penuh"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratinjau kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera depan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera belakang"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil ulang foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
index d16b2e206..c796d2295 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skipta yfir í myndavél á öllum skjánum"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Hnappurinn er nú fremri myndavél"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Hnappurinn er nú aftari myndavél"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stöðva upptöku myndskeiðs"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Notar fremri myndavél"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Notar aftari myndavél"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Taka mynd"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skipta yfir í myndavél á öllum skjánum"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skipta yfir í forskoðun á myndavél"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skipta yfir í fremri myndavél"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skipta yfir í aftari myndavél"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Taka mynd"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Taka mynd aftur"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
index 63fac0711..abf5d3f5e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passa alla fotocamera a schermo intero"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Il pulsante viene ora utilizzato per la fotocamera frontale"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Il pulsante viene ora utilizzato per la fotocamera posteriore"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Interrompi registrazione video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"In uso la fotocamera frontale"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"In uso la fotocamera posteriore"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Scatta foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passa alla fotocamera a schermo intero"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passa all\'anteprima della fotocamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passa alla fotocamera anteriore"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passa alla fotocamera posteriore"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Scatta foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Scatta foto di nuovo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
index 3db2e9461..e6aed2e96 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"מעבר למצלמה במסך מלא"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"הלחצן מוגדר עכשיו למצלמה הקדמית"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"הלחצן מוגדר עכשיו למצלמה האחורית"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"עצירה של צילום הווידאו"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"באמצעות המצלמה הקדמית"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"באמצעות המצלמה האחורית"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"צילום תמונה"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"מעבר למצלמה במסך מלא"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"מעבר לתצוגה מקדימה של המצלמה"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"מעבר למצלמה הקדמית"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"מעבר למצלמה האחורית"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"צילום תמונה"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"צילום מחדש של התמונה"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
index ffb3a1762..85ef3c8d7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"全画面カメラに切り替え"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"現在、ボタンは前面カメラになっています"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"現在、ボタンは背面カメラになっています"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"録画を停止"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"前面カメラを使用しています"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"背面カメラを使用しています"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"写真を撮る"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"全画面カメラに切り替えます"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"カメラのプレビューに切り替えます"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"前面カメラに切り替えます"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"背面カメラに切り替えます"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"写真を撮影します"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"写真を撮り直します"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
index 6a94b656c..edaf33ffe 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"სრულეკრანიან კამერაზე გადართვა"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ახლა ღილაკი გამოიყენება წინა კამერისთვის"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ახლა ღილაკი გამოიყენება უკანა კამერისთვის"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ვიდეოს ჩაწერის შეჩერება"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"თქვენ იყენებთ წინა კამერას"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"თქვენ იყენებთ უკანა კამერას"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ფოტოს გადაღება"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"სრულეკრანიან კამერაზე გადართვა"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"კამერის წინასწარ ხედზე გადართვა"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"წინა კამერაზე გადართვა"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"უკანა კამერაზე გადართვა"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ფოტოს გადაღება"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ფოტოს ხელახლა გადაღება"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
index 22b89fdbf..795a06392 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Толық экранды камераға ауысу"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Түйме – енді алдыңғы камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Түйме – енді артқы камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Бейне жазуды тоқтату"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Алдыңғы камера қолданылуда"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Артқы камера қолданылуда"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Суретке түсіру"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Толық экранды камераға ауысу"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераның алдын ала көру режиміне ауысу"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Камераның анфас режиміне ауысу"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Камераның қалыпты режиміне ауысу"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Суретке түсіру"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Суретке қайта түсіру"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
index dd547ddc4..377f885cb 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ឥឡូវ ប៊ូតុង​ស្ថិត​នៅ​​កាមេរ៉ា​មុខ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ឥឡូវ ប៊ូតុងស្ថិត​នៅ​កាមេរ៉ា​ក្រោយ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"បញ្ឈប់​ការ​ថត​វីដេអូ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"កំពុង​ប្រើ​ប្រាស់​កាមេរ៉ា​មុខ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"កំពុង​ប្រើប្រាស់​​​កាមេរ៉ា​ក្រោយ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ថតរូប"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ប្តូរទៅកាមេរ៉ាខាងក្រោយ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ថតរូប"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ថតរូប​ឡើងវិញ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
index 471cfc9db..1f5d1ea54 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ಬಟನ್ ಈಗ ಮುಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ಬಟನ್ ಈಗ ಹಿಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ವೀಡಿಯೊ ರೆಕಾರ್ಡಿಂಗ್ ನಿಲ್ಲಿಸಿ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ಮುಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ಹಿಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
index bb5e64dbc..1b675e746 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"전체화면 카메라로 전환"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"현재 버튼: 전면 카메라"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"현재 버튼: 후면 카메라"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"동영상 녹화 중지"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"전면 카메라 사용 중"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"후면 카메라 사용 중"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"사진 촬영"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"전체화면 카메라로 전환"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"카메라 미리보기로 전환"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"전면 카메라로 전환"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"후면 카메라로 전환"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"사진 찍기"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"사진 다시 찍기"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
index fca2893d8..771f5769d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Камераны толук экранга которуу"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Азыр баскычта \"Маңдайкы камера\" деп жазылып турат"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Азыр баскычта \"Арткы камера\" деп жазылып турат"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Видео жаздырууну токтотуу"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Маңдайкы камера колдонулууда"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Арткы камера колдонулууда"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Сүрөткө тартуу"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Камераны толук экранга которуу"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераны алдын ала көрүү режимине которуу"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Маңдайкы камерага которуу"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Арткы камерага которуу"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сүрөткө тартуу"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Кайра сүрөткө тартуу"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
index 0257e75aa..6bfdf4e76 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ຕອນນີ້ເປັນປຸ່ມກ້ອງໜ້າແລ້ວ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ຕອນນີ້ເປັນປຸ່ມກ້ອງຫຼັງແລ້ວ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ຢຸດການບັນທຶກວິດີໂອ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ກຳລັງໃຊ້ກ້ອງໜ້າ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ກຳລັງໃຊ້ກ້ອງຫຼັງ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ຖ່າຍຮູບ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ຖ່າຍຮູບ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ຖ່າຍຮູບໃໝ່"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
index 62c6de992..6ff3b0db6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dabar tai yra priekinio fotoaparato mygtukas"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dabar tai yra užpakalinio fotoaparato mygtukas"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Sustabdyti vaizdo įrašymą"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Naudojamas priekinis fotoaparatas"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Naudojamas užpakalinis fotoaparatas"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotografuoti"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Perjungti į fotoaparato peržiūrą"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Perjungti į priekinį fotoaparatą"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Perjungti į užpakalinį fotoaparatą"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografuoti"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotografuoti iš naujo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
index 4800f6bb1..d6d4782fb 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Pārslēgties uz pilnekrāna kameru"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Poga tagad tiek izmantota priekšējai kamerai"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Poga tagad tiek izmantota aizmugurējai kamerai"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Pārtraukt videoklipa ierakstīšanu"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Tiek izmantota priekšējā kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Tiek izmantota aizmugurējā kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Uzņemt fotoattēlu"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Pārslēgt uz pilnekrāna kameru"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Pārslēgt uz kameras priekšskatījumu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Pārslēgt uz priekšējo kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Pārslēgt uz aizmugurējo kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Uzņemt fotoattēlu"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atkārtoti uzņemt fotoattēlu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
index 82c466fb4..a0f84a035 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Префрлете на камера на цел екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Копчето е сега предна камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Копчето е сега задна камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Сопрете со снимање видео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Се користи предната камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Се користи задната камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Фотографирај"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Префрлете на камера на цел екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Префрлете на преглед на камера"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Префрлете на предна камера"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Префрлете на задна камера"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Фотографирај"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Фотографирај пак"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
index 0423da257..77c0a4f85 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ബട്ടൺ അമർത്തിയാൻ മുൻ ക്യാമറ ലഭിക്കും"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ബട്ടൺ അമർത്തിയാൻ പിൻ ക്യാമറ ലഭിക്കും"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"വീഡിയോ റെക്കോർഡുചെയ്യൽ നിർത്തുക"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"മുൻവശത്തെ ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"പിൻഭാഗത്തുള്ള ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ഫോട്ടോ എടുക്കുക"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"മുൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"പിൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ഫോട്ടോ എടുക്കുക"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ഫോട്ടോ വീണ്ടുമെടുക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
index 024e00468..1894634ea 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Товчлуур нь урд талын камер боллоо"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Товчлуур нь ард талын камер боллоо"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Видео бичилтийг зогсоох"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Урд камер ашиглаж байна"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Арын камер ашиглаж байна"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зураг авах"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камерын урьдчилан үзэх рүү сэлгэх"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Урд талын камер руу сэлгэх"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Ар талын камер руу сэлгэх"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зураг авах"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зураг дахин авах"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
index bc9c2fb1d..24c1931d9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटण आता पुढील कॅमेरा आहे"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटण आता मागील कॅमेरा आहे"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"व्हिडिओ रेकॉर्ड करणे थांबवा"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"समोरील कॅमेरा वापरत आहे"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"मागील कॅमेरा वापरत आहे"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"फोटो घ्‍या"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कॅमेरा पूर्वावलोकनावर स्विच करा"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"समोरील कॅमऱ्यावर स्विच करा"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"मागील कॅमेर्‍यावर स्‍विच करा"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"फोटो घ्‍या"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फोटो पुन्हा घ्या"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
index 3245b9c9f..44806f53e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tukar kepada kamera skrin penuh"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Butang kini kamera depan"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Butang kini kamera belakang"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Berhenti merakam video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Menggunakan kamera depan"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Menggunakan kamera belakang"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ambil foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera skrin penuh"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratonton kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera menghadap depan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera menghadap belakang"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil semula foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
index 884c0c896..7112abc7d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ခလုတ်မှာ အရှေ့ကင်မရာအတွက် ဖြစ်သွားပါပြီ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ခလုတ်မှာ အနောက်ကင်မရာအတွက် ဖြစ်သွားပါပြီ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ဗီဒီယိုရိုက်ကူးခြင်း ရပ်ရန်"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"အရှေ့ကင်မရာကို သုံးနေသည်"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"အနောက်ကင်မရာကို သုံးနေသည်"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ဓာတ်ပုံရိုက်ရန်"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"အရှေ့ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"အနောက်ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ဓာတ်ပုံရိုက်ရန်"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ဓာတ်ပုံပြန်ရိုက်ရန်"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
index bfa58ed61..5e5fb601e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Bytt til fullskjermkamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nå er knappen frontkameraet"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nå er knappen det bakre kameraet"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Slutt å filme"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruker frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruker det bakre kameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta et bilde"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
index 1362b328b..d8ea7954c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटन अब अगाडिको क्यामेराका लागि हो"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटन अब पछाडिको क्यामेराका लागि हो"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"भिडियो रेकर्ड रोक्नुहोस्"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"अगाडिको क्यामेरा प्रयोग गरिँदै"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"पछाडिको क्यामेरा प्रयोग गरिँदै"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"अगाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पछाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"पुन: तस्बिर खिच्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
index 94f271875..0369fedaa 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Overschakelen naar camera op volledig scherm"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"De knop wordt nu gebruikt voor de camera aan de voorzijde"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"De knop wordt nu gebruikt voor de camera aan de achterzijde"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video-opname stoppen"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"De camera aan de voorzijde wordt gebruikt"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"De camera aan de achterzijde wordt gebruikt"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto maken"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Overschakelen naar camera op volledig scherm"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Overschakelen naar cameravoorbeeld"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Overschakelen naar camera aan voorzijde"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Overschakelen naar camera aan achterzijde"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto maken"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto opnieuw maken"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
index bfa58ed61..5e5fb601e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Bytt til fullskjermkamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nå er knappen frontkameraet"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nå er knappen det bakre kameraet"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Slutt å filme"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruker frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruker det bakre kameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta et bilde"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
index 4296c9804..e1247e071 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰਾ \'ਤੇ ਜਾਓ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ਬਟਨ ਹੁਣ ਮੂਹਰਲਾ ਕੈਮਰਾ ਹੈ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ਬਟਨ ਹੁਣ ਪਿਛਲਾ ਕੈਮਰਾ ਹੈ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ਵੀਡੀਓ ਰਿਕਾਰਡ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ਮੂਹਰਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ਪਿਛਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
index 0e03e2d87..b85afa6aa 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Włącz aparat pełnoekranowy"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Przycisk włącza teraz przedni aparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Przycisk włącza teraz tylny aparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zatrzymaj nagrywanie filmu"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Używany jest przedni aparat"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Używany jest tylny aparat"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Zrób zdjęcie"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Przełącz na aparat pełnoekranowy"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Przełącz na podgląd aparatu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Przełącz na przedni aparat"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Przełącz na tylny aparat"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Zrób zdjęcie"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Zrób nowe zdjęcie"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
index 7c1fa0723..59f457c43 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Alternar para câmera em tela cheia"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão agora está na câmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão agora está na câmera traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando a câmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando a câmera traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
index 661b4d943..71f651dcb 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Mudar para a câmara de ecrã completo"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão é agora utilizado para a câmara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão é agora utilizado para a câmara posterior"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar a gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"A utilizar a câmara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"A utilizar a câmara posterior"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Mudar para a câmara de ecrã completo"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Mudar para a pré-visualização da câmara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Mudar para a câmara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Mudar para a câmara traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar nova foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
index 7c1fa0723..59f457c43 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Alternar para câmera em tela cheia"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão agora está na câmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão agora está na câmera traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando a câmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando a câmera traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
index 98d00502b..f491f2887 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Comutați la camera pe ecran complet"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Acum butonul este pentru camera foto frontală."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Acum butonul este pentru camera foto posterioară."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Opriți înregistrarea video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Este folosită camera foto frontală"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Este folosită camera foto posterioară"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotografiați"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Comutați la camera pe ecran complet"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Comutați la previzualizarea camerei"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Comutați la camera frontală"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Comutați la camera posterioară"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografiați"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Refaceți fotografia"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
index a4c7206d0..9de3cabab 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Перейти в полноэкранный режим"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Сейчас на кнопке написано: Фронтальная камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Сейчас на кнопке написано: Основная камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Остановить запись видео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Используется фронтальная камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Используется основная камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Сделать снимок"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Переключиться в полноэкранный режим"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Переключиться в режим предварительного просмотра"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Переключиться на фронтальную камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Переключиться на основную камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сделать снимок"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Новый снимок"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
index 6cc5eef43..1747d1a37 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"බොත්තම දැන් ඉදිරිපස කැමරාවයි"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"බොත්තම දැන් පිටුපස කැමරාවයි"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"වීඩියෝව පටිගත කිරීම නැවැත්වීම"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ඉදිරිපස කැමරාව භාවිත කරමින්"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"පසුපස කැමරාව භාවිත කරමින්"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ඡායාරූපය ගන්න"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"කැමරා පෙරදසුන වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ඡායාරූපය ගැනීම"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ඡායාරූපය නැවත ගැනීම"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
index 916158bcc..a053e2f3b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prepnúť na fotoaparát na celej obrazovke"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tlačidlo sa nachádza v polohe Predný fotoaparát"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tlačidlo sa nachádza v polohe Zadný fotoaparát"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zastaviť zaznamenávanie videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Používa sa predný fotoaparát"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Používa sa zadný fotoaparát"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Odfotiť"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prepnúť na fotoaparát na celej obrazovke"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prepnúť na ukážku z fotoaparátu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prepnúť na predný fotoaparát"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prepnúť na zadný fotoaparát"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Odfotiť"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova odfotiť"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
index ef1fe2029..b50aaaea9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Preklopi v celozaslonski način fotoaparata"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Gumb zdaj upravlja sprednji fotoaparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Gumb zdaj upravlja hrbtni fotoaparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ustavi snemanje videoposnetka"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Uporaba fotoaparata spredaj"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Uporaba fotoaparata zadaj"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Posnemi fotografijo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Preklopi v celozaslonski način fotoaparata"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Preklopi v predogled fotoaparata"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Preklopi na fotoaparat na sprednji strani"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Preklopi na fotoaparat na zadnji strani"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Posnemi fotografijo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova posnemi fotografijo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
index ff8cb8771..4be0317dc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Kalo në kamerën me ekran të plotë"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Butoni tani është kamera e përparme"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Butoni tani është kamera e pasme"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ndalo regjistrimin e videos"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Po përdor kamerën e përparme"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Po përdor kamerën e pasme"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Bëj një fotografi"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Kalo në kamerën me ekran të plotë"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kalo te pamja paraprake e kamerës"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Kalo te kamera e përparme"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Kalo te kamera e pasme"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Bëj një fotografi"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Bëje përsëri fotografinë"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
index 17150b4f2..4afcbe914 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Пређите на приказ камере преко целог екрана"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Дугме сад активира предњу камеру"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Дугме сад активира задњу камеру"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Зауставите снимање видеа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Користимо предњу камеру"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Користимо задњу камеру"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Снимите слику"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пребаците на приказ камере преко целог екрана"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пребаците на преглед камере"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пребаците на предњу камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пребаците на задњу камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимите слику"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Поново снимите слику"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
index 309147913..8bd00ccd9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Byt till fullskärmskamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knappen är nu framåtvänd kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knappen är nu bakåtvänd kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Sluta spela in video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Använder främre kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Använder bakre kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta en bild"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Växla till helskärmskamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Växla till förhandsgranskning i kameran"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Växla till den framåtvända kameran"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Växla till den bakåtvända kameran"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta en bild"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta en ny bild"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
index 8608b75a2..c951ac6a2 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Badilisha utumie kamera ya skrini nzima"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Kitufe hiki sasa ni kamera ya mbele"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Kitufe hiki sasa ni kamera ya nyuma"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Acha kurekodi video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Inatumia kamera ya mbele"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Inatumia kamera ya nyuma"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Piga picha"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Badili utumie kamera ya skrini nzima"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Badili utumie onyesha la kuchungulia la kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Badili utumie kamera ya mbele"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Badili utumie kamera ya nyuma"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Piga picha"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Piga picha tena"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
index 9c42144e8..374cfcfe2 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"முழுத் திரை கேமராவிற்கு மாறும்"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"இப்போது முன்புறக் கேமராவைக் குறிக்கும் பொத்தான்"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"இப்போது பின்புறக் கேமராவைக் குறிக்கும் பொத்தான்"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"வீடியோ ரெக்கார்டு செய்யப்படுவதை நிறுத்தும்"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"முன்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"பின்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"படமெடுக்கும்"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"முன்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"பின்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"படமெடுக்கும் பொத்தான்"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"மீண்டும் படமெடுக்கும் பொத்தான்"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
index 4587593b5..099fa67a7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"బటన్ ఇప్పుడు ముందువైపు కెమెరాగా పని చేస్తోంది"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"బటన్ ఇప్పుడు వెనుకవైపు కెమెరాగా పని చేస్తోంది"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"వీడియో రికార్డింగ్‌ను ఆపివేస్తుంది"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ముందు కెమెరాను ఉపయోగిస్తున్నాము"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"వెనుక కెమెరాను ఉపయోగిస్తున్నాము"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ఫోటో తీస్తుంది"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"కెమెరా పరిదృశ్యానికి మారుస్తుంది"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ముందువైపు కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"వెనుకవైపు కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ఫోటో తీస్తుంది"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ఫోటోను మళ్లీ తీస్తుంది"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
index 9b1150f0e..62c69a3e5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"สลับไปยังกล้องแบบเต็มหน้าจอ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ขณะนี้ปุ่มเป็นกล้องหน้า"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ขณะนี้ปุ่มเป็นกล้องหลัง"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"หยุดการบันทึกวิดีโอ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"กำลังใช้กล้องหน้า"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"กำลังใช้กล้องหลัง"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ถ่ายภาพ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"เปลี่ยนเป็นกล้องหน้า"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"เปลี่ยนเป็นกล้องหลัง"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ถ่ายภาพ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ถ่ายภาพอีกครั้ง"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
index 5fd98c14d..2f6fb83c3 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Lumilipat sa camera na full screen"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Ang button ay para na sa camera sa harap"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Ang button ay para na sa camera sa likod"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ihinihinto ang pagre-record ng video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ginagamit ang camera sa harap"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Ginagamit ang camera sa likuran"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Kumuha ng larawan"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Lumipat sa camera na full screen"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Lumipat sa preview ng camera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Lumipat sa camera na nasa harap"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Lumipat sa camera na nasa likod"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Kumuha ng larawan"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Kunang muli"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
index 80b0b940f..da54ac88d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tam ekran kameraya geçer"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Düğme artık ön kamera için kullanılıyor"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Düğme artık arka kamera için kullanılıyor"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video kaydını durdurur"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ön kamera kullanılıyor"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Arka kamera kullanılıyor"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotoğraf çeker"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekran kameraya geçer"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizlemesine geçer"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya geçer"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arka kameraya geçer"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotoğraf çeker"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotoğrafı yeniden çeker"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
index c2506158f..cea540a9e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Показ зображення з камери на весь екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Зараз це кнопка камери на передній панелі"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Зараз це кнопка камери на задній панелі"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Зупинення запису відео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Використання фронтальної камери"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Використання задньої камери"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зйомка фото"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Показ зображення з камери на весь екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Попередній перегляд зображення з камери"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Перейти до фронтальної камери"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Перейти до задньої камери"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зробити фото"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зробити фото ще раз"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
index edd417856..585a55a03 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"بٹن اب فرنٹ کیمرا ہے"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"بٹن اب بیک کیمرا ہے"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ویڈیو ریکارڈ کرنے کو روکیں"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"فرنٹ کیمرا استعمال ہو رہا ہے"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"بیک کیمرا استعمال ہو رہا ہے"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"تصویر لیں"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"کیمرہ پیش منظر پر سوئچ کریں"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"فرنٹ والے کیمرے پر سوئچ کریں"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"عقب والے کیمرے پر سوئچ کریں"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"تصویر لیں"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"دوبارہ تصویر لیں"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
index 037767359..8441d887c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"To‘liq ekranli rejimga o‘tish"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Endi bu old kamera tugmasi"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Endi bu orqa kamera tugmasi"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videoga olishni to‘xtatish"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Old kameradan foydalanilmoqda"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Orqa kameradan foydalanilmoqda"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Suratga olish"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"To‘liq ekranli rejimga o‘tish"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Oldindan ko‘rish rejimiga o‘tish"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Old kamerani yoqish"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Orqa kamerani yoqish"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Rasmga olish"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Yangi rasmga olish"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
index 81a0e62c0..054666455 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Chuyển sang máy ảnh toàn màn hình"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Hiện tại, nút ở chế độ máy ảnh mặt trước"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Hiện tại, nút ở chế độ máy ảnh mặt sau"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Dừng quay video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Đang sử dụng máy ảnh trước"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Đang sử dụng máy ảnh sau"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Chụp ảnh"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Chuyển sang máy ảnh toàn màn hình"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Chuyển sang chế độ xem trước máy ảnh"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Chuyển sang máy ảnh mặt trước"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Chuyển sang máy ảnh mặt sau"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Chụp ảnh"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Chụp lại ảnh"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
index 311569c54..24e9c1a63 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切换到全屏相机模式"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"点按按钮可切换到前置摄像头"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"点按按钮可切换到后置摄像头"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止录制视频"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"正在使用前置摄像头"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"正在使用后置摄像头"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍照"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切换到全屏相机模式"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切换到相机预览模式"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切换到前置摄像头"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切换到后置摄像头"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重拍照片"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
index 890a18fc0..0310b10e6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切換至全屏攝像"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"按鈕目前為前置鏡頭"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"按鈕目前為後置鏡頭"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止錄製影片"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"使用前置鏡頭"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"使用後置鏡頭"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍照"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
index 30fa03bfe..d41ddda25 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切換至全螢幕相機"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"按鈕目前設定為前置鏡頭"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"按鈕目前設定為後置鏡頭"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止錄影"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"目前使用的是前置鏡頭"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"目前使用的是後置鏡頭"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍攝相片"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽畫面"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
index 33a9284a4..6e147b7f9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Shintshela kukhamera yesikrini esigcwele"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Inkinobho manje iyikhamera yangaphambili"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Inkinobho manje iyikhamera yangemuva"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Misa ukurekhoda ividiyo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Isebenzisa ikhamera yangaphambili"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Isebenzisa ikhamera yangemuva"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Thatha isithombe"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Shintshela kukhamera yesikrini esigcwele"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Shintshela ekuhloleni kuqala kwekhamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Shintshela kwikhamera yangaphambili"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Shintshela kwikhamera ebheke emuva"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Thatha isithombe"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Thatha kabusha isithombe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
index 09d4a58fd..e3d5c2406 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
@@ -16,7 +16,7 @@
   -->
 <resources>
   <dimen name="camera_view_button_margin">22dp</dimen>
-  <dimen name="camera_view_button_size">46dp</dimen>
+  <dimen name="camera_view_button_size">48dp</dimen>
   <dimen name="capture_button_size">84dp</dimen>
   <dimen name="capture_button_bottom_margin">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
index 999fe8f96..4db79683f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
@@ -1,17 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 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>
   <!-- Content description of button to switch to full screen camera -->
-  <string name="camera_switch_full_screen">Switch to full screen camera</string>
+  <string name="description_camera_switch_full_screen">Switch to full screen camera</string>
+  <!-- Content description of button to resize camera from fullscreen to only a preview -->
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
   <!-- Content description of button when after swapped to front -->
-  <string name="camera_switch_camera_facing">Button is now front camera</string>
+  <string name="description_camera_switch_camera_facing">Switch to front facing camera</string>
   <!-- Content description of button when after swapped to back -->
-  <string name="camera_switch_camera_rear">Button is now back camera</string>
-  <!-- Content description of button to cancel recording video -->
-  <string name="camera_cancel_recording">Stop recording video</string>
-  <!-- Accessibility announcement for when we are using the front facing camera -->
-  <string name="using_front_camera">Using front camera</string>
-  <!-- Accessibility announcement for when we are using the back camera -->
-  <string name="using_back_camera">Using back camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to back facing camera</string>
   <!-- Content description of button to take a photo -->
-  <string name="camera_take_picture">Take photo</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <!-- Content description of button to cancel a photo -->
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
index 14703a44c..588cc1d42 100644
--- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
@@ -70,10 +70,22 @@
         android:background="@drawable/call_composer_contact_border"/>
     </RelativeLayout>
 
-    <android.support.v4.view.ViewPager
-      android:id="@+id/call_composer_view_pager"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/call_composer_view_pager_height"/>
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+      <com.android.dialer.widget.LockableViewPager
+          android:id="@+id/call_composer_view_pager"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/call_composer_view_pager_height"/>
+
+      <ProgressBar
+          android:id="@+id/call_composer_loading"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:visibility="gone"/>
+    </FrameLayout>
   </LinearLayout>
 
   <FrameLayout
@@ -96,7 +108,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_camera_alt_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_camera"/>
 
       <ImageView
           android:id="@+id/call_composer_photo"
@@ -104,7 +117,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_photo_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_photo"/>
 
       <ImageView
           android:id="@+id/call_composer_message"
@@ -112,7 +126,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_message_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_message"/>
     </LinearLayout>
 
     <FrameLayout
diff --git a/java/com/android/dialer/callcomposer/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
index 81f97fdc0..44277c82e 100644
--- a/java/com/android/dialer/callcomposer/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Laat toe"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot kamera om \'n foto te neem"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot media om \'n prent te deel"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Neem \'n foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Kies \'n foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Stuur \'n boodskap"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
index c44249090..d848a0489 100644
--- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ፍቀድ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ፎቶ ያንሱ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ፎቶ ይምረጡ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"መልዕክት ይላኩ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
index ba43f0fd9..44ea0eba4 100644
--- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"سماح"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"التقاط صورة"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"اختيار صورة"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"إرسال رسالة"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
index 2f913d9bc..47a8257dd 100644
--- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"İcazə verin"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Şəkil çəkmək üçün kameraya giriş icazəsi verin"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Şəkil çəkin"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto seçin"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj göndərin"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
index c357d506f..ef3ff06da 100644
--- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Odobrite pristup Kameri da biste snimili sliku"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Odobrite pristup Medijima da biste delili sliku"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Slikajte"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberite sliku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošaljite poruku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
index bb3244b19..b667cdbce 100644
--- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дазволіць"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Каб зрабіць фота, адкрыйце доступ да Камеры"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зрабіць фота"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбраць фота"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Адправіць паведамленне"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
index 1bc05cd8b..6a458c4a7 100644
--- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Разрешаване"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"За да направите снимка, разрешете достъп до Камера"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите изображение, разрешете достъп до Медии"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Правене на снимка"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Избиране на снимка"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Изпращане на съобщение"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
index e991b3b34..c23edb63a 100644
--- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"অনুমতি দিন"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"একটি ছবি তুলুন"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"একটি ফটো বেছে নিন"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"একটি বার্তা পাঠান"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
index 7d0b8d26f..2955aeaee 100644
--- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Da snimite fotografiju, dajte pristup Kameri"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Da podijelite sliku, dozvolite pristup Medijima"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Uslikaj"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberi fotografiju"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
index 1a57f87ce..5b457e2db 100644
--- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permet"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Per fer una foto, dona accés a la càmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Per compartir una imatge, dona accés al contingut multimèdia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fes una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Tria una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envia un missatge"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
index 93ae0c124..2f4a06bea 100644
--- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Povolit"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Chcete-li pořídit fotku, povolte přístup k fotoaparátu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pokud chcete sdílet fotku, povolte přístup k mediálním souborům"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Vyfotit"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrat fotku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Poslat zprávu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
index b1e3e6db9..3f7fb03b7 100644
--- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillad"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Du skal give adgang til kameraet for at tage et billede"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Du skal give adgang til medier for at dele et billede"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tag et billede"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vælg et billede"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en sms"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
index 9b9c13add..a57359eb4 100644
--- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Zulassen"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Bild aufnehmen"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto auswählen"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Nachricht senden"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
index 45fce843f..17001352b 100644
--- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Να επιτρέπεται"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Λήψη φωτογραφίας"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Επιλογή φωτογραφίας"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Αποστολή μηνύματος"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
index c34cbbd1b..3398551f0 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
index c34cbbd1b..3398551f0 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
index c34cbbd1b..3398551f0 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
index 797d00124..fc0927ff0 100644
--- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tomar una foto, permite el acceso a la cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tomar una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
index 8a4e7d690..c6f0dcd5b 100644
--- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para hacer una foto, permite el acceso a la cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Hacer una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
index 17b77a255..ecb2deebd 100644
--- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Luba"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Foto jäädvustamiseks lubage juurdepääs kaamerale"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pildi jagamiseks lubage juurdepääs meediale"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Pildistamine"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto valimine"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sõnumi saatmine"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
index be2aba7ca..b55dfd2cf 100644
--- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Baimendu"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Argazkiak ateratzeko, eman kamera atzitzeko baimena"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Irudiak partekatzeko, eman multimedia-edukirako sarbidea"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Atera argazki bat"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Aukeratu argazki bat"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Bidali mezu bat"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
index 9d588b232..034ab262c 100644
--- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"مجاز است"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"برای عکس گرفتن، به دوربین اجازه دسترسی بدهید"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"عکس گرفتن"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"انتخاب عکس"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ارسال پیام"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
index 98821bc6f..c19cd7b89 100644
--- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Salli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Jos haluat ottaa valokuvan, salli kameran käyttö."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Jos haluat jakaa kuvan, salli kuvien käyttö."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ota kuva"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Valitse kuva"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Lähetä viesti"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
index 29c001d6c..37b1f198f 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, autorisez l\'accès à l\'appareil photo"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, autorisez l\'accès au contenu multimédia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
index ab562898a..00078a4d5 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, accordez l\'accès à l\'appareil photo."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, accordez l\'accès aux fichiers multimédia."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
index 5c867683f..44b1790dc 100644
--- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para sacar unha foto, concede permiso de acceso á cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tira unha foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolle unha foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envía unha mensaxe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
index c948d2ea5..64ffc1fb0 100644
--- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"મંજૂરી આપો"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"એક ચિત્ર લો"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ફોટો પસંદ કરો"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"એક સંદેશ મોકલો"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
index 6cfdb1664..6b0bc040a 100644
--- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"अनुमति दें"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"चित्र साझा करने के लिए, मीडिया की ऐक्सेस दें"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"चित्र लें"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"एक फ़ोटो चुनें"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"संदेश भेजें"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
index 613f1f473..a51318a37 100644
--- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Omogući"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Da biste snimili fotografiju, dopustite pristup Fotoaparatu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Za dijeljenje slike dopustite pristup Medijima"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Snimi fotografiju"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
index 451fcb4eb..a5faaa2bb 100644
--- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Engedélyezés"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Fotó készítéséhez adjon hozzáférést a fényképezőgéphez"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Kép megosztásához adjon hozzáférést a médiafájlokhoz"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Kép készítése"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotó kiválasztása"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Üzenet küldése"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
index 43793d6e2..ea92e6ad4 100644
--- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Թույլատրել"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Լուսանկարել"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Ընտրել լուսանկար"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Ուղարկել հաղորդագրություն"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
index 4f9081011..302395b88 100644
--- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Izinkan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses ke Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk membagikan gambar, berikan akses ke Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Jepret"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mengirim pesan"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
index 5ca30503d..cf525e18a 100644
--- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Leyfa"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Til að taka mynd skaltu veita myndavélinni aðgang"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Til að deila mynd skaltu veita margmiðlunarefni aðgang"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Taka mynd"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velja mynd"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Senda skilaboð"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
index 40c893f84..4a10984c6 100644
--- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Consenti"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Per poter scattare una foto devi concedere l\'accesso alla fotocamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Scatta una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Scegli una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Invia un messaggio"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
index e1557dc04..7fed44782 100644
--- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"אפשר"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"צילום תמונה"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"בחירת תמונה"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"שליחת הודעה"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
index bc8161db6..d13f40e9a 100644
--- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"許可"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"写真を撮るには、まずカメラへのアクセスを許可してください"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"画像を共有するには、まずメディアへのアクセスを許可してください"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"画像を撮影します"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"写真を選択します"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"メッセージを送信します"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
index 79f39ab81..8c2823fe6 100644
--- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ნების დართვა"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ფოტოს გადასაღებად მიეცით კამერაზე წვდომა"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"სურათის გასაზიარებლად მიეცით მედიაზე წვდომა"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"სურათის გადაღება"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ფოტოს არჩევა"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"შეტყობინების გაგზავნა"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
index ffe045f95..2a0f6416d 100644
--- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Рұқсат беру"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Суретке түсіру үшін камераға кіруге рұқсат беріңіз"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Суретке түсіру"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Суретті таңдау"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Хабар жіберу"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
index 4444bceeb..0e63923d7 100644
--- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"អនុញ្ញាត"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ថតរូប"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ជ្រើសរើស​រូបថត"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ផ្ញើសារ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
index f50bdcce4..96f7d5b46 100644
--- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ಅನುಮತಿಸಿ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
index d710afa3e..1dd63beb4 100644
--- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"허용"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"사진 촬영"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"사진 선택"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"메시지 보내기"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
index c7c053303..4a1f50400 100644
--- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Уруксат берүү"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сүрөткө тартуу"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Сүрөттү тандоо"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Билдирүү жөнөтүү"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
index 9c4946000..5d58509d4 100644
--- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ອະນຸຍາດ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ຖ່າຍຮູບ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ເລືອກຮູບພາບ..."</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ສົ່ງຂໍ້ຄວາມ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
index 0b011f7d7..75f12360c 100644
--- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Leisti"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografuoti"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pasirinkti nuotrauką"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Siųsti pranešimą"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
index 8593ca01d..895e0f374 100644
--- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Atļaut"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Uzņemt attēlu"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izvēlēties fotoattēlu"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sūtīt ziņojumu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
index 40d7c622c..623972e24 100644
--- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дозволете"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"За да фотографирате, дозволете пристап до „Камера“"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите слика, дозволете пристап до Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Фотографирајте"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изберете фотографија"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Испратете порака"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
index 0a0833d9d..ad2ce5d85 100644
--- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"അനുവദിക്കുക"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ഒരു ചിത്രമെടുക്കുക"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
index 54a292d9a..8895da727 100644
--- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Зөвшөөрөх"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зураг авах"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Зураг сонгоно уу"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Зурвас илгээх"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
index 7f8c5d7ef..fcfdebe55 100644
--- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"अनुमती द्या"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"एखादी प्रतिमा सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"एक फोटो घ्या"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"फोटो निवडा"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"एक संदेश पाठवा"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
index 0927cde9f..7101489a1 100644
--- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Benarkan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses kepada Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk berkongsi imej, berikan akses kepada Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ambil gambar"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Hantar mesej"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
index 6608e9a4f..02fc375bc 100644
--- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ခွင့်ပြုရန်"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ဓာတ်ပုံတစ်ပုံ ရွေးရန်"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"မက်ဆေ့ဂျ်ပို့ရန်"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
index 693e7fd51..d66a165b2 100644
--- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillat"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
index 37dd68107..a73f6f8c5 100644
--- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"अनुमति दिनुहोस्"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"छवि आदान-प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"तस्बिर छनौट गर्नुहोस्"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"सन्देश पठाउनुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
index ebb00c470..2125f5cd1 100644
--- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Toestaan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot Camera om een foto te maken"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot Media om een afbeelding te delen"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Een foto nemen"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Een foto kiezen"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Een bericht verzenden"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
index 693e7fd51..d66a165b2 100644
--- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillat"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
index bf6be36fe..8241984a4 100644
--- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
index ba74628f0..473007d9b 100644
--- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Zezwól"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Aby zrobić zdjęcie, zezwól na dostęp do aparatu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Aby udostępnić zdjęcie, zezwól na dostęp do multimediów"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Zrób zdjęcie"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Wybierz zdjęcie"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Wyślij wiadomość"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
index 9feee7d9d..7996e06a0 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
index 8b12d652f..e071969ec 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, conceda acesso à Câmara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para partilhar uma imagem, conceda acesso a Multimédia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Selecionar foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
index 9feee7d9d..7996e06a0 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
index 744ef80fb..48f6ec09b 100644
--- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Permiteți"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pentru a fotografia, permiteți accesul la Camera foto"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pentru a trimite o imagine, permiteți accesul la Conținutul media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografiați"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Alegeți o fotografie"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Trimiteți un mesaj"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
index 1abbc4996..f991b0955 100644
--- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Разрешить"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Чтобы сделать снимок, предоставьте доступ к камере"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Чтобы поделиться изображением, предоставьте доступ к мультимедиа"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сделать фото"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбрать фото"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Отправить сообщение"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
index 48a447416..ac27473a8 100644
--- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"ඉඩ දෙන්න"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"පින්තුරයක් ගැනීම"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ඡායාරූපයක් තේරීම"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"පණිවිඩයක් යැවීම"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
index 2fb13c1af..6945d7606 100644
--- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Povoliť"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ak chcete fotiť, povoľte prístup k fotoaparátu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ak chcete zdieľať obrázok, povoľte prístup k médiám"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Odfotiť"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrať fotku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Odoslať správu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
index 34126ab36..2384edd74 100644
--- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Dovoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Če želite posneti fotografijo, omogočite dostop do fotoaparata"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Posnemi fotografijo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izberi fotografijo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošlji sporočilo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
index 35dd197c9..924383ea4 100644
--- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Lejo"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Për të shkrepur një fotografi, jep qasjen te Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Për të ndarë një imazh, jep qasjen te Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Bëj një fotografi"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Zgjidh një fotografi"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Dërgo një mesazh"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
index 4fa34ed40..c4c337f9f 100644
--- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дозволи"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Одобрите приступ Камери да бисте снимили слику"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Одобрите приступ Медијима да бисте делили слику"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сликајте"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изаберите слику"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Пошаљите поруку"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
index de33531db..e19a5b550 100644
--- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Tillåt"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Bevilja åtkomst till Kamera om du vill ta ett foto"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Bevilja åtkomst till Media om du vill dela en bild"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta en bild"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Välj ett foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Skicka ett meddelande"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
index e99fd06e4..280c48869 100644
--- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Ruhusu"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ruhusu programu ifikie Kamera ili uweze kupiga picha"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ruhusu programu ifikie Midia ili uweze kushiriki picha"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Piga picha"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chagua picha"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Tuma ujumbe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
index 407814889..df2a41242 100644
--- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"அனுமதி"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"படமெடுக்கவும்"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"புகைப்படத்தைத் தேர்வு செய்யும்"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"செய்தியை அனுப்பும்"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
index 101429c16..9b8834de9 100644
--- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"అనుమతించు"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"చిత్రాన్ని తీస్తుంది"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ఫోటోను ఎంచుకోండి"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"సందేశాన్ని పంపుతుంది"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
index a004d33f5..d643d5340 100644
--- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"อนุญาต"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ถ่ายภาพ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"เลือกรูปภาพ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ส่งข้อความ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
index e902a2fef..e325ef5d5 100644
--- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Payagan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Upang kumuha ng larawan, magbigay ng access sa Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Upang magbahagi ng imahe, magbigay ng access sa Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Kumuha ng larawan"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pumili ng larawan"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Magpadala ng mensahe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
index 0dfe8b213..66557fd67 100644
--- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"İzin ver"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Fotoğraf çekmek için Kamera\'ya erişim izni verin"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Resim paylaşmak için Medya\'ya erişim izni verin"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Resim çeker"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotoğraf seçilmesini sağlar"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj gönderir"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
index 20898c315..45f5de5b3 100644
--- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Дозволити"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Щоб сфотографувати, надайте доступ до камери"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Щоб поділитися зображенням, надайте доступ до медіа-вмісту"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зробити знімок"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Вибрати фотографію"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Надіслати повідомлення"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
index 92a2f8c0e..ff96b0a23 100644
--- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"اجازت دیں"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"تصویر لینے کیلئے کیمرا کو رسائی دیں"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"تصویر لیں"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ایک تصویر چنیں"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"پیغام بھیجیں"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
index 845016226..28e237867 100644
--- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Ruxsat berish"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Suratga olish uchun kameraga kirshga ruxsat bering"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Rasmga olish"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Rasm tanlash"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Xabar yuborish"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
index 2d060bd01..b4a4b9e69 100644
--- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Cho phép"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Chụp ảnh"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chọn ảnh"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Gửi tin nhắn"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
index a6c2f9014..6e2324d76 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"允许"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"要拍摄照片，请授予相机使用权限"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"要分享图片，请授予媒体访问权限"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"选择一张照片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"发送信息"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
index 8f66f4f18..a05100ec4 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"允許"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予「相機」存取權"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予「媒體」存取權"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
index a3af5af79..206a02b40 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"允許"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予相機存取權"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予媒體存取權"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍攝相片"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
index 2cce6883c..61cfac05e 100644
--- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
@@ -30,4 +30,7 @@
     <string name="allow" msgid="8637148297403066623">"Vumela"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ukuze uthathe isithombe, nika ukufinyelela kukhamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Thatha isithombe"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Khetha isithombe"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Thumela umlayezo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values/strings.xml b/java/com/android/dialer/callcomposer/res/values/strings.xml
index cc7762b64..0faf46947 100644
--- a/java/com/android/dialer/callcomposer/res/values/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values/strings.xml
@@ -41,4 +41,10 @@
   <string name="camera_permission_text">To take a photo, give access to Camera</string>
   <!-- Text presented to the user explaining that we need device storage permission to view photos -->
   <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <!-- Content description of button to show ui for taking a photo -->
+  <string name="description_call_composer_camera">Take a picture</string>
+  <!-- Content description of button to show ui for selecting a photo from the user's gallery -->
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <!-- Content description of button to show ui for sending a message -->
+  <string name="description_call_composer_message">Send a message</string>
 </resources>
\ No newline at end of file