diff options
62 files changed, 612 insertions, 434 deletions
diff --git a/jni/feature_mos/src/mosaic/Blend.cpp b/jni/feature_mos/src/mosaic/Blend.cpp index 6988ace..7308a53 100644 --- a/jni/feature_mos/src/mosaic/Blend.cpp +++ b/jni/feature_mos/src/mosaic/Blend.cpp @@ -41,11 +41,12 @@ Blend::~Blend() if (m_pFrameYPyr) free(m_pFrameYPyr); } -int Blend::initialize(int blendingType, int frame_width, int frame_height) +int Blend::initialize(int blendingType, int stripType, int frame_width, int frame_height) { this->width = frame_width; this->height = frame_height; this->m_wb.blendingType = blendingType; + this->m_wb.stripType = stripType; m_wb.blendRange = m_wb.blendRangeUV = BLEND_RANGE_DEFAULT; m_wb.nlevs = m_wb.blendRange; @@ -95,13 +96,27 @@ void Blend::AlignToMiddleFrame(MosaicFrame **frames, int frames_size) } } -int Blend::runBlend(MosaicFrame **frames, int frames_size, +int Blend::runBlend(MosaicFrame **oframes, MosaicFrame **rframes, + int frames_size, ImageType &imageMosaicYVU, int &mosaicWidth, int &mosaicHeight, float &progress, bool &cancelComputation) { int ret; int numCenters; + MosaicFrame **frames; + + // For THIN strip mode, accept all frames for blending + if (m_wb.stripType == STRIP_TYPE_THIN) + { + frames = oframes; + } + else // For WIDE strip mode, first select the relevant frames to blend. + { + SelectRelevantFrames(oframes, frames_size, rframes, frames_size); + frames = rframes; + } + ComputeBlendParameters(frames, frames_size, true); numCenters = frames_size; @@ -348,6 +363,75 @@ int Blend::DoMergeAndBlend(MosaicFrame **frames, int nsite, site_idx++; } + ////////// imgMos.Y, imgMos.V, imgMos.U are used as follows ////////////// + ////////////////////// THIN STRIP MODE /////////////////////////////////// + + // imgMos.Y is used to store the index of the image from which each pixel + // in the output mosaic can be read out for the thin-strip mode. Thus, + // there is no special handling for pixels around the seam. Also, imgMos.Y + // is set to 255 wherever we can't get its value from any input image e.g. + // in the gray border areas. imgMos.V and imgMos.U are set to 128 for the + // thin-strip mode. + + ////////////////////// WIDE STRIP MODE /////////////////////////////////// + + // imgMos.Y is used the same way as the thin-strip mode. + // imgMos.V is used to store the index of the neighboring image which + // should contribute to the color of an output pixel in a band around + // the seam. Thus, in this band, we will crossfade between the color values + // from the image index imgMos.Y and image index imgMos.V. imgMos.U is + // used to store the weight (multiplied by 100) that each image will + // contribute to the blending process. Thus, we start at 99% contribution + // from the first image, then go to 50% contribution from each image at + // the seam. Then, the contribution from the second image goes up to 99%. + + // For WIDE mode, set the pixel masks to guide the blender to cross-fade + // between the images on either side of each seam: + if (m_wb.stripType == STRIP_TYPE_WIDE) + { + // Set the number of pixels around the seam to cross-fade between + // the two component images, + int tw = STRIP_CROSS_FADE_WIDTH * width; + + for(int y = 0; y < imgMos.Y.height; y++) + { + for(int x = tw; x < imgMos.Y.width - tw + 1; ) + { + // Determine where the seam is... + if (imgMos.Y.ptr[y][x] != imgMos.Y.ptr[y][x+1] && + imgMos.Y.ptr[y][x] != 255 && + imgMos.Y.ptr[y][x+1] != 255) + { + // Find the image indices on both sides of the seam + unsigned char idx1 = imgMos.Y.ptr[y][x]; + unsigned char idx2 = imgMos.Y.ptr[y][x+1]; + + for (int o = tw; o >= 0; o--) + { + // Set the image index to use for cross-fading + imgMos.V.ptr[y][x - o] = idx2; + // Set the intensity weights to use for cross-fading + imgMos.U.ptr[y][x - o] = 50 + (99 - 50) * o / tw; + } + + for (int o = 1; o <= tw; o++) + { + // Set the image index to use for cross-fading + imgMos.V.ptr[y][x + o] = idx1; + // Set the intensity weights to use for cross-fading + imgMos.U.ptr[y][x + o] = imgMos.U.ptr[y][x - o]; + } + + x += (tw + 1); + } + else + { + x++; + } + } + } + } + // Now perform the actual blending using the frame assignment determined above site_idx = 0; for(CSite *csite = m_AllSites; csite < esite; csite++) @@ -683,9 +767,36 @@ void Blend::ProcessPyramidForThisFrame(CSite *csite, BlendRect &vcrect, BlendRec int inMask = ((unsigned) ii < imgMos.Y.width && (unsigned) jj < imgMos.Y.height) ? 1 : 0; - if(inMask && imgMos.Y.ptr[jj][ii]!=site_idx && imgMos.Y.ptr[jj][ii]!=255) + if(inMask && imgMos.Y.ptr[jj][ii] != site_idx && + imgMos.V.ptr[jj][ii] != site_idx && + imgMos.Y.ptr[jj][ii] != 255) continue; + // Setup weights for cross-fading + // Weight of the intensity already in the output pixel + double wt0 = 0.0; + // Weight of the intensity from the input pixel (current frame) + double wt1 = 1.0; + + if (m_wb.stripType == STRIP_TYPE_WIDE) + { + if(inMask && imgMos.Y.ptr[jj][ii] != 255) + { + if(imgMos.V.ptr[jj][ii] == 128) // Not on a seam + { + wt0 = 0.0; + wt1 = 1.0; + } + else + { + wt0 = 1.0; + wt1 = ((imgMos.Y.ptr[jj][ii] == site_idx) ? + (double)imgMos.U.ptr[jj][ii] / 100.0 : + 1.0 - (double)imgMos.U.ptr[jj][ii] / 100.0); + } + } + } + // Project this mosaic point into the original frame coordinate space double xx, yy; @@ -696,6 +807,8 @@ void Blend::ProcessPyramidForThisFrame(CSite *csite, BlendRect &vcrect, BlendRec if(inMask) { imgMos.Y.ptr[jj][ii] = 255; + wt0 = 0.0f; + wt1 = 1.0f; } } @@ -708,15 +821,19 @@ void Blend::ProcessPyramidForThisFrame(CSite *csite, BlendRect &vcrect, BlendRec // Final destination in extended pyramid #ifndef LINEAR_INTERP - if(inSegment(x1, sptr->width, BORDER-1) && inSegment(y1, sptr->height, BORDER-1)) + if(inSegment(x1, sptr->width, BORDER-1) && + inSegment(y1, sptr->height, BORDER-1)) { double xfrac = xx - x1; double yfrac = yy - y1; - dptr->ptr[j][i] = (short) (.5 + ciCalc(sptr, x1, y1, xfrac, yfrac)); + dptr->ptr[j][i] = (short) (wt0 * dptr->ptr[j][i] + .5 + + wt1 * ciCalc(sptr, x1, y1, xfrac, yfrac)); if (dvptr >= m_pMosaicVPyr && nC > 0) { - duptr->ptr[j][i] = (short) (.5 + ciCalc(suptr, x1, y1, xfrac, yfrac)); - dvptr->ptr[j][i] = (short) (.5 + ciCalc(svptr, x1, y1, xfrac, yfrac)); + duptr->ptr[j][i] = (short) (wt0 * duptr->ptr[j][i] + .5 + + wt1 * ciCalc(suptr, x1, y1, xfrac, yfrac)); + dvptr->ptr[j][i] = (short) (wt0 * dvptr->ptr[j][i] + .5 + + wt1 * ciCalc(svptr, x1, y1, xfrac, yfrac)); } } #else @@ -755,11 +872,14 @@ void Blend::ProcessPyramidForThisFrame(CSite *csite, BlendRect &vcrect, BlendRec clipToSegment(x1, sptr->width, BORDER); clipToSegment(y1, sptr->height, BORDER); - dptr->ptr[j][i] = sptr->ptr[y1][x1]; + dptr->ptr[j][i] = (short) (wt0 * dptr->ptr[j][i] + 0.5 + + wt1 * sptr->ptr[y1][x1] ); if (dvptr >= m_pMosaicVPyr && nC > 0) { - dvptr->ptr[j][i] = svptr->ptr[y1][x1]; - duptr->ptr[j][i] = suptr->ptr[y1][x1]; + dvptr->ptr[j][i] = (short) (wt0 * dvptr->ptr[j][i] + + 0.5 + wt1 * svptr->ptr[y1][x1] ); + duptr->ptr[j][i] = (short) (wt0 * duptr->ptr[j][i] + + 0.5 + wt1 * suptr->ptr[y1][x1] ); } } } @@ -907,7 +1027,50 @@ void Blend::FrameToMosaicRect(int width, int height, double trs[3][3], BlendRect } } +void Blend::SelectRelevantFrames(MosaicFrame **frames, int frames_size, + MosaicFrame **relevant_frames, int &relevant_frames_size) +{ + MosaicFrame *first = frames[0]; + MosaicFrame *last = frames[frames_size-1]; + MosaicFrame *mb; + + double fxpos = first->trs[0][2], fypos = first->trs[1][2]; + + double midX = last->width / 2.0; + double midY = last->height / 2.0; + double z = ProjZ(first->trs, midX, midY, 1.0); + double firstX, firstY; + double prevX = firstX = ProjX(first->trs, midX, midY, z, 1.0); + double prevY = firstY = ProjY(first->trs, midX, midY, z, 1.0); + + relevant_frames[0] = first; // Add first frame by default + relevant_frames_size = 1; + for (int i = 0; i < frames_size - 1; i++) + { + mb = frames[i]; + double currX, currY; + z = ProjZ(mb->trs, midX, midY, 1.0); + currX = ProjX(mb->trs, midX, midY, z, 1.0); + currY = ProjY(mb->trs, midX, midY, z, 1.0); + double deltaX = currX - prevX; + double deltaY = currY - prevY; + double center2centerDist = sqrt(deltaY * deltaY + deltaX * deltaX); + + if (fabs(deltaX) > STRIP_SEPARATION_THRESHOLD * last->width) + { + relevant_frames[relevant_frames_size] = mb; + relevant_frames_size++; + + prevX = currX; + prevY = currY; + } + } + + // Add last frame by default + relevant_frames[relevant_frames_size] = last; + relevant_frames_size++; +} void Blend::ComputeBlendParameters(MosaicFrame **frames, int frames_size, int is360) { diff --git a/jni/feature_mos/src/mosaic/Blend.h b/jni/feature_mos/src/mosaic/Blend.h index 91fbec9..a5bc05b 100644 --- a/jni/feature_mos/src/mosaic/Blend.h +++ b/jni/feature_mos/src/mosaic/Blend.h @@ -33,6 +33,16 @@ const float TIME_PERCENT_ALIGN = 20.0; const float TIME_PERCENT_BLEND = 75.0; const float TIME_PERCENT_FINAL = 5.0; +// This threshold determines the minimum separation between the image centers +// of the input image frames for them to be accepted for blending in the +// STRIP_TYPE_WIDE mode. This threshold is specified as a fraction of the +// input image frame width. +const float STRIP_SEPARATION_THRESHOLD = 0.10; + +// This threshold determines the number of pixels on either side of the strip +// to cross-fade using the images contributing to each seam. This threshold +// is specified as a fraction of the input image frame width. +const float STRIP_CROSS_FADE_WIDTH = 0.02; /** * Class for pyramid blending a mosaic. */ @@ -46,6 +56,9 @@ public: static const int BLEND_TYPE_CYLPAN = 2; static const int BLEND_TYPE_HORZ = 3; + static const int STRIP_TYPE_THIN = 0; + static const int STRIP_TYPE_WIDE = 1; + static const int BLEND_RET_ERROR = -1; static const int BLEND_RET_OK = 0; static const int BLEND_RET_ERROR_MEMORY = 1; @@ -54,9 +67,9 @@ public: Blend(); ~Blend(); - int initialize(int blendingType, int frame_width, int frame_height); + int initialize(int blendingType, int stripType, int frame_width, int frame_height); - int runBlend(MosaicFrame **frames, int frames_size, ImageType &imageMosaicYVU, + int runBlend(MosaicFrame **frames, MosaicFrame **rframes, int frames_size, ImageType &imageMosaicYVU, int &mosaicWidth, int &mosaicHeight, float &progress, bool &cancelComputation); protected: @@ -95,6 +108,8 @@ protected: // TODO: need to add documentation about the parameters void ComputeBlendParameters(MosaicFrame **frames, int frames_size, int is360); + void SelectRelevantFrames(MosaicFrame **frames, int frames_size, + MosaicFrame **relevant_frames, int &relevant_frames_size); int PerformFinalBlending(YUVinfo &imgMos, MosaicRect &cropping_rect); void CropFinalMosaic(YUVinfo &imgMos, MosaicRect &cropping_rect); diff --git a/jni/feature_mos/src/mosaic/Mosaic.cpp b/jni/feature_mos/src/mosaic/Mosaic.cpp index abbeb96..9eee2b3 100644 --- a/jni/feature_mos/src/mosaic/Mosaic.cpp +++ b/jni/feature_mos/src/mosaic/Mosaic.cpp @@ -45,6 +45,7 @@ Mosaic::~Mosaic() delete frames[i]; } delete frames; + delete rframes; if (aligner != NULL) delete aligner; @@ -52,16 +53,27 @@ Mosaic::~Mosaic() delete blender; } -int Mosaic::initialize(int blendingType, int width, int height, int nframes, bool quarter_res, float thresh_still) +int Mosaic::initialize(int blendingType, int stripType, int width, int height, int nframes, bool quarter_res, float thresh_still) { this->blendingType = blendingType; + + // TODO: Review this logic if enabling FULL or PAN mode + if (blendingType == Blend::BLEND_TYPE_FULL || + blendingType == Blend::BLEND_TYPE_PAN) + { + stripType = Blend::STRIP_TYPE_THIN; + } + + this->stripType = stripType; this->width = width; this->height = height; + mosaicWidth = mosaicHeight = 0; imageMosaicYVU = NULL; frames = new MosaicFrame *[max_frames]; + rframes = new MosaicFrame *[max_frames]; if(nframes>-1) { @@ -92,7 +104,7 @@ int Mosaic::initialize(int blendingType, int width, int height, int nframes, boo blendingType == Blend::BLEND_TYPE_CYLPAN || blendingType == Blend::BLEND_TYPE_HORZ) { blender = new Blend(); - blender->initialize(blendingType, width, height); + blender->initialize(blendingType, stripType, width, height); } else { blender = NULL; LOGE("Error: Unknown blending type %d",blendingType); @@ -180,7 +192,8 @@ int Mosaic::createMosaic(float &progress, bool &cancelComputation) // Blend the mosaic (alignment has already been done) if (blender != NULL) { - ret = blender->runBlend((MosaicFrame **) frames, frames_size, imageMosaicYVU, + ret = blender->runBlend((MosaicFrame **) frames, (MosaicFrame **) rframes, + frames_size, imageMosaicYVU, mosaicWidth, mosaicHeight, progress, cancelComputation); } diff --git a/jni/feature_mos/src/mosaic/Mosaic.h b/jni/feature_mos/src/mosaic/Mosaic.h index ecf0536..36eafe7 100644 --- a/jni/feature_mos/src/mosaic/Mosaic.h +++ b/jni/feature_mos/src/mosaic/Mosaic.h @@ -40,6 +40,7 @@ Mosaic mosaic; // Define blending types to use, and the frame dimensions int blendingType = Blend::BLEND_TYPE_CYLPAN; + int stripType = Blend::STRIP_TYPE_THIN; int width = 640; int height = 480; @@ -49,7 +50,7 @@ if (!mosaic.isInitialized()) { // Initialize mosaic processing - mosaic.initialize(blendingType, width, height, -1, false, 5.0f); + mosaic.initialize(blendingType, stripType, width, height, -1, false, 5.0f); } // Add to list of frames @@ -84,6 +85,9 @@ public: /*! * Creates the aligner and blender and initializes state. * \param blendingType Type of blending to perform + * \param stripType Type of strip to use. 0: thin, 1: wide. stripType + * is effective only when blendingType is CylPan or + * Horz. Otherwise, it is set to thin irrespective of the input. * \param width Width of input images (note: all images must be same size) * \param height Height of input images (note: all images must be same size) * \param nframes Number of frames to pre-allocate; default value -1 will allocate each frame as it comes @@ -91,7 +95,7 @@ public: * \param thresh_still Minimum number of pixels of translation detected between the new frame and the last frame before this frame is added to be mosaiced. For the low-res processing at 320x180 resolution input, we set this to 5 pixels. To reject no frames, set this to 0.0 (default value). * \return Return code signifying success or failure. */ - int initialize(int blendingType, int width, int height, int nframes = -1, bool quarter_res = false, float thresh_still = 0.0); + int initialize(int blendingType, int stripType, int width, int height, int nframes = -1, bool quarter_res = false, float thresh_still = 0.0); /*! * Adds a YVU frame to the mosaic. @@ -166,6 +170,12 @@ protected: * Collection of frames that will make up mosaic. */ MosaicFrame **frames; + + /** + * Subset of frames that are considered as relevant. + */ + MosaicFrame **rframes; + int frames_size; int max_frames; @@ -180,6 +190,11 @@ protected: int blendingType; /** + * Type of strip to use. 0: thin (default), 1: wide + */ + int stripType; + + /** * Pointer to aligner. */ Align *aligner; diff --git a/jni/feature_mos/src/mosaic/MosaicTypes.h b/jni/feature_mos/src/mosaic/MosaicTypes.h index 242335b..395ec45 100644 --- a/jni/feature_mos/src/mosaic/MosaicTypes.h +++ b/jni/feature_mos/src/mosaic/MosaicTypes.h @@ -145,6 +145,7 @@ typedef struct { int nlevs; int nlevsC; int blendingType; + int stripType; // Add an overlap to prevent a gap between pictures due to roundoffs double roundoffOverlap;// 1.5 diff --git a/jni/feature_mos_jni.cpp b/jni/feature_mos_jni.cpp index c87b825..5d02793 100644 --- a/jni/feature_mos_jni.cpp +++ b/jni/feature_mos_jni.cpp @@ -63,6 +63,7 @@ int mosaicWidth=0, mosaicHeight=0; //int blendingType = Blend::BLEND_TYPE_FULL; //int blendingType = Blend::BLEND_TYPE_CYLPAN; int blendingType = Blend::BLEND_TYPE_HORZ; +int stripType = Blend::STRIP_TYPE_THIN; bool high_res = false; bool quarter_res[NR] = {false,false}; float thresh_still[NR] = {5.0f,0.0f}; @@ -108,7 +109,7 @@ int Init(int mID, int nmax) // Check for initialization and if not, initialize if (!mosaic[mID]->isInitialized()) { - mosaic[mID]->initialize(blendingType, tWidth[mID], tHeight[mID], + mosaic[mID]->initialize(blendingType, stripType, tWidth[mID], tHeight[mID], nmax, quarter_res[mID], thresh_still[mID]); } @@ -477,6 +478,12 @@ JNIEXPORT void JNICALL Java_com_android_camera_panorama_Mosaic_setBlendingType( blendingType = int(type); } +JNIEXPORT void JNICALL Java_com_android_camera_panorama_Mosaic_setStripType( + JNIEnv* env, jobject thiz, jint type) +{ + stripType = int(type); +} + JNIEXPORT void JNICALL Java_com_android_camera_panorama_Mosaic_reset( JNIEnv* env, jobject thiz) { diff --git a/res/layout/effect_setting_item.xml b/res/layout/effect_setting_item.xml new file mode 100644 index 0000000..0b212c3 --- /dev/null +++ b/res/layout/effect_setting_item.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/EffectSettingItem"> + + <ImageView android:id="@+id/image" + android:layout_width="@dimen/effect_setting_item_icon_width" + android:layout_height="@dimen/effect_setting_item_icon_width" + android:layout_gravity="center_horizontal" + android:scaleType="fitCenter" + android:adjustViewBounds="true" /> + <TextView android:id="@+id/text" + style="@style/EffectSettingItemTitle"/> +</LinearLayout> diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml new file mode 100644 index 0000000..590c3e3 --- /dev/null +++ b/res/layout/effect_setting_popup.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> +<com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/SettingPopupWindow"> + + <LinearLayout android:orientation="vertical" + android:layout_height="wrap_content" + android:layout_width="@dimen/big_setting_popup_window_width"> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/dialog_top_holo_dark" + android:minHeight="@dimen/popup_title_frame_min_height"> + <TextView android:id="@+id/title" + style="@style/PopupTitleText" /> + </FrameLayout> + + <FrameLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/dialog_bottom_holo_dark"> + <GridView android:id="@+id/settingList" + style="@style/EffectSettingGrid" + android:choiceMode="singleChoice" /> + </FrameLayout> + </LinearLayout> +</com.android.camera.ui.BasicSettingPopup> diff --git a/res/layout/other_setting_popup.xml b/res/layout/other_setting_popup.xml index 730e00a..b207e2f 100644 --- a/res/layout/other_setting_popup.xml +++ b/res/layout/other_setting_popup.xml @@ -22,7 +22,7 @@ style="@style/SettingPopupWindow"> <LinearLayout android:orientation="vertical" - android:layout_width="@dimen/other_setting_popup_window_width" + android:layout_width="@dimen/big_setting_popup_window_width" android:layout_height="wrap_content"> <FrameLayout diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 2fd1a70..458aa42 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"ፓናሮማ በማዘጋጀት ላይ"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"ፓኖራማ ለማስቀመጥ ተስኗል"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"ፓኖራማ"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"ፓኖራማ በማንሳት ላይ"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"በማስቀመጥ ላይ…"</string> <string name="tap_to_focus" msgid="6417403734418828035">"ለማተኮር ሁለቴ ንካ"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"ማሳመሪያዎች"</string> <string name="effect_none" msgid="3601545724573307541">"ምንም የለም"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"ትናንሽ ዓይኖች"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"In Space"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"ፀሀይ ስትጠልቅ"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"ዲስኮ"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"የራስህን ምረጥ"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"መሳሪያዎን በዝርግ ስፍራ ላይ ያስቀምጡ እና ከእርስዎ ጀርባ ምንም ዓይነት መነቃነቅ እንደሌለ እርግጠኛ ሁን፡፡"\n\n" ከዛ በኋላ ከካሜራው እይታ ለቀው ይውጡ፡፡"</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"ተፅዕኖ ሲበራ ይህ መመረጥ አይችልም።"</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"የቅድመ ዕይታ ማያን ነካ በማድረግ በቪዲዮ ቀረፃ ጊዜ ፎቶ አንሳ።"</string> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index e19bf48..e5aaf35 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"جارٍ تحضير العرض البانورامي"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"أخفق حفظ العرض البانورامي"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"عرض بانورامي"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"جارٍ التقاط عرض بانورامي"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"جارٍ الحفظ..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"انقر للتركيز"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"تأثيرات"</string> <string name="effect_none" msgid="3601545724573307541">"بلا"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"عيون صغيرة"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"في الفضاء"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"الغروب"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"ديسكو"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"اختيارك الخاص"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"ضع الجهاز على سطح ثابت وتأكد من عدم وجود حركة خلفك."\n\n"ثم انتقل إلى وضع الكاميرا."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"هذا الإعداد غير قابل للتحديد عند تشغيل التأثير."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"التقاط صورة أثناء تسجيل الفيديو من خلال النقر على شاشة المعاينة."</string> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 220513f..18cadda 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Панорамата се подготвя"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Запазването на панорамата не бе успешно"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Панорамата се заснема"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Запазва се..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Докоснете за фокусиране"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Ефекти"</string> <string name="effect_none" msgid="3601545724573307541">"Без ефекти"</string> @@ -116,14 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Голям нос"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Малки очи"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"В космоса"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залез"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Изберете свой"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Поставете устройството си върху стабилна повърхност и се уверете, че зад вас нищо не се движи."\n\n"След което се отдръпнете от зрителното поле на камерата."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Това не може да се избира при включен ефект."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Напр. снимка по време на видеозапис, докосвайки екрана за визуал."</string> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index bc41721..8156be2 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -118,6 +118,6 @@ <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Tria\'n un"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Col·loca el dispositiu sobre una superfície estable i assegura\'t que no hi hagi res que es mogui darrere teu."\n\n"A continuació, surt del davant de la càmera."</string> - <string name="not_selectable_in_effect" msgid="5093306709878914151">"Aquest opció no es pot seleccionar quan l\'efecte està activat."</string> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Aquesta opció no es pot seleccionar quan l\'efecte està activat."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Per fer una foto durant l\'enregistrament de vídeo, pica la pantalla de visualització prèvia."</string> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 71eb48c..3f7b4f8 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Příprava panoramatu"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama se nepodařilo uložit"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Snímání panoramatu"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Ukládání..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Klepnutím zaostříte"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekty"</string> <string name="effect_none" msgid="3601545724573307541">"Žádný"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Malé oči"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Ve vesmíru"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Západ slunce"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Vlastní"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Umístěte zařízení na pevný povrch a zkontrolujte, zda se za vámi nic nehýbe."\n\n"Poté ustupte ze záběru kamery."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavení nelze vybrat, pokud je efekt zapnutý."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Během nahrávání videa lze fotit klepnutím na obrazovku náhledu."</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 3f33c4d..2e314f0 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Forbereder panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama kunne ikke gemmes"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Optagelse af panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Gemmer..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Tryk for at fokusere"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekter"</string> <string name="effect_none" msgid="3601545724573307541">"Ingen"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Små øjne"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"I rummet"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Vælg din egen"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Placer enheden på en jævn overflade, og sørg for, at der ikke er noget i baggrunden, der bevæger sig."\n\n"Gå derefter ud af billedet."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dette kan ikke vælges, når effekten er slået til."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Tryk på eksempelskærmen for at tage et foto under videooptagelse."</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 66edce7..c7260d3 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama wird vorbereitet..."</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama konnte nicht gespeichert werden."</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama wird aufgenommen."</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Speichern..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Zum Fokussieren tippen"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekte"</string> <string name="effect_none" msgid="3601545724573307541">"Effekt löschen"</string> @@ -116,14 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Große Nase"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Kleine Augen"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Im Weltraum"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sonnenuntergang"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Eigenen wählen"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Legen Sie Ihr Gerät auf eine stabile Oberfläche und achten Sie darauf, dass sich hinter Ihnen nichts bewegt."\n\n"Treten Sie anschließend aus dem Bild."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Einstellung nicht wählbar, wenn Effekt aktiviert"</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Durch Tippen Foto während Videoaufzeichnung aufnehmen"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 6b853e4..837ae97 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Προετοιμασία πανοραμικής εικ."</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Η αποθήκευση του πανοράματος απέτυχε"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Πανόραμα"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Λήψη πανοράματος"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Αποθήκευση..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Πατήστε για εστίαση"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Εφέ"</string> <string name="effect_none" msgid="3601545724573307541">"Κανένα"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Μικρά μάτια"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Στο διάστημα"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Δύση ηλίου"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Ντίσκο"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Επιλέξτε"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Τοποθετήστε τη συσκευή σας σε μια σταθερή επιφάνεια και βεβαιωθείτε ότι δεν υπάρχουν κινήσεις πίσω σας."\n\n" Στη συνέχεια, απομακρυνθείτε από το οπτικό πεδίο της κάμερας."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Αδύνατη η επιλογή του όταν το εφέ είναι ενεργό."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Τραβ. μια φωτογρ. κατά την εγγρ. βίντεο πατώντας την οθ.προεπισκ."</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index fe28366..04a34f8 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparando el panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Error al guardar panorama"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Capturando el panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Guardando..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Tocar para enfocar"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efectos"</string> <string name="effect_none" msgid="3601545724573307541">"Ninguno"</string> @@ -116,14 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nariz grande"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Ojos pequeños"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"En el espacio"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Crepúsculo"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Elige el tuyo"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo sobre una superficie firme y asegúrate de que no se produzca ningún movimiento detrás de ti."\n\n"Luego ubícate fuera del alcance de la cámara."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede seleccionar esta opción si se activó el efecto."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Para tomar una foto durante una grabación, toca el visor."</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 93fbf55..a4ce448 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparando modo panorámico"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Error al guardar en modo panorámico"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorámico"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Capturando panorámica"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Guardando..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Tocar para enfocar"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efectos"</string> <string name="effect_none" msgid="3601545724573307541">"Ninguno"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Ojos pequeños"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"En el espacio"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Atardecer"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Personalizado"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo en una superficie plana y comprueba que no se produzca ningún movimiento detrás."\n\n"A continuación, colócate fuera de la vista de la cámara."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede seleccionar si el efecto está activado."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Toca la pantalla de vista previa para hacer una foto mientras grabas un vídeo."</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 8a54e82..61622a7 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Valmistellaan panoraamaa"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panoraaman tallennus epäonnistui"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panoraama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Panoraamakuvaus"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Tallennetaan"</string> <string name="tap_to_focus" msgid="6417403734418828035">"Aktivoi napauttamalla"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Tehosteet"</string> <string name="effect_none" msgid="3601545724573307541">"Ei mitään"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Pienet silmät"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Avaruus"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Auringonlasku"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Valitse oma"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Sijoita laite vakaalle alustalle ja varmista, että taustalla ei ole liikkuvia kohteita."\n\n"Astu sitten pois kuvasta."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tämä ei ole valittavissa, kun tehoste on käytössä."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Ota kuva videokuvauksen aikana napauttamalla esikatseluruutua."</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 81e538d..aa0e3bd 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Préparation vue panoramique..."</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Échec enregistrement vue panoramique."</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panoramique"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Capture vue panoramique..."</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Enreg..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Appuyez pour autofocus."</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Effets"</string> <string name="effect_none" msgid="3601545724573307541">"Aucun"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Petits yeux"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Dans l\'espace"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Coucher soleil"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Personnalisé"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Placez l\'appareil sur une surface stable, et assurez-vous qu\'il n\'y a pas de mouvement derrière vous."\n\n"Sortez ensuite du champ de vision de l\'appareil photo."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Sélection impossible lorsque l\'effet est activé."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Appuyez sur écran prévis. pour prendre photo pendant enreg. vidéo"</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 425d0f7..9723ce7 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Priprema panorame"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Spremanje panorame nije uspjelo"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Snimanje panorame"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Spremanje..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Dotaknite za fokus"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekti"</string> <string name="effect_none" msgid="3601545724573307541">"Ništa"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Male oči"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"U svemiru"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zalazak sunca"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Izaberite svoj"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite uređaj na stabilnu površinu i provjerite da nema kretanja iza vas."\n\n"Tada izađite iz vidokruga kamere."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ovo se ne može odabrati kad je učinak uključen."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Snimite fotografiju tijekom snimanja videozapisa pritiskom na zaslon pregleda."</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 7839fbe..06c2c40 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panoráma előkészítése"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"A panoráma mentése nem sikerült"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panoráma"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Panoráma rögzítése"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Mentés..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Koppintva fókuszálhat"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Hatások"</string> <string name="effect_none" msgid="3601545724573307541">"Nincs"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Kis szemek"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Az űrben"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Napnyugta"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Diszkó"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Válassza ki sajátját"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Helyezze eszközét egy stabil felületre, és bizonyosodjon meg arról, hogy Ön mögött nincs mozgás."\n\n"Ezután lépjen ki a kamera látószögéből."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ez nem választható, ha az effekt be van kapcsolva."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Képkészítés videofelvétel közben: előnézeti képernyő megérintése"</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 628f188..184cd00 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Menyiapkan panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Gagal menyimpan panorama"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Menangkap Panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Menyimpan..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Ketuk untuk memfokuskan"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efek"</string> <string name="effect_none" msgid="3601545724573307541">"Tidak Ada"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mata Kecil"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Luar Angkasa"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Matahari terbenam"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Pilih sendiri"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Tempatkan perangkat pada permukaan yang stabil dan pastikan tidak ada gerakan di belakang Anda."\n\n"Setelah itu keluarlah dari pandangan kamera."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setelan ini tidak dapat dipilih jika efek aktif."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Mengambil foto saat merekam video dengan mengetuk layar pratinjau."</string> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index ee62bee..a7c67eb 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"מכין פנורמה"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"תקלה בשמירת פנורמה"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"פנורמה"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"מבצע צילום פנורמה"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"שומר..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"הקש כדי להתמקד"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"אפקטים"</string> <string name="effect_none" msgid="3601545724573307541">"ללא"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"עיניים קטנות"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"בחלל"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"שקיעה"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"דיסקו"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"בחר סרטון משלך"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"הנח את המכשיר על גבי משטח יציב והקפד לוודא שאין תנועה מאחוריך."\n\n"לאחר מכן, צא מטווח הראייה של המצלמה."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"לא ניתן לבחור באפשרות זו כאשר האפקט מופעל."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"צלם תמונה במהלך הקלטת וידאו על ידי הקשה על מסך התצוגה המקדימה."</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index ba60d59..a6f02db 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -116,8 +116,7 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"大きな鼻"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"小さな目"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"宇宙空間"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"夕焼け"</string> <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> <skip /> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"ギャラリーから"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 709a2b5..1039c25 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"파노라마 준비 중"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"파노라마를 저장하지 못했습니다."</string> <string name="pano_dialog_title" msgid="5755531234434437697">"파노라마"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"파노라마 캡처 중"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"저장 중..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"탭하여 초점 맞추기"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"효과"</string> <string name="effect_none" msgid="3601545724573307541">"없음"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"눈 작게"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"우주"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"일몰"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"디스코"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"직접 선택"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"기기를 평평한 바닥에 올려놓고 뒤에 움직이는 물체가 없는지 확인합니다. "\n\n"그런 다음 카메라 뷰 밖으로 비켜섭니다."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"효과를 사용 중일 때는 선택할 수 없습니다."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"동영상을 녹화하는 동안 미리보기 화면을 탭하여 사진을 찍을 수 있습니다."</string> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 8c838b2..098856d 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Ruošiama panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Nepavyko išsaugoti panoramos"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Fiksuojama panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Išsaugoma..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Fokusuoti (palieskite)"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efektai"</string> <string name="effect_none" msgid="3601545724573307541">"Joks"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mažos akys"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Kosmose"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Saulėlydis"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Pasirink. savo"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Įrenginį padėkite ant stabilaus paviršiaus ir įsitikinkite, kad už jūsų niekas nejuda."\n\n"Pasitraukite iš kameros regėjimo lauko."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Negalima pasirinkti, kai efektas įjungtas."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Kai įrašomas vaizdo įr., fotografuokite paliesdami peržiūros ekraną."</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index cc78d36..c85c000 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Notiek panorāmas sagatavošana"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Neizdevās saglabāt panorāmu."</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorāma"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Notiek panorāmas tveršana"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Saglabā..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Pieskarieties, lai fokusētu."</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekti"</string> <string name="effect_none" msgid="3601545724573307541">"Nav"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mazas acis"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Kosmosā"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Saulriets"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Diskotēka"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Izvēlēties"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Novietojiet ierīci uz stabilas virsmas un pārliecinieties, ka aiz jums nenotiek nekāda kustība."\n\n"Pēc tam izejiet no kameras skata."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Šo iest. nevar atlasīt, kad ir ieslēgts efekts."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotografējiet video ierakst. laikā, pieskaroties priekšsk. ekr."</string> </resources> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 9e76e52..46fea36 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -116,8 +116,7 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Hidung Besar"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mata Kecil"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Di Angkasa"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Matahari Terbenam"</string> <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> <skip /> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Pilih sendiri"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 04ec626..1cea583 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Forbereder panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Lagring av panorama mislyktes"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Panoramaopptak"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Lagrer …"</string> <string name="tap_to_focus" msgid="6417403734418828035">"Trykk for å fokusere"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekter"</string> <string name="effect_none" msgid="3601545724573307541">"Ingen"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Små øyne"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Verdensrommet"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Velg din egen"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Plassér enheten på et stødig underlag og sørg for at det ikke er noen bevegelser bak deg."\n\n"Deretter flytter du deg bort fra kamerabildet."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Du kan ikke velge dette når effekten er aktivert."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Ta et bilde under opptaket ved å trykke på forhåndsvisningen."</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 3c24e40..b250da3 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama voorbereiden"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Kan panorama niet opslaan"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama vastleggen"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Opslaan..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Tikken voor autofocus"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Effecten"</string> <string name="effect_none" msgid="3601545724573307541">"Geen"</string> @@ -116,14 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Grote neus"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Kleine ogen"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"In de ruimte"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zonsondergang"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Zelf kiezen"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Plaats uw apparaat op een stevige ondergrond en zorg ervoor dat er geen beweging achter u te zien is."\n\n"Stap vervolgens uit beeld."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dit kan niet worden geselecteerd wanneer het effect is ingeschakeld."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Tik voor een foto bij video-opnamen op het voorbeeldscherm."</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index fdaca80..6d03361 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Przygotowywanie panoramy"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Nie można zapisać panoramy."</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Wykonywanie panoramy"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Zapis..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Dotknij, aby wyostrzyć"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekty"</string> <string name="effect_none" msgid="3601545724573307541">"Brak"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Małe oczy"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"W kosmosie"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zachód słońca"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Wybierz własne"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Umieść urządzenie na stabilnej powierzchni i upewnij się, że za Tobą nic się nie dzieje."\n\n"Następnie wyjdź z pola widzenia aparatu."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Opcji nie można wybrać, gdy efekt jest włączony."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Zrób zdjęcie podczas nagrywania filmu, klikając ekran podglądu."</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 5ca66f9..b5be5ba 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"A preparar panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Falha ao guardar o panorama"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"A Capturar Panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"A guardar..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Toque para focar"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efeitos"</string> <string name="effect_none" msgid="3601545724573307541">"Nenhum"</string> @@ -116,13 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nariz Grande"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Olhos Pequenos"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"No Espaço"</string> - <string name="effect_backdropper_sunset" msgid="45198943771777870">"Pôr do sol"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Pôr do Sol"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Escolha o seu"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o aparelho numa superfície estável e certifique-se de que não existe movimento atrás de si."\n\n"Em seguida, saia do alcance visual da câmara."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Isto não é selecionável quando o efeito está ativado."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma fotografia durante a gravação de vídeo tocando no ecrã de pré-visualização."</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 5b40a47..c48ab41 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparando panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Falha ao salvar o panorama"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Capturando panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Salvando..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Toque para obter foco"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efeitos"</string> <string name="effect_none" msgid="3601545724573307541">"Nenhum"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Olhos pequenos"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"No espaço"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Pôr-do-sol"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Discoteca"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Escolher"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o dispositivo sobre uma superfície estável sem movimento atrás de você."\n\n"Em seguida, saia do campo de visão da câmera."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Não é possível selecionar com o efeito ativado."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma foto ao gravar um vídeo tocando na tela de visualização."</string> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 78c299b..74c38ca 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Se pregăteşte panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Salvarea panoramei a eşuat"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panoramă"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Se capturează panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Salvare..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Apăsaţi pt. a focaliza"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efecte"</string> <string name="effect_none" msgid="3601545724573307541">"Niciunul"</string> @@ -116,14 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nas mare"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Ochi mici"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"În spaţiu"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Apus de soare"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Alegeţi unul"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Aşezaţi dispozitivul pe o suprafaţă stabilă şi asiguraţi-vă că nu există mişcare în spatele dvs."\n\n"Apoi, ieşiţi din vizorul camerei foto."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setarea nu poate fi selectată cu efectul activat."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotogr. în timpul înregistr. video apăsând pe ecranul de previz."</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 60a29a3..5c6c93e 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Подготовка панорамы..."</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Не удалось сохранить панораму"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Создание панорамы..."</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Сохранение…"</string> <string name="tap_to_focus" msgid="6417403734418828035">"Нажмите для фокусировки"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Эффекты"</string> <string name="effect_none" msgid="3601545724573307541">"Без эффектов"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Мал. глаза"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Космос"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Закат"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Выбрать видео"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Поставьте устройство на твердую поверхность и убедитесь, что позади вас нет движущихся предметов или людей."\n\n"Затем отойдите от камеры."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Недоступно при использовании этого эффекта."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Чтобы сделать снимок при видеосъемке, нажмите на экран просмотра."</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index a0c5acc..e19bdf8 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Príprava panorámy"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorámu sa nepodarilo uložiť"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panoráma"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Snímanie panorámy"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Ukladá sa..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Klepnutím zaostrite"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekty"</string> <string name="effect_none" msgid="3601545724573307541">"Žiadne"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Malé oči"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Vo vesmíre"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Západ slnka"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Zvoliť vlastné"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Umiestnite zariadenie na pevný povrch a uistite sa, že sa za vami nič nehýbe."\n\n"Potom ustúpte zo záberu fotoaparátu."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavenie nie je možné vybrať pri zapnutom efekte."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Počas nahrávania videa môžete fotiť klepnutím na obrazovku ukážky."</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 0716644..a5b5eac 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Priprava panorame"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorame ni bilo mogoče shraniti"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Zajemanje panorame"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Shranjevanje"</string> <string name="tap_to_focus" msgid="6417403734418828035">"Tapnite za ostrenje"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Učinki"</string> <string name="effect_none" msgid="3601545724573307541">"Brez"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Majhne oči"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"V vesolju"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sončni zahod"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Izberite svoje"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite napravo na stabilno površino in se prepričajte, da za vami ni gibanja."\n\n"Nato se umaknite iz prizora."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tega ni mogoče izbrati, ko je vklopljen učinek."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Če želite med snemanjem videa fotografirati, tapnite predogled."</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 0a9d046..eac7120 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Припремање панораме"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Чување панораме није успело"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Снимање панораме"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Чување..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Додирните за фокусирање"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Ефекти"</string> <string name="effect_none" msgid="3601545724573307541">"Ништа"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Мале очи"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"У свемиру"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залазак сунца"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Изаберите свој"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Поставите уређај на стабилну површину и уверите се да се иза вас ништа не помера."\n\n"Затим изађите из кадра камере."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ово није могуће изабрати када је ефекат укључен."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Снимите слику током видео снимања додиривањем екрана за преглед."</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 2e08374..cef20bb 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Förbereder panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Det gick inte att spara panorama"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama fotas"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Sparar ..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Knacka lätt för fokus"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekter"</string> <string name="effect_none" msgid="3601545724573307541">"Ingen"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Små ögon"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"I rymden"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgång"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Välj en egen"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Placera enheten på en stadig yta och se till att det är lugnt bakom dig."\n\n"Gå åt sidan så du inte syns på bilden."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Det går inte att välja detta när effekten är på."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Knacka lätt på skärmen om du vill fota under inspelningen."</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 9b58060..c319f47 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"กำลังสร้างพาโนรามา"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"ไม่สามารถบันทึกภาพพาโนรามา"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"พาโนรามา"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"กำลังจับภาพพาโนรามา"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"กำลังบันทึก..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"แตะเพื่อโฟกัส"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"เอฟเฟ็กต์"</string> <string name="effect_none" msgid="3601545724573307541">"ไม่มี"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"ตาเล็ก"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"พื้นที่ว่าง"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"พระอาทิตย์ตก"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"ดิสโก้"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"เลือกเอง"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"วางอุปกรณ์ของคุณบนพื้นผิวที่มั่นคงและแน่ใจว่าไม่มีการเคลื่อนไหวด้านหลังคุณ"\n\n"จากนั้นออกจากมุมมองของกล้อง"</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"เลือกการตั้งค่านี้ไม่ได้หากเปิดใช้เอฟเฟ็กต์อยู่"</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"ถ่ายภาพระหว่างการบันทึกวิดีโอโดยการแตะบนหน้าจอหน้าตัวอย่าง"</string> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index b7c9374..8fcf6d6 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Ihinahanda ang panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Nabigong i-save ang panorama"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Kinukunan ang Panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Sine-save..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Tapikin upang ituon"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Mga Effect"</string> <string name="effect_none" msgid="3601545724573307541">"Wala"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Maliit na Mata"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Sa Kalawakan"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Paglubog ng araw"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Pumili ng sa iyo"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Ipatong ang iyong device sa isang matatag na bagay at tiyaking walang kumikilos sa iyong likuran."\n\n"Pagkatapos ay umalis sa view ng camera."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Hindi ito napipili kapag naka-on ang effect."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Kumuha ng larawan habang nagre-record ng video sa pamamagitan ng pagtapik sa screen ng preview."</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 3b53504..5a00668 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -116,8 +116,7 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Büyük Burun"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Küçük Gözler"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Uzayda"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"Gün Batımı"</string> <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> <skip /> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Kendiniz seçin"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index ad5fe52..94777de 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Підготовка панорами"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Не вдалося зберегти панораму"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Панорамна зйомка"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Збереження..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Торкніться, щоб фокусув."</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Ефекти"</string> <string name="effect_none" msgid="3601545724573307541">"Немає"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Маленькі очі"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"У космосі"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Захід сонця"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Власний варіант"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Покладіть свій пристрій на нерухому поверхню та переконайтеся, що за вами немає жодного руху."\n\n"Потім вийдіть із поля зору камери."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Це не можна вибрати, якщо ввімкнено ефект."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Зробіть фото під час відеозйомки, торкнувшись екрана перегляду."</string> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 02e9751..f31dfef 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Đang tạo xem trước toàn cảnh"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Không thể lưu toàn cảnh"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Toàn cảnh"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Đang chụp toàn cảnh"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Đang lưu..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Chạm để lấy tiêu điểm"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Hiệu ứng"</string> <string name="effect_none" msgid="3601545724573307541">"Bỏ chọn tất cả"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Đôi mắt nhỏ"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Trong dấu cách"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Hoàng hôn"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Chọn video của riêng bạn"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Đặt thiết bị của bạn lên bề mặt chắc chắn và đảm bảo không có chuyển động nào phía sau bạn."\n\n"Sau đó, thoát khỏi chế độ xem của máy ảnh."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Không thể chọn cài đặt này khi hiệu ứng này được bật."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Chụp ảnh khi đang quay video bằng cách bấm vào màn hình xem trước."</string> </resources> diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml index b5a5e95..a3c909d 100644 --- a/res/values-w1024dp/dimens.xml +++ b/res/values-w1024dp/dimens.xml @@ -43,6 +43,8 @@ <dimen name="setting_item_list_margin">16dp</dimen> <dimen name="popup_title_text_size">22dp</dimen> <dimen name="popup_title_frame_min_height">48dp</dimen> - <dimen name="other_setting_popup_window_width">590dp</dimen> + <dimen name="big_setting_popup_window_width">590dp</dimen> <dimen name="setting_item_icon_width">35dp</dimen> + <dimen name="effect_setting_item_icon_width">54dp</dimen> + <dimen name="effect_setting_item_text_size">21dp</dimen> </resources> diff --git a/res/values-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml index a707720..6bde0a5 100644 --- a/res/values-w1280dp/dimens.xml +++ b/res/values-w1280dp/dimens.xml @@ -33,6 +33,6 @@ <dimen name="setting_item_list_margin">16dp</dimen> <dimen name="popup_title_text_size">22dp</dimen> <dimen name="popup_title_frame_min_height">48dp</dimen> - <dimen name="other_setting_popup_window_width">590dp</dimen> + <dimen name="big_setting_popup_window_width">590dp</dimen> <dimen name="setting_item_icon_width">35dp</dimen> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index bf3ba60..10603ec 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"正在生成全景图"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"保存全景图失败"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"全景图"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"正在拍摄全景图"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"正在保存..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"点按即可对焦"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"效果"</string> <string name="effect_none" msgid="3601545724573307541">"无"</string> @@ -116,14 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"大鼻子"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"小眼睛"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"太空背景"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"日落"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"迪斯科"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"自选背景"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"将您的设备放置在一个平稳的表面上，并确保您的身后没有任何移动的物体。"\n\n"然后走出摄像头的取景范围。"</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"无法在效果开启时选择此设置。"</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"录制视频时点按预览屏幕可拍摄照片。"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 35780d4..73d4e7f 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"正在準備全景預覽"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"無法儲存全景"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"全景"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"全景拍攝中"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"儲存中..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"輕按即可聚焦"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"效果"</string> <string name="effect_none" msgid="3601545724573307541">"無"</string> @@ -116,14 +114,10 @@ <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"大鼻子"</string> <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"小眼睛"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"太空"</string> - <!-- no translation found for effect_backdropper_sunset (45198943771777870) --> - <skip /> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_sunset" msgid="45198943771777870">"黃昏"</string> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"迪斯可"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"自行挑選"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"將您的裝置放在平穩的表面上，確定自己身後沒有移動的物體。"\n\n"然後離開相機鏡頭的視野範圍。"</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"效果啟用時無法選取這項設定。"</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"影片錄製期間，只要輕按預覽畫面即可拍攝相片。"</string> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index c4d0a52..09bafa2 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -102,10 +102,8 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Ilungiselela i-panorama"</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Ihlulekile ukulondoloza i-Panaroma"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"I-Panorama"</string> - <!-- no translation found for pano_capture_indication (7431983072966619171) --> - <skip /> - <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) --> - <skip /> + <string name="pano_capture_indication" msgid="7431983072966619171">"Ilondoloza i-Panorama"</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Iyalondoloza..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Thepha ukuze uqondanise"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Imithelela"</string> <string name="effect_none" msgid="3601545724573307541">"Lutho"</string> @@ -117,12 +115,9 @@ <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Amehlo Amancane"</string> <string name="effect_backdropper_space" msgid="1381012939195370792">"Eskhaleni"</string> <string name="effect_backdropper_sunset" msgid="45198943771777870">"Ukushona kwelanga"</string> - <!-- no translation found for effect_backdropper_disco (8494822051982972854) --> - <skip /> + <string name="effect_backdropper_disco" msgid="8494822051982972854">"i-Disco!"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Khetha eyakho"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Beka i-device yakho endaweni enganyakazi bese uqinisekisa ukuthi akukho ukunyakaza ngemuva kwakho."\n\n"Bese usuka lapho kubheke khona ikhamera."</string> - <!-- no translation found for not_selectable_in_effect (5093306709878914151) --> - <skip /> - <!-- no translation found for video_snapshot_hint (6479115859014094906) --> - <skip /> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Lokhu akukhetheki uma isinandisi sisavulekile."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Thatha isithombe ngesikhathi sokuqoshwa kwevidyo ngokuchofoza eskrinini sokubuka ngaphambili kokudlala."</string> </resources> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 51b4085..8ad433e 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -20,21 +20,18 @@ <string-array name="pref_video_quality_entries" translatable="false"> <item>@string/pref_video_quality_entry_high</item> <item>@string/pref_video_quality_entry_low</item> - <item>@string/pref_video_quality_entry_mms</item> <item>@string/pref_video_quality_entry_youtube</item> </string-array> <string-array name="pref_video_quality_entryvalues" translatable="false"> <item>@string/pref_video_quality_high</item> <item>@string/pref_video_quality_low</item> - <item>@string/pref_video_quality_mms</item> <item>@string/pref_video_quality_youtube</item> </string-array> <array name="video_quality_largeicons" translatable="false"> <item>@drawable/ic_viewfinder_video_quality_high</item> <item>@drawable/ic_viewfinder_video_quality_low</item> - <item>@drawable/ic_viewfinder_video_quality_mms</item> <item>@drawable/ic_viewfinder_video_quality_youtube</item> </array> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 1e14663..fe1f2d7 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -40,6 +40,8 @@ <dimen name="setting_item_list_margin">6dp</dimen> <dimen name="popup_title_text_size">18dp</dimen> <dimen name="popup_title_frame_min_height">32dp</dimen> - <dimen name="other_setting_popup_window_width">320dp</dimen> + <dimen name="big_setting_popup_window_width">320dp</dimen> <dimen name="setting_item_icon_width">28dp</dimen> + <dimen name="effect_setting_item_icon_width">40dp</dimen> + <dimen name="effect_setting_item_text_size">12dp</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index ddd6371..91426c8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -170,4 +170,33 @@ <item name="android:windowEnterAnimation">@anim/share_popup_enter</item> <item name="android:windowExitAnimation">@anim/share_popup_exit</item> </style> + <style name="EffectSettingGrid"> + <item name="android:layout_marginLeft">@dimen/setting_item_list_margin</item> + <item name="android:layout_marginRight">@dimen/setting_item_list_margin</item> + <item name="android:paddingBottom">3dp</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:numColumns">3</item> + <item name="android:verticalSpacing">3dp</item> + <item name="android:horizontalSpacing">3dp</item> + </style> + <style name="EffectSettingItem"> + <item name="android:orientation">vertical</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:paddingTop">9dp</item> + <item name="android:paddingBottom">9dp</item> + <item name="android:paddingLeft">2dp</item> + <item name="android:paddingRight">2dp</item> + <item name="android:background">@drawable/setting_picker</item> + </style> + <style name="EffectSettingItemTitle"> + <item name="android:textSize">@dimen/effect_setting_item_text_size</item> + <item name="android:gravity">center</item> + <item name="android:textColor">@android:color/white</item> + <item name="android:singleLine">true</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:paddingTop">1dp</item> + </style> </resources> diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 1274a72..26d4497 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -49,7 +49,6 @@ import android.os.Message; import android.os.MessageQueue; import android.os.SystemClock; import android.provider.MediaStore; -import android.provider.Settings; import android.util.Log; import android.view.GestureDetector; import android.view.Gravity; @@ -62,7 +61,6 @@ import android.view.OrientationEventListener; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; -import android.view.Window; import android.view.WindowManager; import android.view.animation.AnimationUtils; import android.widget.TextView; @@ -952,6 +950,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, mIndicatorControlContainer.initialize(this, mPreferenceGroup, mParameters.isZoomSupported(), SETTING_KEYS, OTHER_SETTING_KEYS); + updateSceneModeUI(); mIndicatorControlContainer.setListener(this); } diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java index f78f5dc..6d4faf4 100644 --- a/src/com/android/camera/EffectsRecorder.java +++ b/src/com/android/camera/EffectsRecorder.java @@ -85,6 +85,7 @@ public class EffectsRecorder { private GraphEnvironment mGraphEnv; private int mGraphId; private GraphRunner mRunner = null; + private GraphRunner mOldRunner = null; private SurfaceTexture mTextureSource; @@ -262,7 +263,7 @@ public class EffectsRecorder { mErrorListener = errorListener; } - public void initializeFilterFramework() { + private void initializeFilterFramework() { mGraphEnv = new GraphEnvironment(); mGraphEnv.createGLEnvironment(); @@ -279,7 +280,7 @@ public class EffectsRecorder { mCurrentEffect = EFFECT_NONE; } - public synchronized void initializeEffect(boolean forceReset) { + private synchronized void initializeEffect(boolean forceReset) { if (forceReset || mCurrentEffect != mEffect || mCurrentEffect == EFFECT_BACKDROPPER) { @@ -287,13 +288,11 @@ public class EffectsRecorder { "previewSurface", mPreviewSurfaceHolder.getSurface(), "previewWidth", mPreviewWidth, "previewHeight", mPreviewHeight); - if (mState == STATE_PREVIEW) { - // Switching effects while running. Stop existing runner. - // The stop callback will take care of starting new runner. + // Switching effects while running. Inform video camera. sendMessage(mCurrentEffect, EFFECT_MSG_STOPPING_EFFECT); - mRunner.stop(); } + switch (mEffect) { case EFFECT_GOOFY_FACE: mGraphId = mGraphEnv.loadGraph(mContext, R.raw.goofy_face); @@ -307,8 +306,21 @@ public class EffectsRecorder { } mCurrentEffect = mEffect; + mOldRunner = mRunner; mRunner = mGraphEnv.getRunner(mGraphId, GraphEnvironment.MODE_ASYNCHRONOUS); mRunner.setDoneCallback(mRunnerDoneCallback); + + if (mState == STATE_PREVIEW) { + // Switching effects while running. Stop existing runner. + // The stop callback will take care of starting new runner. + mCameraDevice.stopPreview(); + try { + mCameraDevice.setPreviewTexture(null); + } catch(IOException e) { + throw new RuntimeException("Unable to connect camera to effect input", e); + } + mOldRunner.stop(); + } } switch (mCurrentEffect) { @@ -328,7 +340,7 @@ public class EffectsRecorder { setFaceDetectOrientation(mOrientationHint); } - public void startPreview() { + public synchronized void startPreview() { if (mLogVerbose) Log.v(TAG, "Starting preview (" + this + ")"); switch (mState) { @@ -421,7 +433,7 @@ public class EffectsRecorder { } }; - public void startRecording() { + public synchronized void startRecording() { if (mLogVerbose) Log.v(TAG, "Starting recording (" + this + ")"); switch (mState) { @@ -453,7 +465,7 @@ public class EffectsRecorder { mState = STATE_RECORD; } - public void stopRecording() { + public synchronized void stopRecording() { if (mLogVerbose) Log.v(TAG, "Stop recording (" + this + ")"); switch (mState) { @@ -472,7 +484,7 @@ public class EffectsRecorder { } // Stop and release effect resources - public void stopPreview() { + public synchronized void stopPreview() { if (mLogVerbose) Log.v(TAG, "Stopping preview (" + this + ")"); switch (mState) { @@ -493,7 +505,15 @@ public class EffectsRecorder { mCurrentEffect = EFFECT_NONE; + mCameraDevice.stopPreview(); + try { + mCameraDevice.setPreviewTexture(null); + } catch(IOException e) { + throw new RuntimeException("Unable to connect camera to effect input", e); + } + mState = STATE_CONFIGURE; + mOldRunner = mRunner; mRunner.stop(); // Rest of stop and release handled in mRunnerDoneCallback @@ -525,6 +545,11 @@ public class EffectsRecorder { new OnRunnerDoneListener() { public void onRunnerDone(int result) { synchronized(EffectsRecorder.this) { + if (mOldRunner != null) { + if (mLogVerbose) Log.v(TAG, "Tearing down old graph."); + mOldRunner.getGraph().tearDown(mGraphEnv.getContext()); + mOldRunner = null; + } if (mState == STATE_PREVIEW) { // Switching effects, start up the new runner if (mLogVerbose) Log.v(TAG, "Previous effect halted, starting new effect."); @@ -533,7 +558,6 @@ public class EffectsRecorder { } else if (mState != STATE_RELEASED) { // Shutting down effects if (mLogVerbose) Log.v(TAG, "Runner halted, restoring direct preview"); - mCameraDevice.stopPreview(); try { mCameraDevice.setPreviewDisplay(mPreviewSurfaceHolder); } catch(IOException e) { @@ -555,7 +579,6 @@ public class EffectsRecorder { case STATE_RECORD: case STATE_PREVIEW: stopPreview(); - mCameraDevice.stopPreview(); // Fall-through default: mState = STATE_RELEASED; diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index f100d28..39d3298 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -444,7 +444,9 @@ public class VideoCamera extends ActivityBase private void loadCameraPreferences() { CameraSettings settings = new CameraSettings(this, mParameters, mCameraId, CameraHolder.instance().getCameraInfo()); - mPreferenceGroup = settings.getPreferenceGroup(R.xml.video_preferences); + // Remove the video quality preference setting when the quality is given in the intent. + mPreferenceGroup = filterPreferenceScreenByIntent( + settings.getPreferenceGroup(R.xml.video_preferences)); } private boolean collapseCameraControls() { diff --git a/src/com/android/camera/panorama/Mosaic.java b/src/com/android/camera/panorama/Mosaic.java index b586aad..9ad2c64 100644 --- a/src/com/android/camera/panorama/Mosaic.java +++ b/src/com/android/camera/panorama/Mosaic.java @@ -68,6 +68,21 @@ public class Mosaic { public static final int BLENDTYPE_HORIZONTAL =3; /** + * This strip type will use the default thin strips where the strips are + * spaced according to the image capture rate. + */ + public static final int STRIPTYPE_THIN = 0; + + /** + * This strip type will use wider strips for blending. The strip separation + * is controlled by a threshold on the native side. Since the strips are + * wider, there is an additional cross-fade blending step to make the seam + * boundaries smoother. Since this mode uses lesser image frames, it is + * computationally more efficient than the thin strip mode. + */ + public static final int STRIPTYPE_WIDE = 1; + + /** * Return flags returned by createMosaic() are one of the following. */ public static final int MOSAIC_RET_OK = 1; @@ -128,6 +143,13 @@ public class Mosaic { public native void setBlendingType(int type); /** + * Set the type of strips to use for blending. + * @param type the blending strip type to use {STRIPTYPE_THIN, + * STRIPTYPE_WIDE}. + */ + public native void setStripType(int type); + + /** * Tell the native layer to create the final mosaic after all the input frame * data have been collected. * The case of generating high-resolution mosaic may take dozens of seconds to finish. diff --git a/src/com/android/camera/panorama/MosaicFrameProcessor.java b/src/com/android/camera/panorama/MosaicFrameProcessor.java index dde4a22..54fc7b8 100644 --- a/src/com/android/camera/panorama/MosaicFrameProcessor.java +++ b/src/com/android/camera/panorama/MosaicFrameProcessor.java @@ -84,6 +84,7 @@ public class MosaicFrameProcessor { public void initialize() { setupMosaicer(mPreviewWidth, mPreviewHeight, mPreviewBufferSize); + setStripType(Mosaic.STRIPTYPE_WIDE); reset(); } @@ -92,6 +93,10 @@ public class MosaicFrameProcessor { mMosaicer.freeMosaicMemory(); } + public void setStripType(int type) { + mMosaicer.setStripType(type); + } + private void setupMosaicer(int previewWidth, int previewHeight, int bufSize) { Log.v(TAG, "setupMosaicer w, h=" + previewWidth + ',' + previewHeight + ',' + bufSize); mMosaicer.allocateMosaicMemory(previewWidth, previewHeight); diff --git a/src/com/android/camera/ui/BasicSettingPopup.java b/src/com/android/camera/ui/BasicSettingPopup.java index aca88ca..9220c3b 100644 --- a/src/com/android/camera/ui/BasicSettingPopup.java +++ b/src/com/android/camera/ui/BasicSettingPopup.java @@ -23,8 +23,8 @@ import android.content.Context; import android.util.AttributeSet; import android.util.Log; import android.view.View; +import android.widget.AbsListView; import android.widget.AdapterView; -import android.widget.ListView; import android.widget.SimpleAdapter; import java.util.ArrayList; @@ -47,7 +47,7 @@ public class BasicSettingPopup extends AbstractSettingPopup implements super(context, attrs); } - public void initialize(IconListPreference preference) { + public void initialize(IconListPreference preference, int settingItemLayoutId) { mPreference = preference; Context context = getContext(); CharSequence[] entries = mPreference.getEntries(); @@ -69,11 +69,11 @@ public class BasicSettingPopup extends AbstractSettingPopup implements listItem.add(map); } SimpleAdapter listItemAdapter = new SimpleAdapter(context, listItem, - R.layout.setting_item, + settingItemLayoutId, new String[] {"text", "image"}, new int[] {R.id.text, R.id.image}); - ((ListView) mSettingList).setAdapter(listItemAdapter); - ((ListView) mSettingList).setOnItemClickListener(this); + ((AbsListView) mSettingList).setAdapter(listItemAdapter); + ((AbsListView) mSettingList).setOnItemClickListener(this); reloadPreference(); } @@ -82,7 +82,7 @@ public class BasicSettingPopup extends AbstractSettingPopup implements public void reloadPreference() { int index = mPreference.findIndexOfValue(mPreference.getValue()); if (index != -1) { - ((ListView) mSettingList).setItemChecked(index, true); + ((AbsListView) mSettingList).setItemChecked(index, true); } else { Log.e(TAG, "Invalid preference value."); mPreference.print(); diff --git a/src/com/android/camera/ui/IndicatorButton.java b/src/com/android/camera/ui/IndicatorButton.java index 880a650..7948f7c 100644 --- a/src/com/android/camera/ui/IndicatorButton.java +++ b/src/com/android/camera/ui/IndicatorButton.java @@ -16,6 +16,7 @@ package com.android.camera.ui; +import com.android.camera.CameraSettings; import com.android.camera.IconListPreference; import com.android.camera.R; @@ -102,10 +103,17 @@ public class IndicatorButton extends AbstractIndicatorButton implements BasicSet Context.LAYOUT_INFLATER_SERVICE); ViewGroup root = (ViewGroup) getRootView().findViewById(R.id.frame_layout); - BasicSettingPopup popup = (BasicSettingPopup) inflater.inflate( - R.layout.basic_setting_popup, root, false); + BasicSettingPopup popup; + if (CameraSettings.KEY_VIDEO_EFFECT.equals(getKey())) { + popup = (BasicSettingPopup) inflater.inflate( + R.layout.effect_setting_popup, root, false); + popup.initialize(mPreference, R.layout.effect_setting_item); + } else { + popup = (BasicSettingPopup) inflater.inflate( + R.layout.basic_setting_popup, root, false); + popup.initialize(mPreference, R.layout.setting_item); + } popup.setSettingChangedListener(this); - popup.initialize(mPreference); root.addView(popup); mPopup = popup; } diff --git a/src/com/android/camera/ui/IndicatorControlBarContainer.java b/src/com/android/camera/ui/IndicatorControlBarContainer.java index 9c01e01..cc35d59 100644 --- a/src/com/android/camera/ui/IndicatorControlBarContainer.java +++ b/src/com/android/camera/ui/IndicatorControlBarContainer.java @@ -154,9 +154,7 @@ public class IndicatorControlBarContainer extends IndicatorControlContainer @Override public void overrideSettings(final String ... keyvalues) { - if (mSecondLevelIndicatorControlBar.getVisibility() == View.VISIBLE) { - mSecondLevelIndicatorControlBar.overrideSettings(keyvalues); - } + mSecondLevelIndicatorControlBar.overrideSettings(keyvalues); } @Override |