diff options
97 files changed, 3616 insertions, 1569 deletions
@@ -171,6 +171,7 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/view/IInputMethodClient.aidl \ core/java/com/android/internal/view/IInputMethodManager.aidl \ core/java/com/android/internal/view/IInputMethodSession.aidl \ + core/java/com/android/internal/widget/ILockSettings.aidl \ core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \ core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \ keystore/java/android/security/IKeyChainAliasCallback.aidl \ diff --git a/api/current.txt b/api/current.txt index d8461e7..80918b8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -727,6 +727,7 @@ package android { field public static final int panelColorForeground = 16842848; // 0x1010060 field public static final int panelFullBackground = 16842847; // 0x101005f field public static final int panelTextAppearance = 16842850; // 0x1010062 + field public static final int parentActivityName = 16843696; // 0x10103b0 field public static final deprecated int password = 16843100; // 0x101015c field public static final int path = 16842794; // 0x101002a field public static final int pathPattern = 16842796; // 0x101002c @@ -2578,6 +2579,7 @@ package android.app { method public java.lang.String getLocalClassName(); method public android.view.MenuInflater getMenuInflater(); method public final android.app.Activity getParent(); + method public android.content.Intent getParentActivityIntent(); method public android.content.SharedPreferences getPreferences(int); method public int getRequestedOrientation(); method public int getTaskId(); @@ -2594,6 +2596,8 @@ package android.app { method public boolean isTaskRoot(); method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); method public boolean moveTaskToBack(boolean); + method public boolean navigateUpTo(android.content.Intent); + method public boolean navigateUpToFromChild(android.app.Activity, android.content.Intent); method public void onActionModeFinished(android.view.ActionMode); method public void onActionModeStarted(android.view.ActionMode); method protected void onActivityResult(int, int, android.content.Intent); @@ -2610,6 +2614,7 @@ package android.app { method public java.lang.CharSequence onCreateDescription(); method protected deprecated android.app.Dialog onCreateDialog(int); method protected deprecated android.app.Dialog onCreateDialog(int, android.os.Bundle); + method public void onCreateNavigateUpTaskStack(android.app.TaskStackBuilder); method public boolean onCreateOptionsMenu(android.view.Menu); method public boolean onCreatePanelMenu(int, android.view.Menu); method public android.view.View onCreatePanelView(int); @@ -2627,6 +2632,8 @@ package android.app { method public void onLowMemory(); method public boolean onMenuItemSelected(int, android.view.MenuItem); method public boolean onMenuOpened(int, android.view.Menu); + method public boolean onNavigateUp(); + method public boolean onNavigateUpFromChild(android.app.Activity); method protected void onNewIntent(android.content.Intent); method public boolean onOptionsItemSelected(android.view.MenuItem); method public void onOptionsMenuClosed(android.view.Menu); @@ -2636,6 +2643,7 @@ package android.app { method protected void onPostResume(); method protected deprecated void onPrepareDialog(int, android.app.Dialog); method protected deprecated void onPrepareDialog(int, android.app.Dialog, android.os.Bundle); + method public void onPrepareNavigateUpTaskStack(android.app.TaskStackBuilder); method public boolean onPrepareOptionsMenu(android.view.Menu); method public boolean onPreparePanel(int, android.view.View, android.view.Menu); method protected void onRestart(); @@ -2686,6 +2694,7 @@ package android.app { method public void setTitleColor(int); method public void setVisible(boolean); method public final void setVolumeControlStream(int); + method public boolean shouldUpRecreateTask(android.content.Intent); method public final deprecated void showDialog(int); method public final deprecated boolean showDialog(int, android.os.Bundle); method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback); @@ -3932,6 +3941,18 @@ package android.app { method public void setDefaultTab(int); } + public class TaskStackBuilder implements java.lang.Iterable { + method public android.app.TaskStackBuilder addNextIntent(android.content.Intent); + method public android.app.TaskStackBuilder addParentStack(android.app.Activity); + method public android.app.TaskStackBuilder addParentStack(java.lang.Class<?>); + method public static android.app.TaskStackBuilder from(android.content.Context); + method public android.content.Intent getIntent(int); + method public int getIntentCount(); + method public android.app.PendingIntent getPendingIntent(int, int); + method public java.util.Iterator<android.content.Intent> iterator(); + method public void startActivities(); + } + public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener { ctor public TimePickerDialog(android.content.Context, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean); ctor public TimePickerDialog(android.content.Context, int, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean); @@ -6102,6 +6123,7 @@ package android.content.pm { field public int configChanges; field public int flags; field public int launchMode; + field public java.lang.String parentActivityName; field public java.lang.String permission; field public int screenOrientation; field public int softInputMode; diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index b277efb..3e123ba 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -29,6 +29,8 @@ import android.content.Intent; import android.content.IntentSender; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; @@ -65,13 +67,13 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; -import android.view.WindowManagerImpl; import android.view.View.OnCreateContextMenuListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.ViewManager; import android.view.Window; import android.view.WindowManager; +import android.view.WindowManagerImpl; import android.view.accessibility.AccessibilityEvent; import android.widget.AdapterView; @@ -704,6 +706,7 @@ public class Activity extends ContextThemeWrapper /*package*/ boolean mVisibleFromServer = false; /*package*/ boolean mVisibleFromClient = true; /*package*/ ActionBarImpl mActionBar = null; + private boolean mEnableDefaultActionBarUp; private CharSequence mTitle; private int mTitleColor = 0; @@ -865,6 +868,13 @@ public class Activity extends ContextThemeWrapper if (mLastNonConfigurationInstances != null) { mAllLoaderManagers = mLastNonConfigurationInstances.loaders; } + if (mActivityInfo.parentActivityName != null) { + if (mActionBar == null) { + mEnableDefaultActionBarUp = true; + } else { + mActionBar.setDefaultDisplayHomeAsUpEnabled(true); + } + } if (savedInstanceState != null) { Parcelable p = savedInstanceState.getParcelable(FRAGMENTS_TAG); mFragments.restoreAllState(p, mLastNonConfigurationInstances != null @@ -1829,6 +1839,7 @@ public class Activity extends ContextThemeWrapper } mActionBar = new ActionBarImpl(this); + mActionBar.setDefaultDisplayHomeAsUpEnabled(mEnableDefaultActionBarUp); } /** @@ -2630,7 +2641,7 @@ public class Activity extends ContextThemeWrapper * facilities. * * <p>Derived classes should call through to the base class for it to - * perform the default menu handling. + * perform the default menu handling.</p> * * @param item The menu item that was selected. * @@ -2643,10 +2654,105 @@ public class Activity extends ContextThemeWrapper if (mParent != null) { return mParent.onOptionsItemSelected(item); } + if (item.getItemId() == android.R.id.home && mActionBar != null && + (mActionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0) { + if (mParent == null) { + onNavigateUp(); + } else { + mParent.onNavigateUpFromChild(this); + } + return true; + } return false; } /** + * This method is called whenever the user chooses to navigate Up within your application's + * activity hierarchy from the action bar. + * + * <p>If the attribute {@link android.R.attr#parentActivityName parentActivityName} + * was specified in the manifest for this activity or an activity-alias to it, + * default Up navigation will be handled automatically. If any activity + * along the parent chain requires extra Intent arguments, the Activity subclass + * should override the method {@link #onPrepareNavigateUpTaskStack(TaskStackBuilder)} + * to supply those arguments.</p> + * + * <p>See <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a> + * from the developer guide and <a href="{@docRoot}design/patterns/navigation.html">Navigation</a> + * from the design guide for more information about navigating within your app.</p> + * + * <p>See the {@link TaskStackBuilder} class and the Activity methods + * {@link #getParentActivityIntent()}, {@link #shouldUpRecreateTask(Intent)}, and + * {@link #navigateUpTo(Intent)} for help implementing custom Up navigation. + * The AppNavigation sample application in the Android SDK is also available for reference.</p> + * + * @return true if Up navigation completed successfully and this Activity was finished, + * false otherwise. + */ + public boolean onNavigateUp() { + // Automatically handle hierarchical Up navigation if the proper + // metadata is available. + Intent upIntent = getParentActivityIntent(); + if (upIntent != null) { + if (shouldUpRecreateTask(upIntent)) { + TaskStackBuilder b = TaskStackBuilder.from(this); + onCreateNavigateUpTaskStack(b); + onPrepareNavigateUpTaskStack(b); + b.startActivities(); + finish(); + } else { + navigateUpTo(upIntent); + } + return true; + } + return false; + } + + /** + * This is called when a child activity of this one attempts to navigate up. + * The default implementation simply calls onNavigateUp() on this activity (the parent). + * + * @param child The activity making the call. + */ + public boolean onNavigateUpFromChild(Activity child) { + return onNavigateUp(); + } + + /** + * Define the synthetic task stack that will be generated during Up navigation from + * a different task. + * + * <p>The default implementation of this method adds the parent chain of this activity + * as specified in the manifest to the supplied {@link TaskStackBuilder}. Applications + * may choose to override this method to construct the desired task stack in a different + * way.</p> + * + * <p>Applications that wish to supply extra Intent parameters to the parent stack defined + * by the manifest should override {@link #onPrepareNavigateUpTaskStack(TaskStackBuilder)}.</p> + * + * @param builder An empty TaskStackBuilder - the application should add intents representing + * the desired task stack + */ + public void onCreateNavigateUpTaskStack(TaskStackBuilder builder) { + builder.addParentStack(this); + } + + /** + * Prepare the synthetic task stack that will be generated during Up navigation + * from a different task. + * + * <p>This method receives the {@link TaskStackBuilder} with the constructed series of + * Intents as generated by {@link #onCreateNavigateUpTaskStack(TaskStackBuilder)}. + * If any extra data should be added to these intents before launching the new task, + * the application should override this method and add that data here.</p> + * + * @param builder A TaskStackBuilder that has been populated with Intents by + * onCreateNavigateUpTaskStack. + */ + public void onPrepareNavigateUpTaskStack(TaskStackBuilder builder) { + } + + /** * This hook is called whenever the options menu is being closed (either by the user canceling * the menu with the back/menu button, or when an item is selected). * @@ -4658,6 +4764,114 @@ public class Activity extends ContextThemeWrapper public void onActionModeFinished(ActionMode mode) { } + /** + * Returns true if the app should recreate the task when navigating 'up' from this activity + * by using targetIntent. + * + * <p>If this method returns false the app can trivially call + * {@link #navigateUpTo(Intent)} using the same parameters to correctly perform + * up navigation. If this method returns false, the app should synthesize a new task stack + * by using {@link TaskStackBuilder} or another similar mechanism to perform up navigation.</p> + * + * @param targetIntent An intent representing the target destination for up navigation + * @return true if navigating up should recreate a new task stack, false if the same task + * should be used for the destination + */ + public boolean shouldUpRecreateTask(Intent targetIntent) { + try { + PackageManager pm = getPackageManager(); + ComponentName cn = targetIntent.getComponent(); + if (cn == null) { + cn = targetIntent.resolveActivity(pm); + } + ActivityInfo info = pm.getActivityInfo(cn, 0); + if (info.taskAffinity == null) { + return false; + } + return !ActivityManagerNative.getDefault() + .targetTaskAffinityMatchesActivity(mToken, info.taskAffinity); + } catch (RemoteException e) { + return false; + } catch (NameNotFoundException e) { + return false; + } + } + + /** + * Navigate from this activity to the activity specified by upIntent, finishing this activity + * in the process. If the activity indicated by upIntent already exists in the task's history, + * this activity and all others before the indicated activity in the history stack will be + * finished. If the indicated activity does not appear in the history stack, this is equivalent + * to simply calling finish() on this activity. + * + * <p>This method should be used when performing up navigation from within the same task + * as the destination. If up navigation should cross tasks in some cases, see + * {@link #shouldUpRecreateTask(Intent)}.</p> + * + * @param upIntent An intent representing the target destination for up navigation + * + * @return true if up navigation successfully reached the activity indicated by upIntent and + * upIntent was delivered to it. false if an instance of the indicated activity could + * not be found and this activity was simply finished normally. + */ + public boolean navigateUpTo(Intent upIntent) { + if (mParent == null) { + ComponentName destInfo = upIntent.getComponent(); + if (destInfo == null) { + destInfo = upIntent.resolveActivity(getPackageManager()); + if (destInfo == null) { + return false; + } + upIntent = new Intent(upIntent); + upIntent.setComponent(destInfo); + } + int resultCode; + Intent resultData; + synchronized (this) { + resultCode = mResultCode; + resultData = mResultData; + } + if (resultData != null) { + resultData.setAllowFds(false); + } + try { + return ActivityManagerNative.getDefault().navigateUpTo(mToken, upIntent, + resultCode, resultData); + } catch (RemoteException e) { + return false; + } + } else { + return mParent.navigateUpToFromChild(this, upIntent); + } + } + + /** + * This is called when a child activity of this one calls its + * {@link #navigateUpTo} method. The default implementation simply calls + * navigateUpTo(upIntent) on this activity (the parent). + * + * @param child The activity making the call. + * @param upIntent An intent representing the target destination for up navigation + * + * @return true if up navigation successfully reached the activity indicated by upIntent and + * upIntent was delivered to it. false if an instance of the indicated activity could + * not be found and this activity was simply finished normally. + */ + public boolean navigateUpToFromChild(Activity child, Intent upIntent) { + return navigateUpTo(upIntent); + } + + /** + * Obtain an {@link Intent} that will launch an explicit target activity specified by + * this activity's logical parent. The logical parent is named in the application's manifest + * by the {@link android.R.attr#parentActivityName parentActivityName} attribute. + * + * @return a new Intent targeting the defined parent of this activity + */ + public Intent getParentActivityIntent() { + return new Intent().setClassName(this, mActivityInfo.parentActivityName); + } + // ------------------ Internal API ------------------ final void setParent(Activity parent) { diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 531a695..11b4c3a 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1774,5 +1774,4 @@ public class ActivityManager { return false; } } - } diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index 5917cbf..000abc5 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -17,10 +17,10 @@ package android.app; import android.content.ComponentName; +import android.content.IIntentReceiver; +import android.content.IIntentSender; import android.content.Intent; import android.content.IntentFilter; -import android.content.IIntentSender; -import android.content.IIntentReceiver; import android.content.IntentSender; import android.content.pm.ApplicationInfo; import android.content.pm.ConfigurationInfo; @@ -32,11 +32,11 @@ import android.net.Uri; import android.os.Binder; import android.os.Bundle; import android.os.Debug; -import android.os.Parcelable; -import android.os.ParcelFileDescriptor; -import android.os.RemoteException; import android.os.IBinder; import android.os.Parcel; +import android.os.ParcelFileDescriptor; +import android.os.Parcelable; +import android.os.RemoteException; import android.os.ServiceManager; import android.os.StrictMode; import android.text.TextUtils; @@ -1605,6 +1605,31 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM return true; } + case TARGET_TASK_AFFINITY_MATCHES_ACTIVITY_TRANSACTION: { + data.enforceInterface(IActivityManager.descriptor); + IBinder token = data.readStrongBinder(); + String destAffinity = data.readString(); + boolean res = targetTaskAffinityMatchesActivity(token, destAffinity); + reply.writeNoException(); + reply.writeInt(res ? 1 : 0); + return true; + } + + case NAVIGATE_UP_TO_TRANSACTION: { + data.enforceInterface(IActivityManager.descriptor); + IBinder token = data.readStrongBinder(); + Intent target = Intent.CREATOR.createFromParcel(data); + int resultCode = data.readInt(); + Intent resultData = null; + if (data.readInt() != 0) { + resultData = Intent.CREATOR.createFromParcel(data); + } + boolean res = navigateUpTo(token, target, resultCode, resultData); + reply.writeNoException(); + reply.writeInt(res ? 1 : 0); + return true; + } + } return super.onTransact(code, data, reply, flags); @@ -3662,5 +3687,42 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } + public boolean targetTaskAffinityMatchesActivity(IBinder token, String destAffinity) + throws RemoteException { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + data.writeInterfaceToken(IActivityManager.descriptor); + data.writeStrongBinder(token); + data.writeString(destAffinity); + mRemote.transact(TARGET_TASK_AFFINITY_MATCHES_ACTIVITY_TRANSACTION, data, reply, 0); + reply.readException(); + boolean result = reply.readInt() != 0; + data.recycle(); + reply.recycle(); + return result; + } + + public boolean navigateUpTo(IBinder token, Intent target, int resultCode, Intent resultData) + throws RemoteException { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + data.writeInterfaceToken(IActivityManager.descriptor); + data.writeStrongBinder(token); + target.writeToParcel(data, 0); + data.writeInt(resultCode); + if (resultData != null) { + data.writeInt(1); + resultData.writeToParcel(data, 0); + } else { + data.writeInt(0); + } + mRemote.transact(NAVIGATE_UP_TO_TRANSACTION, data, reply, 0); + reply.readException(); + boolean result = reply.readInt() != 0; + data.recycle(); + reply.recycle(); + return result; + } + private IBinder mRemote; } diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index 2b1eb43..0f287c1 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -341,6 +341,12 @@ public interface IActivityManager extends IInterface { public void dismissKeyguardOnNextActivity() throws RemoteException; + public boolean targetTaskAffinityMatchesActivity(IBinder token, String destAffinity) + throws RemoteException; + + public boolean navigateUpTo(IBinder token, Intent target, int resultCode, Intent resultData) + throws RemoteException; + /* * Private non-Binder interfaces */ @@ -578,4 +584,6 @@ public interface IActivityManager extends IInterface { int GET_MY_MEMORY_STATE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+142; int KILL_PROCESSES_BELOW_FOREGROUND_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+143; int GET_CURRENT_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+144; + int TARGET_TASK_AFFINITY_MATCHES_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+145; + int NAVIGATE_UP_TO_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+146; } diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java new file mode 100644 index 0000000..ee7c6ad --- /dev/null +++ b/core/java/android/app/TaskStackBuilder.java @@ -0,0 +1,212 @@ +/* + * Copyright (C) 2012 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. + */ + +package android.app; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.util.Log; + +import java.util.ArrayList; +import java.util.Iterator; + +/** + * Utility class for constructing synthetic back stacks for cross-task navigation + * on Android 3.0 and newer. + * + * <p>In API level 11 (Android 3.0/Honeycomb) the recommended conventions for + * app navigation using the back key changed. The back key's behavior is local + * to the current task and does not capture navigation across different tasks. + * Navigating across tasks and easily reaching the previous task is accomplished + * through the "recents" UI, accessible through the software-provided Recents key + * on the navigation or system bar. On devices with the older hardware button configuration + * the recents UI can be accessed with a long press on the Home key.</p> + * + * <p>When crossing from one task stack to another post-Android 3.0, + * the application should synthesize a back stack/history for the new task so that + * the user may navigate out of the new task and back to the Launcher by repeated + * presses of the back key. Back key presses should not navigate across task stacks.</p> + * + * <p>TaskStackBuilder provides a way to obey the correct conventions + * around cross-task navigation.</p> + * + * <div class="special reference"> + * <h3>About Navigation</h3> + * For more detailed information about tasks, the back stack, and navigation design guidelines, + * please read + * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a> + * from the developer guide and <a href="{@docRoot}design/patterns/navigation.html">Navigation</a> + * from the design guide. + * </div> + */ +public class TaskStackBuilder implements Iterable<Intent> { + private static final String TAG = "TaskStackBuilder"; + + private final ArrayList<Intent> mIntents = new ArrayList<Intent>(); + private final Context mSourceContext; + + private TaskStackBuilder(Context a) { + mSourceContext = a; + } + + /** + * Return a new TaskStackBuilder for launching a fresh task stack consisting + * of a series of activities. + * + * @param context The context that will launch the new task stack or generate a PendingIntent + * @return A new TaskStackBuilder + */ + public static TaskStackBuilder from(Context context) { + return new TaskStackBuilder(context); + } + + /** + * Add a new Intent to the task stack. The most recently added Intent will invoke + * the Activity at the top of the final task stack. + * + * @param nextIntent Intent for the next Activity in the synthesized task stack + * @return This TaskStackBuilder for method chaining + */ + public TaskStackBuilder addNextIntent(Intent nextIntent) { + mIntents.add(nextIntent); + return this; + } + + /** + * Add the activity parent chain as specified by the + * {@link android.R.attr#parentActivityName parentActivityName} attribute of the activity + * (or activity-alias) element in the application's manifest to the task stack builder. + * + * @param sourceActivity All parents of this activity will be added + * @return This TaskStackBuilder for method chaining + */ + public TaskStackBuilder addParentStack(Activity sourceActivity) { + final int insertAt = mIntents.size(); + Intent parent = sourceActivity.getParentActivityIntent(); + PackageManager pm = sourceActivity.getPackageManager(); + while (parent != null) { + mIntents.add(insertAt, parent); + try { + ActivityInfo info = pm.getActivityInfo(parent.getComponent(), 0); + String parentActivity = info.parentActivityName; + if (parentActivity != null) { + parent = new Intent().setComponent( + new ComponentName(mSourceContext, parentActivity)); + } else { + parent = null; + } + } catch (NameNotFoundException e) { + Log.e(TAG, "Bad ComponentName while traversing activity parent metadata"); + throw new IllegalArgumentException(e); + } + } + return this; + } + + /** + * Add the activity parent chain as specified by the + * {@link android.R.attr#parentActivityName parentActivityName} attribute of the activity + * (or activity-alias) element in the application's manifest to the task stack builder. + * + * @param sourceActivityClass All parents of this activity will be added + * @return This TaskStackBuilder for method chaining + */ + public TaskStackBuilder addParentStack(Class<?> sourceActivityClass) { + final int insertAt = mIntents.size(); + PackageManager pm = mSourceContext.getPackageManager(); + try { + ActivityInfo info = pm.getActivityInfo( + new ComponentName(mSourceContext, sourceActivityClass), 0); + String parentActivity = info.parentActivityName; + Intent parent = new Intent().setComponent( + new ComponentName(mSourceContext, parentActivity)); + while (parent != null) { + mIntents.add(insertAt, parent); + info = pm.getActivityInfo(parent.getComponent(), 0); + parentActivity = info.parentActivityName; + if (parentActivity != null) { + parent = new Intent().setComponent( + new ComponentName(mSourceContext, parentActivity)); + } else { + parent = null; + } + } + } catch (NameNotFoundException e) { + Log.e(TAG, "Bad ComponentName while traversing activity parent metadata"); + throw new IllegalArgumentException(e); + } + return this; + } + + /** + * @return the number of intents added so far. + */ + public int getIntentCount() { + return mIntents.size(); + } + + /** + * Get the intent at the specified index. + * Useful if you need to modify the flags or extras of an intent that was previously added, + * for example with {@link #addParentStack(Activity)}. + * + * @param index Index from 0-getIntentCount() + * @return the intent at position index + */ + public Intent getIntent(int index) { + return mIntents.get(index); + } + + public Iterator<Intent> iterator() { + return mIntents.iterator(); + } + + /** + * Start the task stack constructed by this builder. + */ + public void startActivities() { + if (mIntents.isEmpty()) { + throw new IllegalStateException( + "No intents added to TaskStackBuilder; cannot startActivities"); + } + + Intent[] intents = mIntents.toArray(new Intent[mIntents.size()]); + intents[0].addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | + Intent.FLAG_ACTIVITY_CLEAR_TASK | + Intent.FLAG_ACTIVITY_TASK_ON_HOME); + mSourceContext.startActivities(intents); + } + + /** + * Obtain a {@link PendingIntent} for launching the task constructed by this builder so far. + * + * @param requestCode Private request code for the sender + * @param flags May be {@link PendingIntent#FLAG_ONE_SHOT}, + * {@link PendingIntent#FLAG_NO_CREATE}, {@link PendingIntent#FLAG_CANCEL_CURRENT}, + * {@link PendingIntent#FLAG_UPDATE_CURRENT}, or any of the flags supported by + * {@link Intent#fillIn(Intent, int)} to control which unspecified parts of the + * intent that can be supplied when the actual send happens. + * @return The obtained PendingIntent + */ + public PendingIntent getPendingIntent(int requestCode, int flags) { + Intent[] intents = mIntents.toArray(new Intent[mIntents.size()]); + return PendingIntent.getActivities(mSourceContext, requestCode, intents, flags); + } +} diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 0e6694d..6b16e74 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -450,6 +450,11 @@ public class ActivityInfo extends ComponentInfo */ public static final int UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW = 1; + /** + * If defined, the activity named here is the logical parent of this activity. + */ + public String parentActivityName; + public ActivityInfo() { } @@ -465,6 +470,7 @@ public class ActivityInfo extends ComponentInfo configChanges = orig.configChanges; softInputMode = orig.softInputMode; uiOptions = orig.uiOptions; + parentActivityName = orig.parentActivityName; } /** @@ -524,6 +530,7 @@ public class ActivityInfo extends ComponentInfo dest.writeInt(configChanges); dest.writeInt(softInputMode); dest.writeInt(uiOptions); + dest.writeString(parentActivityName); } public static final Parcelable.Creator<ActivityInfo> CREATOR @@ -548,5 +555,6 @@ public class ActivityInfo extends ComponentInfo configChanges = source.readInt(); softInputMode = source.readInt(); uiOptions = source.readInt(); + parentActivityName = source.readString(); } } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index a79b86a..15ccda3 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -2030,6 +2030,19 @@ public class PackageParser { com.android.internal.R.styleable.AndroidManifestActivity_uiOptions, a.info.applicationInfo.uiOptions); + String parentName = sa.getNonConfigurationString( + com.android.internal.R.styleable.AndroidManifestActivity_parentActivityName, 0); + if (parentName != null) { + String parentClassName = buildClassName(a.info.packageName, parentName, outError); + if (outError[0] == null) { + a.info.parentActivityName = parentClassName; + } else { + Log.e(TAG, "Activity " + a.info.name + " specified invalid parentActivityName " + + parentName); + outError[0] = null; + } + } + String str; str = sa.getNonConfigurationString( com.android.internal.R.styleable.AndroidManifestActivity_permission, 0); @@ -2274,6 +2287,7 @@ public class PackageParser { info.theme = target.info.theme; info.softInputMode = target.info.softInputMode; info.uiOptions = target.info.uiOptions; + info.parentActivityName = target.info.parentActivityName; Activity a = new Activity(mParseActivityAliasArgs, info); if (outError[0] != null) { @@ -2295,6 +2309,20 @@ public class PackageParser { a.info.permission = str.length() > 0 ? str.toString().intern() : null; } + String parentName = sa.getNonConfigurationString( + com.android.internal.R.styleable.AndroidManifestActivityAlias_parentActivityName, + 0); + if (parentName != null) { + String parentClassName = buildClassName(a.info.packageName, parentName, outError); + if (outError[0] == null) { + a.info.parentActivityName = parentClassName; + } else { + Log.e(TAG, "Activity alias " + a.info.name + + " specified invalid parentActivityName " + parentName); + outError[0] = null; + } + } + sa.recycle(); if (outError[0] != null) { diff --git a/core/java/android/nfc/NfcActivityManager.java b/core/java/android/nfc/NfcActivityManager.java index 8335459..f80dae4 100644 --- a/core/java/android/nfc/NfcActivityManager.java +++ b/core/java/android/nfc/NfcActivityManager.java @@ -114,6 +114,10 @@ public final class NfcActivityManager extends INdefPushCallback.Stub if (activity.getWindow().isDestroyed()) { throw new IllegalStateException("activity is already destroyed"); } + // Check if activity is resumed right now, as we will not + // immediately get a callback for that. + resumed = activity.isResumed(); + this.activity = activity; registerApplication(activity.getApplication()); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 830a85f..371e2a1 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -36,14 +36,19 @@ import android.net.Uri; import android.net.wifi.WifiManager; import android.os.BatteryManager; import android.os.Bundle; +import android.os.IBinder; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.SystemProperties; +import android.os.UserId; import android.speech.tts.TextToSpeech; import android.text.TextUtils; import android.util.AndroidException; import android.util.Log; import android.view.WindowOrientationListener; +import com.android.internal.widget.ILockSettings; + import java.net.URISyntaxException; import java.util.HashMap; import java.util.HashSet; @@ -2253,6 +2258,16 @@ public final class Settings { // Populated lazily, guarded by class object: private static NameValueCache sNameValueCache = null; + private static ILockSettings sLockSettings = null; + + private static final HashSet<String> MOVED_TO_LOCK_SETTINGS; + static { + MOVED_TO_LOCK_SETTINGS = new HashSet<String>(3); + MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_ENABLED); + MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_VISIBLE); + MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED); + } + /** * Look up a name in the database. * @param resolver to access the database with @@ -2264,6 +2279,19 @@ public final class Settings { sNameValueCache = new NameValueCache(SYS_PROP_SETTING_VERSION, CONTENT_URI, CALL_METHOD_GET_SECURE); } + + if (sLockSettings == null) { + sLockSettings = ILockSettings.Stub.asInterface( + (IBinder) ServiceManager.getService("lock_settings")); + } + if (sLockSettings != null && MOVED_TO_LOCK_SETTINGS.contains(name)) { + try { + return sLockSettings.getString(name, "0", UserId.getCallingUserId()); + } catch (RemoteException re) { + // Fall through + } + } + return sNameValueCache.getString(resolver, name); } diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 14cd48f..eb030de 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -62,8 +62,8 @@ interface IWindowManager void setForcedDisplaySize(int longDimen, int shortDimen); void clearForcedDisplaySize(); - // Is device configured with a hideable status bar or a tablet system bar? - boolean canStatusBarHide(); + // Is the device configured to have a full system bar for larger screens? + boolean hasSystemNavBar(); // These can only be called when injecting events to your own window, // or by holding the INJECT_EVENTS permission. These methods may block @@ -171,8 +171,10 @@ interface IWindowManager * @param alwaysSendConfiguration Flag to force a new configuration to * be evaluated. This can be used when there are other parameters in * configuration that are changing. + * @param forceRelayout If true, the window manager will always do a relayout + * of its windows even if the rotation hasn't changed. */ - void updateRotation(boolean alwaysSendConfiguration); + void updateRotation(boolean alwaysSendConfiguration, boolean forceRelayout); /** * Retrieve the current screen orientation, constants as per diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index b9924c7..9d06145 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -315,7 +315,7 @@ public class ViewConfiguration { if (!sHasPermanentMenuKeySet) { IWindowManager wm = Display.getWindowManager(); try { - sHasPermanentMenuKey = wm.canStatusBarHide() && !wm.hasNavigationBar(); + sHasPermanentMenuKey = !wm.hasSystemNavBar() && !wm.hasNavigationBar(); sHasPermanentMenuKeySet = true; } catch (RemoteException ex) { sHasPermanentMenuKey = false; diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 75267bb..cf9cafc 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -326,6 +326,11 @@ public interface WindowManagerPolicy { * Returns true if {@link #hideLw} was last called for the window. */ public boolean showLw(boolean doAnimation); + + /** + * Check whether the process hosting this window is currently alive. + */ + public boolean isAlive(); } /** @@ -447,7 +452,7 @@ public interface WindowManagerPolicy { * Called by window manager once it has the initial, default native * display dimensions. */ - public void setInitialDisplaySize(int width, int height); + public void setInitialDisplaySize(Display display, int width, int height); /** * Check permissions when adding a window. @@ -514,10 +519,10 @@ public interface WindowManagerPolicy { public int getMaxWallpaperLayer(); /** - * Return true if the policy allows the status bar to hide. Otherwise, - * it is a tablet-style system bar. + * Return true if the policy desires a full unified system nav bar. Otherwise, + * it is a phone-style status bar with optional nav bar. */ - public boolean canStatusBarHide(); + public boolean hasSystemNavBar(); /** * Return the display width available after excluding any screen diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index 3115eff..f1dffa1 100644 --- a/core/java/com/android/internal/app/ActionBarImpl.java +++ b/core/java/com/android/internal/app/ActionBarImpl.java @@ -85,6 +85,8 @@ public class ActionBarImpl extends ActionBar { private TabImpl mSelectedTab; private int mSavedTabPosition = INVALID_POSITION; + private boolean mDisplayHomeAsUpSet; + ActionModeImpl mActionMode; ActionMode mDeferredDestroyActionMode; ActionMode.Callback mDeferredModeDestroyCallback; @@ -375,11 +377,17 @@ public class ActionBarImpl extends ActionBar { } public void setDisplayOptions(int options) { + if ((options & DISPLAY_HOME_AS_UP) != 0) { + mDisplayHomeAsUpSet = true; + } mActionView.setDisplayOptions(options); } public void setDisplayOptions(int options, int mask) { final int current = mActionView.getDisplayOptions(); + if ((mask & DISPLAY_HOME_AS_UP) != 0) { + mDisplayHomeAsUpSet = true; + } mActionView.setDisplayOptions((options & mask) | (current & ~mask)); } @@ -1072,4 +1080,10 @@ public class ActionBarImpl extends ActionBar { public void setLogo(Drawable logo) { mActionView.setLogo(logo); } + + public void setDefaultDisplayHomeAsUpEnabled(boolean enable) { + if (!mDisplayHomeAsUpSet) { + setDisplayHomeAsUpEnabled(enable); + } + } } diff --git a/core/java/com/android/internal/widget/ILockSettings.aidl b/core/java/com/android/internal/widget/ILockSettings.aidl new file mode 100644 index 0000000..c72c770 --- /dev/null +++ b/core/java/com/android/internal/widget/ILockSettings.aidl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2012 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. + */ + +package com.android.internal.widget; + +/** {@hide} */ +interface ILockSettings { + void setBoolean(in String key, in boolean value, in int userId); + void setLong(in String key, in long value, in int userId); + void setString(in String key, in String value, in int userId); + boolean getBoolean(in String key, in boolean defaultValue, in int userId); + long getLong(in String key, in long defaultValue, in int userId); + String getString(in String key, in String defaultValue, in int userId); + void setLockPattern(in byte[] hash, int userId); + boolean checkPattern(in byte[] hash, int userId); + void setLockPassword(in byte[] hash, int userId); + boolean checkPassword(in byte[] hash, int userId); + boolean havePattern(int userId); + boolean havePassword(int userId); + void removeUser(int userId); +} diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 93f90f6..4d308dd 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -21,15 +21,20 @@ import com.android.internal.telephony.ITelephony; import com.google.android.collect.Lists; import android.app.admin.DevicePolicyManager; +import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.os.Binder; import android.os.FileObserver; import android.os.IBinder; +import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; +import android.os.UserId; import android.os.storage.IMountService; import android.provider.Settings; import android.security.KeyStore; @@ -59,10 +64,6 @@ public class LockPatternUtils { private static final String TAG = "LockPatternUtils"; - private static final String SYSTEM_DIRECTORY = "/system/"; - private static final String LOCK_PATTERN_FILE = "gesture.key"; - private static final String LOCK_PASSWORD_FILE = "password.key"; - /** * The maximum number of incorrect attempts before the user is prevented * from trying again for {@link #FAILED_ATTEMPT_TIMEOUT_MS}. @@ -111,14 +112,14 @@ public class LockPatternUtils { */ public static final int FLAG_BIOMETRIC_WEAK_LIVELINESS = 0x1; - private final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently"; - private final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline"; - private final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen"; + protected final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently"; + protected final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline"; + protected final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen"; public final static String PASSWORD_TYPE_KEY = "lockscreen.password_type"; public static final String PASSWORD_TYPE_ALTERNATE_KEY = "lockscreen.password_type_alternate"; - private final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt"; - private final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled"; - private final static String LOCKSCREEN_OPTIONS = "lockscreen.options"; + protected final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt"; + protected final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled"; + protected final static String LOCKSCREEN_OPTIONS = "lockscreen.options"; public final static String LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK = "lockscreen.biometric_weak_fallback"; public final static String BIOMETRIC_WEAK_EVER_CHOSEN_KEY @@ -126,35 +127,13 @@ public class LockPatternUtils { public final static String LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS = "lockscreen.power_button_instantly_locks"; - private final static String PASSWORD_HISTORY_KEY = "lockscreen.passwordhistory"; + protected final static String PASSWORD_HISTORY_KEY = "lockscreen.passwordhistory"; private final Context mContext; private final ContentResolver mContentResolver; private DevicePolicyManager mDevicePolicyManager; - private static String sLockPatternFilename; - private static String sLockPasswordFilename; - - private static final AtomicBoolean sHaveNonZeroPatternFile = new AtomicBoolean(false); - private static final AtomicBoolean sHaveNonZeroPasswordFile = new AtomicBoolean(false); - - private static FileObserver sPasswordObserver; - - private static class PasswordFileObserver extends FileObserver { - public PasswordFileObserver(String path, int mask) { - super(path, mask); - } - - @Override - public void onEvent(int event, String path) { - if (LOCK_PATTERN_FILE.equals(path)) { - Log.d(TAG, "lock pattern file changed"); - sHaveNonZeroPatternFile.set(new File(sLockPatternFilename).length() > 0); - } else if (LOCK_PASSWORD_FILE.equals(path)) { - Log.d(TAG, "lock password file changed"); - sHaveNonZeroPasswordFile.set(new File(sLockPasswordFilename).length() > 0); - } - } - } + private ILockSettings mLockSettingsService; + private int mCurrentUserId = 0; public DevicePolicyManager getDevicePolicyManager() { if (mDevicePolicyManager == null) { @@ -167,34 +146,27 @@ public class LockPatternUtils { } return mDevicePolicyManager; } + /** * @param contentResolver Used to look up and save settings. */ public LockPatternUtils(Context context) { mContext = context; mContentResolver = context.getContentResolver(); + } - // Initialize the location of gesture & PIN lock files - if (sLockPatternFilename == null) { - String dataSystemDirectory = - android.os.Environment.getDataDirectory().getAbsolutePath() + - SYSTEM_DIRECTORY; - sLockPatternFilename = dataSystemDirectory + LOCK_PATTERN_FILE; - sLockPasswordFilename = dataSystemDirectory + LOCK_PASSWORD_FILE; - sHaveNonZeroPatternFile.set(new File(sLockPatternFilename).length() > 0); - sHaveNonZeroPasswordFile.set(new File(sLockPasswordFilename).length() > 0); - int fileObserverMask = FileObserver.CLOSE_WRITE | FileObserver.DELETE | - FileObserver.MOVED_TO | FileObserver.CREATE; - sPasswordObserver = new PasswordFileObserver(dataSystemDirectory, fileObserverMask); - sPasswordObserver.startWatching(); + private ILockSettings getLockSettings() { + if (mLockSettingsService == null) { + mLockSettingsService = ILockSettings.Stub.asInterface( + (IBinder) ServiceManager.getService("lock_settings")); } + return mLockSettingsService; } public int getRequestedMinimumPasswordLength() { return getDevicePolicyManager().getPasswordMinimumLength(null); } - /** * Gets the device policy password mode. If the mode is non-specific, returns * MODE_PATTERN which allows the user to choose anything. @@ -243,6 +215,33 @@ public class LockPatternUtils { getDevicePolicyManager().reportSuccessfulPasswordAttempt(); } + public void setCurrentUser(int userId) { + if (Process.myUid() == Process.SYSTEM_UID) { + mCurrentUserId = userId; + } else { + throw new SecurityException("Only the system process can set the current user"); + } + } + + public void removeUser(int userId) { + if (Process.myUid() == Process.SYSTEM_UID) { + try { + getLockSettings().removeUser(userId); + } catch (RemoteException re) { + Log.e(TAG, "Couldn't remove lock settings for user " + userId); + } + } + } + + private int getCurrentOrCallingUserId() { + int callingUid = Binder.getCallingUid(); + if (callingUid == android.os.Process.SYSTEM_UID) { + return mCurrentUserId; + } else { + return UserId.getUserId(callingUid); + } + } + /** * Check to see if a pattern matches the saved pattern. If no pattern exists, * always returns true. @@ -250,20 +249,10 @@ public class LockPatternUtils { * @return Whether the pattern matches the stored one. */ public boolean checkPattern(List<LockPatternView.Cell> pattern) { + int userId = getCurrentOrCallingUserId(); try { - // Read all the bytes from the file - RandomAccessFile raf = new RandomAccessFile(sLockPatternFilename, "r"); - final byte[] stored = new byte[(int) raf.length()]; - int got = raf.read(stored, 0, stored.length); - raf.close(); - if (got <= 0) { - return true; - } - // Compare the hash from the file with the entered pattern's hash - return Arrays.equals(stored, LockPatternUtils.patternToHash(pattern)); - } catch (FileNotFoundException fnfe) { - return true; - } catch (IOException ioe) { + return getLockSettings().checkPattern(patternToHash(pattern), userId); + } catch (RemoteException re) { return true; } } @@ -275,20 +264,10 @@ public class LockPatternUtils { * @return Whether the password matches the stored one. */ public boolean checkPassword(String password) { + int userId = getCurrentOrCallingUserId(); try { - // Read all the bytes from the file - RandomAccessFile raf = new RandomAccessFile(sLockPasswordFilename, "r"); - final byte[] stored = new byte[(int) raf.length()]; - int got = raf.read(stored, 0, stored.length); - raf.close(); - if (got <= 0) { - return true; - } - // Compare the hash from the file with the entered password's hash - return Arrays.equals(stored, passwordToHash(password)); - } catch (FileNotFoundException fnfe) { - return true; - } catch (IOException ioe) { + return getLockSettings().checkPassword(passwordToHash(password), userId); + } catch (RemoteException re) { return true; } } @@ -325,7 +304,11 @@ public class LockPatternUtils { * @return Whether a saved pattern exists. */ public boolean savedPatternExists() { - return sHaveNonZeroPatternFile.get(); + try { + return getLockSettings().havePattern(getCurrentOrCallingUserId()); + } catch (RemoteException re) { + return false; + } } /** @@ -333,7 +316,11 @@ public class LockPatternUtils { * @return Whether a saved pattern exists. */ public boolean savedPasswordExists() { - return sHaveNonZeroPasswordFile.get(); + try { + return getLockSettings().havePassword(getCurrentOrCallingUserId()); + } catch (RemoteException re) { + return false; + } } /** @@ -471,15 +458,7 @@ public class LockPatternUtils { // Compute the hash final byte[] hash = LockPatternUtils.patternToHash(pattern); try { - // Write the hash to file - RandomAccessFile raf = new RandomAccessFile(sLockPatternFilename, "rw"); - // Truncate the file if pattern is null, to clear the lock - if (pattern == null) { - raf.setLength(0); - } else { - raf.write(hash, 0, hash.length); - } - raf.close(); + getLockSettings().setLockPattern(hash, getCurrentOrCallingUserId()); DevicePolicyManager dpm = getDevicePolicyManager(); KeyStore keyStore = KeyStore.getInstance(); if (pattern != null) { @@ -505,13 +484,8 @@ public class LockPatternUtils { dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0); } - } catch (FileNotFoundException fnfe) { - // Cant do much, unless we want to fail over to using the settings - // provider - Log.e(TAG, "Unable to save lock pattern to " + sLockPatternFilename); - } catch (IOException ioe) { - // Cant do much - Log.e(TAG, "Unable to save lock pattern to " + sLockPatternFilename); + } catch (RemoteException re) { + Log.e(TAG, "Couldn't save lock pattern " + re); } } @@ -586,15 +560,7 @@ public class LockPatternUtils { // Compute the hash final byte[] hash = passwordToHash(password); try { - // Write the hash to file - RandomAccessFile raf = new RandomAccessFile(sLockPasswordFilename, "rw"); - // Truncate the file if pattern is null, to clear the lock - if (password == null) { - raf.setLength(0); - } else { - raf.write(hash, 0, hash.length); - } - raf.close(); + getLockSettings().setLockPassword(hash, getCurrentOrCallingUserId()); DevicePolicyManager dpm = getDevicePolicyManager(); KeyStore keyStore = KeyStore.getInstance(); if (password != null) { @@ -676,12 +642,9 @@ public class LockPatternUtils { dpm.setActivePasswordState( DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0); } - } catch (FileNotFoundException fnfe) { - // Cant do much, unless we want to fail over to using the settings provider - Log.e(TAG, "Unable to save lock pattern to " + sLockPasswordFilename); - } catch (IOException ioe) { + } catch (RemoteException re) { // Cant do much - Log.e(TAG, "Unable to save lock pattern to " + sLockPasswordFilename); + Log.e(TAG, "Unable to save lock password " + re); } } @@ -1013,30 +976,57 @@ public class LockPatternUtils { } private boolean getBoolean(String secureSettingKey, boolean defaultValue) { - return 1 == - android.provider.Settings.Secure.getInt(mContentResolver, secureSettingKey, - defaultValue ? 1 : 0); + try { + return getLockSettings().getBoolean(secureSettingKey, defaultValue, + getCurrentOrCallingUserId()); + } catch (RemoteException re) { + return defaultValue; + } } private void setBoolean(String secureSettingKey, boolean enabled) { - android.provider.Settings.Secure.putInt(mContentResolver, secureSettingKey, - enabled ? 1 : 0); + try { + getLockSettings().setBoolean(secureSettingKey, enabled, getCurrentOrCallingUserId()); + } catch (RemoteException re) { + // What can we do? + Log.e(TAG, "Couldn't write boolean " + secureSettingKey + re); + } } - private long getLong(String secureSettingKey, long def) { - return android.provider.Settings.Secure.getLong(mContentResolver, secureSettingKey, def); + private long getLong(String secureSettingKey, long defaultValue) { + try { + return getLockSettings().getLong(secureSettingKey, defaultValue, + getCurrentOrCallingUserId()); + } catch (RemoteException re) { + return defaultValue; + } } private void setLong(String secureSettingKey, long value) { - android.provider.Settings.Secure.putLong(mContentResolver, secureSettingKey, value); + try { + getLockSettings().setLong(secureSettingKey, value, getCurrentOrCallingUserId()); + } catch (RemoteException re) { + // What can we do? + Log.e(TAG, "Couldn't write long " + secureSettingKey + re); + } } private String getString(String secureSettingKey) { - return android.provider.Settings.Secure.getString(mContentResolver, secureSettingKey); + try { + return getLockSettings().getString(secureSettingKey, null, + getCurrentOrCallingUserId()); + } catch (RemoteException re) { + return null; + } } private void setString(String secureSettingKey, String value) { - android.provider.Settings.Secure.putString(mContentResolver, secureSettingKey, value); + try { + getLockSettings().setString(secureSettingKey, value, getCurrentOrCallingUserId()); + } catch (RemoteException re) { + // What can we do? + Log.e(TAG, "Couldn't write string " + secureSettingKey + re); + } } public boolean isSecure() { diff --git a/core/java/com/android/internal/widget/LockSettingsService.java b/core/java/com/android/internal/widget/LockSettingsService.java new file mode 100644 index 0000000..24c7161 --- /dev/null +++ b/core/java/com/android/internal/widget/LockSettingsService.java @@ -0,0 +1,388 @@ +/* + * Copyright (C) 2012 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. + */ + +package com.android.internal.widget; + +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import android.os.Binder; +import android.os.RemoteException; +import android.os.UserId; +import android.provider.Settings; +import android.provider.Settings.Secure; +import android.text.TextUtils; +import android.util.Slog; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.Arrays; + +/** + * Keeps the lock pattern/password data and related settings for each user. + * Used by LockPatternUtils. Needs to be a service because Settings app also needs + * to be able to save lockscreen information for secondary users. + * @hide + */ +public class LockSettingsService extends ILockSettings.Stub { + + private final DatabaseHelper mOpenHelper; + private static final String TAG = "LockSettingsService"; + + private static final String TABLE = "locksettings"; + private static final String COLUMN_KEY = "name"; + private static final String COLUMN_USERID = "user"; + private static final String COLUMN_VALUE = "value"; + + private static final String[] COLUMNS_FOR_QUERY = { + COLUMN_VALUE + }; + + private static final String SYSTEM_DIRECTORY = "/system/"; + private static final String LOCK_PATTERN_FILE = "gesture.key"; + private static final String LOCK_PASSWORD_FILE = "password.key"; + + private final Context mContext; + + public LockSettingsService(Context context) { + mContext = context; + // Open the database + mOpenHelper = new DatabaseHelper(mContext); + } + + public void systemReady() { + migrateOldData(); + } + + private void migrateOldData() { + try { + if (getString("migrated", null, 0) != null) { + // Already migrated + return; + } + + final ContentResolver cr = mContext.getContentResolver(); + for (String validSetting : VALID_SETTINGS) { + String value = Settings.Secure.getString(cr, validSetting); + if (value != null) { + setString(validSetting, value, 0); + } + } + // No need to move the password / pattern files. They're already in the right place. + setString("migrated", "true", 0); + Slog.i(TAG, "Migrated lock settings to new location"); + } catch (RemoteException re) { + Slog.e(TAG, "Unable to migrate old data"); + } + } + + private static final void checkWritePermission(int userId) { + final int callingUid = Binder.getCallingUid(); + if (UserId.getAppId(callingUid) != android.os.Process.SYSTEM_UID) { + throw new SecurityException("uid=" + callingUid + + " not authorized to write lock settings"); + } + } + + private static final void checkPasswordReadPermission(int userId) { + final int callingUid = Binder.getCallingUid(); + if (UserId.getAppId(callingUid) != android.os.Process.SYSTEM_UID) { + throw new SecurityException("uid=" + callingUid + + " not authorized to read lock password"); + } + } + + private static final void checkReadPermission(int userId) { + final int callingUid = Binder.getCallingUid(); + if (UserId.getAppId(callingUid) != android.os.Process.SYSTEM_UID + && UserId.getUserId(callingUid) != userId) { + throw new SecurityException("uid=" + callingUid + + " not authorized to read settings of user " + userId); + } + } + + @Override + public void setBoolean(String key, boolean value, int userId) throws RemoteException { + checkWritePermission(userId); + + writeToDb(key, value ? "1" : "0", userId); + } + + @Override + public void setLong(String key, long value, int userId) throws RemoteException { + checkWritePermission(userId); + + writeToDb(key, Long.toString(value), userId); + } + + @Override + public void setString(String key, String value, int userId) throws RemoteException { + checkWritePermission(userId); + + writeToDb(key, value, userId); + } + + @Override + public boolean getBoolean(String key, boolean defaultValue, int userId) throws RemoteException { + //checkReadPermission(userId); + + String value = readFromDb(key, null, userId); + return TextUtils.isEmpty(value) ? + defaultValue : (value.equals("1") || value.equals("true")); + } + + @Override + public long getLong(String key, long defaultValue, int userId) throws RemoteException { + //checkReadPermission(userId); + + String value = readFromDb(key, null, userId); + return TextUtils.isEmpty(value) ? defaultValue : Long.parseLong(value); + } + + @Override + public String getString(String key, String defaultValue, int userId) throws RemoteException { + //checkReadPermission(userId); + + return readFromDb(key, defaultValue, userId); + } + + private String getLockPatternFilename(int userId) { + String dataSystemDirectory = + android.os.Environment.getDataDirectory().getAbsolutePath() + + SYSTEM_DIRECTORY; + if (userId == 0) { + // Leave it in the same place for user 0 + return dataSystemDirectory + LOCK_PATTERN_FILE; + } else { + return dataSystemDirectory + "users/" + userId + "/" + LOCK_PATTERN_FILE; + } + } + + private String getLockPasswordFilename(int userId) { + String dataSystemDirectory = + android.os.Environment.getDataDirectory().getAbsolutePath() + + SYSTEM_DIRECTORY; + if (userId == 0) { + // Leave it in the same place for user 0 + return dataSystemDirectory + LOCK_PASSWORD_FILE; + } else { + return dataSystemDirectory + "users/" + userId + "/" + LOCK_PASSWORD_FILE; + } + } + + @Override + public boolean havePassword(int userId) throws RemoteException { + // Do we need a permissions check here? + + return new File(getLockPasswordFilename(userId)).length() > 0; + } + + @Override + public boolean havePattern(int userId) throws RemoteException { + // Do we need a permissions check here? + + return new File(getLockPatternFilename(userId)).length() > 0; + } + + @Override + public void setLockPattern(byte[] hash, int userId) throws RemoteException { + checkWritePermission(userId); + + writeFile(getLockPatternFilename(userId), hash); + } + + @Override + public boolean checkPattern(byte[] hash, int userId) throws RemoteException { + checkPasswordReadPermission(userId); + try { + // Read all the bytes from the file + RandomAccessFile raf = new RandomAccessFile(getLockPatternFilename(userId), "r"); + final byte[] stored = new byte[(int) raf.length()]; + int got = raf.read(stored, 0, stored.length); + raf.close(); + if (got <= 0) { + return true; + } + // Compare the hash from the file with the entered pattern's hash + return Arrays.equals(stored, hash); + } catch (FileNotFoundException fnfe) { + Slog.e(TAG, "Cannot read file " + fnfe); + return true; + } catch (IOException ioe) { + Slog.e(TAG, "Cannot read file " + ioe); + return true; + } + } + + @Override + public void setLockPassword(byte[] hash, int userId) throws RemoteException { + checkWritePermission(userId); + + writeFile(getLockPasswordFilename(userId), hash); + } + + @Override + public boolean checkPassword(byte[] hash, int userId) throws RemoteException { + checkPasswordReadPermission(userId); + + try { + // Read all the bytes from the file + RandomAccessFile raf = new RandomAccessFile(getLockPasswordFilename(userId), "r"); + final byte[] stored = new byte[(int) raf.length()]; + int got = raf.read(stored, 0, stored.length); + raf.close(); + if (got <= 0) { + return true; + } + // Compare the hash from the file with the entered password's hash + return Arrays.equals(stored, hash); + } catch (FileNotFoundException fnfe) { + Slog.e(TAG, "Cannot read file " + fnfe); + return true; + } catch (IOException ioe) { + Slog.e(TAG, "Cannot read file " + ioe); + return true; + } + } + + @Override + public void removeUser(int userId) { + checkWritePermission(userId); + + SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + try { + File file = new File(getLockPasswordFilename(userId)); + if (file.exists()) { + file.delete(); + } + file = new File(getLockPatternFilename(userId)); + if (file.exists()) { + file.delete(); + } + + db.beginTransaction(); + db.delete(TABLE, COLUMN_USERID + "='" + userId + "'", null); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + } + + private void writeFile(String name, byte[] hash) { + try { + // Write the hash to file + RandomAccessFile raf = new RandomAccessFile(name, "rw"); + // Truncate the file if pattern is null, to clear the lock + if (hash == null || hash.length == 0) { + raf.setLength(0); + } else { + raf.write(hash, 0, hash.length); + } + raf.close(); + } catch (IOException ioe) { + Slog.e(TAG, "Error writing to file " + ioe); + } + } + + private void writeToDb(String key, String value, int userId) { + ContentValues cv = new ContentValues(); + cv.put(COLUMN_KEY, key); + cv.put(COLUMN_USERID, userId); + cv.put(COLUMN_VALUE, value); + + SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + db.beginTransaction(); + try { + db.delete(TABLE, COLUMN_KEY + "=? AND " + COLUMN_USERID + "=?", + new String[] {key, Integer.toString(userId)}); + db.insert(TABLE, null, cv); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + } + + private String readFromDb(String key, String defaultValue, int userId) { + Cursor cursor; + String result = defaultValue; + SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + if ((cursor = db.query(TABLE, COLUMNS_FOR_QUERY, + COLUMN_USERID + "=? AND " + COLUMN_KEY + "=?", + new String[] { Integer.toString(userId), key }, + null, null, null)) != null) { + if (cursor.moveToFirst()) { + result = cursor.getString(0); + } + cursor.close(); + } + return result; + } + + class DatabaseHelper extends SQLiteOpenHelper { + private static final String TAG = "LockSettingsDB"; + private static final String DATABASE_NAME = "locksettings.db"; + + private static final int DATABASE_VERSION = 1; + + public DatabaseHelper(Context context) { + super(context, DATABASE_NAME, null, DATABASE_VERSION); + setWriteAheadLoggingEnabled(true); + } + + private void createTable(SQLiteDatabase db) { + db.execSQL("CREATE TABLE " + TABLE + " (" + + "_id INTEGER PRIMARY KEY AUTOINCREMENT," + + COLUMN_KEY + " TEXT," + + COLUMN_USERID + " INTEGER," + + COLUMN_VALUE + " TEXT" + + ");"); + } + + @Override + public void onCreate(SQLiteDatabase db) { + createTable(db); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int currentVersion) { + // Nothing yet + } + } + + private static final String[] VALID_SETTINGS = new String[] { + LockPatternUtils.LOCKOUT_PERMANENT_KEY, + LockPatternUtils.LOCKOUT_ATTEMPT_DEADLINE, + LockPatternUtils.PATTERN_EVER_CHOSEN_KEY, + LockPatternUtils.PASSWORD_TYPE_KEY, + LockPatternUtils.PASSWORD_TYPE_ALTERNATE_KEY, + LockPatternUtils.LOCK_PASSWORD_SALT_KEY, + LockPatternUtils.DISABLE_LOCKSCREEN_KEY, + LockPatternUtils.LOCKSCREEN_OPTIONS, + LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, + LockPatternUtils.BIOMETRIC_WEAK_EVER_CHOSEN_KEY, + LockPatternUtils.LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS, + LockPatternUtils.PASSWORD_HISTORY_KEY, + Secure.LOCK_PATTERN_ENABLED, + Secure.LOCK_BIOMETRIC_WEAK_FLAGS, + Secure.LOCK_PATTERN_VISIBLE, + Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED + }; +} diff --git a/core/res/res/anim/dock_bottom_enter.xml b/core/res/res/anim/dock_bottom_enter.xml new file mode 100644 index 0000000..7a2e94b --- /dev/null +++ b/core/res/res/anim/dock_bottom_enter.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2012, 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. +*/ +--> + +<!-- Animation for when a dock window at the bottom of the screen is entering. --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/decelerate_quad"> + <translate android:fromYDelta="75%" android:toYDelta="0" + android:duration="@android:integer/config_mediumAnimTime"/> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:duration="@android:integer/config_mediumAnimTime" /> +</set> diff --git a/core/res/res/anim/dock_bottom_exit.xml b/core/res/res/anim/dock_bottom_exit.xml new file mode 100644 index 0000000..c2fd15c --- /dev/null +++ b/core/res/res/anim/dock_bottom_exit.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2012, 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. +*/ +--> + +<!-- Animation for when a dock window at the bottom of the screen is exiting. --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/accelerate_quad"> + <translate android:fromYDelta="0" android:toYDelta="75%" + android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> +</set> diff --git a/core/res/res/anim/dock_left_enter.xml b/core/res/res/anim/dock_left_enter.xml new file mode 100644 index 0000000..b057f67 --- /dev/null +++ b/core/res/res/anim/dock_left_enter.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2012, 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. +*/ +--> + +<!-- Animation for when a dock window at the left of the screen is entering. --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/decelerate_quad"> + <translate android:fromXDelta="-75%" android:toXDelta="0" + android:duration="@android:integer/config_mediumAnimTime"/> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:duration="@android:integer/config_mediumAnimTime" /> +</set> diff --git a/core/res/res/anim/dock_left_exit.xml b/core/res/res/anim/dock_left_exit.xml new file mode 100644 index 0000000..576b1aa --- /dev/null +++ b/core/res/res/anim/dock_left_exit.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2012, 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. +*/ +--> + +<!-- Animation for when a dock window at the right of the screen is exiting. --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/accelerate_quad"> + <translate android:fromXDelta="0" android:toXDelta="-75%" + android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> +</set> diff --git a/core/res/res/anim/dock_right_enter.xml b/core/res/res/anim/dock_right_enter.xml new file mode 100644 index 0000000..e1bd190 --- /dev/null +++ b/core/res/res/anim/dock_right_enter.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2012, 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. +*/ +--> + +<!-- Animation for when a dock window at the right of the screen is entering. --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/decelerate_quad"> + <translate android:fromXDelta="75%" android:toXDelta="0" + android:duration="@android:integer/config_mediumAnimTime"/> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:duration="@android:integer/config_mediumAnimTime" /> +</set> diff --git a/core/res/res/anim/dock_right_exit.xml b/core/res/res/anim/dock_right_exit.xml new file mode 100644 index 0000000..6d778fa --- /dev/null +++ b/core/res/res/anim/dock_right_exit.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2012, 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. +*/ +--> + +<!-- Animation for when a dock window at the right of the screen is exiting. --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/accelerate_quad"> + <translate android:fromXDelta="0" android:toXDelta="75%" + android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> +</set> diff --git a/packages/SystemUI/res/anim/status_bar_enter.xml b/core/res/res/anim/dock_top_enter.xml index f1c1301..f2e4cae 100644 --- a/packages/SystemUI/res/anim/status_bar_enter.xml +++ b/core/res/res/anim/dock_top_enter.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* //device/apps/common/res/anim/options_panel_enter.xml -** -** Copyright 2007, The Android Open Source Project +/* Copyright 2007, 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. @@ -18,10 +16,11 @@ */ --> +<!-- Animation for when a dock window at the top of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromYDelta="-75%" android:toYDelta="0" + <translate android:fromYDelta="-75%" android:toYDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/packages/SystemUI/res/anim/status_bar_exit.xml b/core/res/res/anim/dock_top_exit.xml index 46462e2..7373695 100644 --- a/packages/SystemUI/res/anim/status_bar_exit.xml +++ b/core/res/res/anim/dock_top_exit.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* //device/apps/common/res/anim/options_panel_exit.xml -** -** Copyright 2007, The Android Open Source Project +/* Copyright 2007, 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. @@ -18,10 +16,11 @@ */ --> +<!-- Animation for when a dock window at the top of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromYDelta="0" android:toYDelta="-75%" + <translate android:fromYDelta="0" android:toYDelta="-75%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 203c335..d6073e3 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Voer \'n PUK van 8 syfers of langer in."</string> <string name="needPuk" msgid="919668385956251611">"Jou SIM-kaart is PUK-gesluit. Voer die PUK-kode in om dit te ontsluit."</string> <string name="needPuk2" msgid="4526033371987193070">"Sleutel PUK2 in om SIM-kaart oop te sluit."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Inkomender beller-ID"</string> <string name="ClirMmi" msgid="7784673673446833091">"Uitgaande beller-ID"</string> <string name="CfMmi" msgid="5123218989141573515">"Oproepaanstuur"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Stel tyd"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Stel datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Stel"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Verstek"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NUUT: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Geen toestemmings benodig nie"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Voeg \'n rekening by"</string> <string name="choose_account_text" msgid="6303348737197849675">"Watter rekening wil jy gebruik?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Voeg rekening by"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Verhoging"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Verminder"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> raak en hou."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Skuif op om by te tel en af om af te trek."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Tel \'n minuut by"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Trek \'n minuut af"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Tel \'n uur by."</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Trek \'n uur af"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Stel NM."</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Stel VM."</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Tel \'n maand by"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Trek \'n maand af"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Tel \'n dag by"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Trek \'n dag af."</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Tel \'n jaar by"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Trek \'n jaar af"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"gekontroleer"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nie gekontroleer nie"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"gekies"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Deel met"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Deel met <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Skyfievatsel. Raak en hou."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Op na <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Af vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Links vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Regs vir <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Ontsluit"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Stil"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index ab937c5..2b98607 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"8 ወይም ከዛ በላይ የሆኑ ቁጥሮችንPUK ተይብ።"</string> <string name="needPuk" msgid="919668385956251611">"SIM ካርድዎ PUK-የተቆለፈ ነው።የPUK ኮዱን በመተየብ ይክፈቱት።"</string> <string name="needPuk2" msgid="4526033371987193070">" SIM ለመክፈት PUK2 ተይብ።"</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"የገቢ ደዋይID"</string> <string name="ClirMmi" msgid="7784673673446833091">"የወጪ ጥሪID"</string> <string name="CfMmi" msgid="5123218989141573515">"ጥሪ ማስተላለፍ"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"ጊዜ አዘጋጅ"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ውሂብ አዘጋጅ"</string> <string name="date_time_set" msgid="5777075614321087758">"አዘጋጅ"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"ነባሪ"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"አዲስ፦ "</font></string> <string name="no_permissions" msgid="7283357728219338112">"ምንም ፍቃዶች አይጠየቁም"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"መለያ አክል"</string> <string name="choose_account_text" msgid="6303348737197849675">"የትኛውን መለያ መጠቀም ትፈልጋለህ?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"መለያ አክል"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"ጨምር"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"ቀንስ"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> ንካ እና ያዝ።"</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"ለመጨመር ወደላይ ለመቀነስ ወደታች አንሸራት"</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"ደቂቃዎች ጨምር"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"ደቂቃ ቀንስ"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"ሰዓት ጨምር።"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"ሰዓት ቀንስ"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"PM አዘጋጅ"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"AM አዘጋጅ"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"ወር ጨምር"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"ወር ቀንስ"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"ቀን ጨምር"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"ቀን ቀንስ"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"አመት ጨምር"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"አመት ቀንስ"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"ታይቷል"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"አልተፈተሸም"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"የተመረጠ"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"ተጋራ ከ"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"ከ <xliff:g id="APPLICATION_NAME">%s</xliff:g> ጋር ተጋራ"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"ባለስላይድ መያዣ፡፡ ዳስ&ያዝ፡፡"</string> - <string name="description_direction_up" msgid="1983114130441878529">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደላይ።"</string> - <string name="description_direction_down" msgid="4294993639091088240">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደታች።"</string> - <string name="description_direction_left" msgid="6814008463839915747">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደግራ።"</string> - <string name="description_direction_right" msgid="4296057241963012862">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ወደቀኝ።"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"ክፈት"</string> <string name="description_target_camera" msgid="969071997552486814">"ካሜራ"</string> <string name="description_target_silent" msgid="893551287746522182">"ፀጥታ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index aca8f47..9c3ef5e 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"اكتب رمز PUK مكونًا من 8 أرقام أو أكثر."</string> <string name="needPuk" msgid="919668385956251611">"بطاقة SIM مؤمّنة بكود PUK. اكتب كود PUK لإلغاء تأمينها."</string> <string name="needPuk2" msgid="4526033371987193070">"اكتب PUK2 لإلغاء تأمين بطاقة SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"معرف المتصل الوارد"</string> <string name="ClirMmi" msgid="7784673673446833091">"معرف المتصل الصادر"</string> <string name="CfMmi" msgid="5123218989141573515">"إعادة توجيه الاتصال"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"تعيين الوقت"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"تعيين التاريخ"</string> <string name="date_time_set" msgid="5777075614321087758">"تعيين"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"افتراضي"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"جديد: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"لا أذونات مطلوبة"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"إضافة حساب"</string> <string name="choose_account_text" msgid="6303348737197849675">"ما الحساب الذي تريد استخدامه؟"</string> <string name="add_account_button_label" msgid="3611982894853435874">"إضافة حساب"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"زيادة"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"تناقص"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> المس مع الاستمرار."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"مرر لأعلى للزيادة ولأسفل للإنقاص."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"زيادة دقيقة"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"إنقاص دقيقة"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"زيادة ساعة"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"إنقاص ساعة"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"تعيين المساء"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"تعيين الصباح"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"زيادة شهر"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"إنقاص شهر"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"زيادة يوم"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"إنقاص يوم"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"زيادة عام"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"إنقاص عام"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"تم التحديد"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"لم يتم التحديد"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"محدد"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"مشاركة مع"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"مشاركة مع <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"مقبض التمرير. المس مع الاستمرار."</string> - <string name="description_direction_up" msgid="1983114130441878529">"أعلى إلى <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"أسفل إلى <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"يسارًا إلى <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"يمينًا إلى <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"إلغاء تأمين"</string> <string name="description_target_camera" msgid="969071997552486814">"الكاميرا"</string> <string name="description_target_silent" msgid="893551287746522182">"صامت"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 4d304f1..dcb8f05 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Увядзіце PUK з 8 лічбаў ці больш."</string> <string name="needPuk" msgid="919668385956251611">"Ваша SIM-карта заблакавана PUK-кодам. Увядзіце PUK, каб разблакаваць карту."</string> <string name="needPuk2" msgid="4526033371987193070">"Увядзіце PUK2 для разблакавання SIM-карты."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Ідэнтыфікатар АВН"</string> <string name="ClirMmi" msgid="7784673673446833091">"Ідэнтыфікатар АВН"</string> <string name="CfMmi" msgid="5123218989141573515">"Пераадрасацыя выкліку"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Усталяваць час"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Усталяваць дату"</string> <string name="date_time_set" msgid="5777075614321087758">"Задаць"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Па змаўчанні"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"НОВАЕ: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Дазволу не патрабуецца"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Дадаць уліковы запіс"</string> <string name="choose_account_text" msgid="6303348737197849675">"Які ўліковы запіс вы жадаеце выкарыстоўваць?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Дадаць уліковы запіс"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Інкрэмент"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Дэкрэмент"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Націсніце і ўтрымлівайце <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Перасуньце палец уверх, каб павялiчыць адрэзак, або ўніз, каб паменшыць."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"На хвiлiну больш"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"На хвiлiну менш"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"На гадзiну больш"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"На гадзiну менш"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Усталяваць час пасля паўдня"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Усталяваць час да паўдня"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"На месяц больш"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"На месяц менш"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"На дзень больш"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"На дзень менш."</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"На год больш"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"На год менш"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"пастаўлены"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"не пастаўлены"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"абрана"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Апублікаваць з дапамогай"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Адправiць з дапамогай прыкладання <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Ручка для перасоўвання. Націсніце і ўтрымлівайце."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Уверх да <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Уніз да <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Улева да <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Управа да <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Разблакаваць"</string> <string name="description_target_camera" msgid="969071997552486814">"Камера"</string> <string name="description_target_silent" msgid="893551287746522182">"Ціхі рэжым"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index b057cef..cee54b4 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Въведете PUK код с поне осем цифри."</string> <string name="needPuk" msgid="919668385956251611">"SIM картата ви е заключена с PUK. Въведете PUK кода, за да я отключите."</string> <string name="needPuk2" msgid="4526033371987193070">"Въведете PUK2, за да отблокирате SIM картата."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Идентификация на вх. обаждания"</string> <string name="ClirMmi" msgid="7784673673446833091">"Идентификация на изходящите повиквания"</string> <string name="CfMmi" msgid="5123218989141573515">"Пренасочване на повиквания"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Задаване на часа"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Задаване на дата"</string> <string name="date_time_set" msgid="5777075614321087758">"Задаване"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"По подразбиране"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"НОВО: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Не се изискват разрешения"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Добавяне на профил"</string> <string name="choose_account_text" msgid="6303348737197849675">"Кой профил искате да използвате?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Добавяне на профил"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Увеличаване"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Намаляване"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Докоснете <xliff:g id="VALUE">%s</xliff:g> път/и и задръжте."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Плъзнете нагоре за увеличаване и надолу за намаляване."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Увеличаване на минутите"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Намаляване на минутите"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Увеличаване на часа"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Намаляване на часа"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Задаване на PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Задаване на AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Увеличаване на месеца"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Намаляване на месеца"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Увеличаване на деня"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Намаляване на деня"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Увеличаване на годината"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Намаляване на годината"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"отметнато"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"не е отметнато"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"избрано"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Споделяне със"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Споделяне със: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Плъзгаща се дръжка. Докоснете и задръжте."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Нагоре за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Надолу за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Наляво за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Надясно за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Отключване"</string> <string name="description_target_camera" msgid="969071997552486814">"Камера"</string> <string name="description_target_silent" msgid="893551287746522182">"Тих режим"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 61c3cf0..e360af1 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Introdueix un PUK compost com a mínim de 8 nombres."</string> <string name="needPuk" msgid="919668385956251611">"La targeta SIM està bloquejada pel PUK. Escriviu el codi PUK per desbloquejar-la."</string> <string name="needPuk2" msgid="4526033371987193070">"Escriviu el PUK2 per desbloquejar la targeta SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Identificació de trucada entrant"</string> <string name="ClirMmi" msgid="7784673673446833091">"Identificació de trucada de sortida"</string> <string name="CfMmi" msgid="5123218989141573515">"Desviació de trucades"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Estableix l\'hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Establiment de data"</string> <string name="date_time_set" msgid="5777075614321087758">"Defineix"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Predeterminat"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOU: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"No cal cap permís"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Addició d\'un compte"</string> <string name="choose_account_text" msgid="6303348737197849675">"Quin compte vols utilitzar?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Afegeix un compte"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Incrementa"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Disminueix"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Mantén premut <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Fes lliscar el dit cap amunt per incrementar i cap avall per disminuir."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Incrementa els minuts"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Disminueix els minuts"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Incrementa les hores"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Disminueix les hores"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Estableix com a p. m."</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Estableix com a a. m."</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Incrementa el mes"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Disminueix el mes"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Incrementa els dies"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Disminueix els dies"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Incrementa l\'any"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Disminueix l\'any"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"marcat"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"no marcat"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"seleccionat"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Comparteix amb"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Comparteix amb <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Llisca el dit. Mantén premut."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Cap amunt per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Cap avall per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Cap a l\'esquerra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Cap a la dreta per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Desbloqueja"</string> <string name="description_target_camera" msgid="969071997552486814">"Càmera"</string> <string name="description_target_silent" msgid="893551287746522182">"Silenci"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index ec640f7..ea206b0 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Zadejte osmimístný nebo delší kód PUK."</string> <string name="needPuk" msgid="919668385956251611">"Karta SIM je blokována pomocí kódu PUK. Odblokujete ji zadáním kódu PUK."</string> <string name="needPuk2" msgid="4526033371987193070">"Chcete-li odblokovat kartu SIM, zadejte kód PUK2."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Příchozí identifikace volajícího"</string> <string name="ClirMmi" msgid="7784673673446833091">"Odchozí identifikace volajícího"</string> <string name="CfMmi" msgid="5123218989141573515">"Přesměrování hovorů"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nastavení času"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastavení data"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastavit"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Výchozí"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOVÉ: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nejsou vyžadována žádná oprávnění"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Přidat účet"</string> <string name="choose_account_text" msgid="6303348737197849675">"Který účet chcete použít?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Přidat účet"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Zvýšení"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Snížení"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> dotkněte se a podržte."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Chcete-li přičítat, přejeďte prstem nahoru, chcete-li odečítat, přejeďte prstem dolů."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Přičíst minutu"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Odečíst minutu"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Přičíst hodinu"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Odečíst hodinu"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Nastavit odp."</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Nastavit dop."</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Přičíst měsíc"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Odečíst měsíc"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Přičíst den"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Odečíst den"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Přičíst rok"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Odečíst rok"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"zaškrtnuto"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nezaškrtnuto"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"Vybráno"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Sdílet s"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Sdílet s aplikací <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Posuvník. Dotkněte se a podržte."</string> - <string name="description_direction_up" msgid="1983114130441878529">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – nahoru."</string> - <string name="description_direction_down" msgid="4294993639091088240">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – dolů."</string> - <string name="description_direction_left" msgid="6814008463839915747">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – vlevo."</string> - <string name="description_direction_right" msgid="4296057241963012862">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> – vpravo."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Odemknout"</string> <string name="description_target_camera" msgid="969071997552486814">"Fotoaparát"</string> <string name="description_target_silent" msgid="893551287746522182">"Tichý"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index d72364b..94c2999 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Angiv en PUK-kode på 8 eller flere cifre."</string> <string name="needPuk" msgid="919668385956251611">"Dit SIM-kort er låst med PUK-koden. Indtast PUK-koden for at låse den op."</string> <string name="needPuk2" msgid="4526033371987193070">"Indtast PUK2-koden for at låse op for SIM-kortet."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI-nummer"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Indgående opkalds-id"</string> <string name="ClirMmi" msgid="7784673673446833091">"Udgående opkalds-id"</string> <string name="CfMmi" msgid="5123218989141573515">"Viderestilling af opkald"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Angiv tidspunkt"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Angiv dato"</string> <string name="date_time_set" msgid="5777075614321087758">"Angiv"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NYHED! "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Der kræves ingen tilladelser"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Tilføj en konto"</string> <string name="choose_account_text" msgid="6303348737197849675">"Hvilken konto vil du bruge?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Tilføj konto"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Optælling"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Nedtælling"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Tryk <xliff:g id="VALUE">%s</xliff:g> gange, og hold inde."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Glid op for at tilføje, og glid ned for at fjerne."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Tilføj minut"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Fjern minut"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Tilføj time"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Fjern time"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Indstil PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Indstil AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Tilføj måned"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Fjern måned"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Tilføj dag"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Fjern dag"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Tilføj år"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Fjern år"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"markeret"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"ikke markeret"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"udvalgt"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Del med"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Del med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Glidende håndtag. Tryk og hold nede."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Op for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Ned for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Til venstre for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Til højre for at <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Lås op"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Lydløs"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index defd850..82a60d2 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Geben Sie eine mindestens achtstellige PUK ein."</string> <string name="needPuk" msgid="919668385956251611">"Ihre SIM-Karte ist mit einem PUK gesperrt. Geben Sie zum Entsperren den PUK-Code ein."</string> <string name="needPuk2" msgid="4526033371987193070">"Geben Sie zum Entsperren der SIM-Karte den PUK2 ein."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Anrufer-ID für eingehenden Anruf"</string> <string name="ClirMmi" msgid="7784673673446833091">"Anrufer-ID für ausgehenden Anruf"</string> <string name="CfMmi" msgid="5123218989141573515">"Rufweiterleitung"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Uhrzeit festlegen"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datum festlegen"</string> <string name="date_time_set" msgid="5777075614321087758">"Speichern"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"Neu: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Keine Berechtigungen erforderlich"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Konto hinzufügen"</string> <string name="choose_account_text" msgid="6303348737197849675">"Welches Konto möchten Sie verwenden?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Konto hinzufügen"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Erhöhen"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Verringern"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> berühren und gedrückt halten"</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Zum Vorstellen nach oben und zum Zurückstellen nach unten ziehen"</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Minute vorstellen"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Minute zurückstellen"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Stunde vorstellen"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Stunde zurückstellen"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Zeit festlegen"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Zeit festlegen"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Monat vorstellen"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Monat zurückstellen"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Tag vorstellen"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Tag zurückstellen"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Jahr vorstellen"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Jahr zurückstellen"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"Aktiviert"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"Nicht aktiviert"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"Ausgewählt"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Teilen mit"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Mit <xliff:g id="APPLICATION_NAME">%s</xliff:g> teilen"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Schieberegler: Berühren und halten"</string> - <string name="description_direction_up" msgid="1983114130441878529">"Für <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach oben"</string> - <string name="description_direction_down" msgid="4294993639091088240">"Für <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach unten"</string> - <string name="description_direction_left" msgid="6814008463839915747">"Für <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach links"</string> - <string name="description_direction_right" msgid="4296057241963012862">"Für <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> nach rechts"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Entsperren"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Lautlos"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 71547ce..b9710e5 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Πληκτρολογήστε έναν κωδικό PUK με 8 αριθμούς ή περισσότερους."</string> <string name="needPuk" msgid="919668385956251611">"Η κάρτα SIM έχει κλειδωθεί με κωδικό PUK. Πληκτρολογήστε τον κωδικό PUK για να την ξεκλειδώσετε."</string> <string name="needPuk2" msgid="4526033371987193070">"Πληκτρολογήστε τον κωδικό PUK2 για την κατάργηση αποκλεισμού της κάρτας SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Εισερχόμενη αναγνώριση κλήσης"</string> <string name="ClirMmi" msgid="7784673673446833091">"Εξερχόμενη αναγνώριση κλήσης"</string> <string name="CfMmi" msgid="5123218989141573515">"Προώθηση κλήσεων"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Ρύθμιση ώρας"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ορισμός ημερομηνίας"</string> <string name="date_time_set" msgid="5777075614321087758">"Ορισμός"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Προεπιλεγμένο"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"ΝΕΟ: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Δεν απαιτούνται άδειες"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Προσθήκη λογαριασμού"</string> <string name="choose_account_text" msgid="6303348737197849675">"Ποιον λογαριασμό θέλετε να χρησιμοποιήσετε;"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Προσθήκη λογαριασμού"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Αύξηση"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Μείωση"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Πατήστε παρατεταμένα το <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Πραγματοποιήστε κύλιση προς τα πάνω για αύξηση και προς τα κάτω για μείωση."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Αύξηση λεπτού"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Μείωση λεπτού"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Αύξηση ώρας"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Μείωση ώρας"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Ορισμός ΜΜ"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Ορισμός ΠΜ"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Επόμενος μήνας"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Προηγούμενος μήνας"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Επόμενη ημέρα"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Προηγούμενη μέρα"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Αύξηση έτους"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Προηγούμενο έτος"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"ελέγχθηκε"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"δεν επιλέχθηκε"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"επιλεγμένο"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Κοινή χρήση με"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Κοινή χρήση με <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Στοιχείο χειρισμού με δυνατότητα ολίσθησης. Αγγίξτε και πατήστε παρατεταμένα."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Κύλιση πάνω <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Κύλιση κάτω για <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Κύλιση αριστερά για <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Κύλιση δεξιά <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Ξεκλείδωμα"</string> <string name="description_target_camera" msgid="969071997552486814">"Φωτογραφική μηχανή"</string> <string name="description_target_silent" msgid="893551287746522182">"Αθόρυβο"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index b070e02..c41f2be 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Type a PUK that is 8 numbers or longer."</string> <string name="needPuk" msgid="919668385956251611">"Your SIM card is PUK-locked. Type the PUK code to unlock it."</string> <string name="needPuk2" msgid="4526033371987193070">"Type PUK2 to unblock SIM card."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Incoming Caller ID"</string> <string name="ClirMmi" msgid="7784673673446833091">"Outgoing Caller ID"</string> <string name="CfMmi" msgid="5123218989141573515">"Call forwarding"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Set time"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Set date"</string> <string name="date_time_set" msgid="5777075614321087758">"Set"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Default"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NEW: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"No permission required"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Add an account"</string> <string name="choose_account_text" msgid="6303348737197849675">"Which account do you want to use?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Add account"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Increment"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Decrement"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> touch and hold."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Slide up to increment and down to decrease."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Increment minute"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Decrement minute"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Increment hour"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Decrement hour"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Set p.m."</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Set a.m."</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Increment month"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Decrement month"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Increment day"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Decrement day"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Increment year"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Decrement year"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"ticked"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"not ticked"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"selected"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Share with"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Sliding handle. Touch & hold."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Up for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Down for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Left for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Right for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Unlock"</string> <string name="description_target_camera" msgid="969071997552486814">"Camera"</string> <string name="description_target_silent" msgid="893551287746522182">"Silent"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 8de6b8c..19e8e25 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Ingresa un código PUK de ocho números o más."</string> <string name="needPuk" msgid="919668385956251611">"Tu tarjeta SIM está bloqueada con PUK. Escribe el código PUK para desbloquearla."</string> <string name="needPuk2" msgid="4526033371987193070">"Escribir PUK2 para desbloquear la tarjeta SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Identificador de llamadas entrantes"</string> <string name="ClirMmi" msgid="7784673673446833091">"Identificador de llamadas salientes"</string> <string name="CfMmi" msgid="5123218989141573515">"Desvío de llamadas"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Configurar hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Configurar fecha"</string> <string name="date_time_set" msgid="5777075614321087758">"Establecer"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Predeterminado"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NUEVO: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"No se requieren permisos"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Agregar una cuenta"</string> <string name="choose_account_text" msgid="6303348737197849675">"¿Qué cuenta quieres usar?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Agregar una cuenta"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Incremento"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Decremento"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Mantén presionado <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Deslízate hacia arriba para aumentar y hacia abajo para disminuir."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Aumentar minutos"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Disminuir minutos"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Aumentar horas"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Disminuir horas"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Establecer p.m."</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Establecer a.m."</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Aumentar mes"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Disminuir mes"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Aumentar día"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Disminuir día"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Aumentar año"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Disminuir año"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"marcado"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"no marcado"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"seleccionado"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Compartir con"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Compartir con <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Mantén presionado el controlador deslizante."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Hacia arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_down" msgid="4294993639091088240">"Hacia abajo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_left" msgid="6814008463839915747">"Hacia la izquierda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_right" msgid="4296057241963012862">"Hacia la derecha para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Desbloquear"</string> <string name="description_target_camera" msgid="969071997552486814">"Cámara"</string> <string name="description_target_silent" msgid="893551287746522182">"Silencioso"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index b76053f..c732ab9 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Escribe un código PUK de ocho caracteres o más."</string> <string name="needPuk" msgid="919668385956251611">"La tarjeta SIM está bloqueada con el código PUK. Introduce el código PUK para desbloquearla."</string> <string name="needPuk2" msgid="4526033371987193070">"Introduce el código PUK2 para desbloquear la tarjeta SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID de emisor de llamada entrante"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID de emisor de llamada saliente"</string> <string name="CfMmi" msgid="5123218989141573515">"Desvío de llamada"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Establecer hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Establecer fecha"</string> <string name="date_time_set" msgid="5777075614321087758">"Establecer"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Predeterminado"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NUEVO:"</font></string> <string name="no_permissions" msgid="7283357728219338112">"No es necesario ningún permiso"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Añadir una cuenta"</string> <string name="choose_account_text" msgid="6303348737197849675">"¿Qué cuenta quieres usar?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Añadir cuenta"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Aumentar"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Disminuir"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Mantén pulsado <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Desliza el dedo hacia arriba para aumentar y hacia abajo para disminuir."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Aumentar minuto"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Disminuir minuto"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Aumentar hora"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Disminuir hora"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Establecer p.m."</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Establecer a.m."</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Aumentar mes"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Disminuir mes"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Aumentar día"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Disminuir día"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Aumentar año"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Disminuir año"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"seleccionado"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"no seleccionado"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"seleccionado"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Compartir con"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Compartir con <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Mantén pulsado el icono de desbloqueo y deslízalo."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Hacia arriba para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_down" msgid="4294993639091088240">"Hacia abajo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_left" msgid="6814008463839915747">"Hacia la izquierda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_right" msgid="4296057241963012862">"Hacia la derecha para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Desbloquear"</string> <string name="description_target_camera" msgid="969071997552486814">"Cámara"</string> <string name="description_target_silent" msgid="893551287746522182">"Silencio"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 38c9251..890dd7b 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Sisestage 8- või enamanumbriline PUK-kood."</string> <string name="needPuk" msgid="919668385956251611">"SIM-kaart on PUK-lukustatud. Avamiseks sisestage PUK-kood."</string> <string name="needPuk2" msgid="4526033371987193070">"Sisestage SIM-kaardi blokeeringu tühistamiseks PUK2-kood."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Sissetuleva kõne helistaja ID"</string> <string name="ClirMmi" msgid="7784673673446833091">"Väljuva kõne helistaja ID"</string> <string name="CfMmi" msgid="5123218989141573515">"Kõnede suunamine"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Kellaaja määramine"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Kuupäeva määramine"</string> <string name="date_time_set" msgid="5777075614321087758">"Määra"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Vaikimisi"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"UUS: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Lube pole vaja"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Konto lisamine"</string> <string name="choose_account_text" msgid="6303348737197849675">"Millist kontot soovite kasutada?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Lisa konto"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Suurenda"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Vähenda"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> puudutage ja hoidke."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Suurendamiseks lohistage üles, vähendamiseks alla."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Minutite arvu suurendamine"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Minutite arvu vähendamine"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Tundide arvu suurendamine"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Tundide arvu vähendamine"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"PM-i seadmine"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"AM-i seadmine"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Järgmine kuu"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Eelmine kuu"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Järgmine päev"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Eelmine päev"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Aastaarvu suurendamine"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Aastaarvu vähendamine"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"märgitud"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"pole märgitud"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"valitud"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Jaga:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Jaga rakendusega <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Libistamispide. Puudutage ja hoidke all."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Üles – <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Alla – <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Vasakule – <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Paremale – <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Luku avamine"</string> <string name="description_target_camera" msgid="969071997552486814">"Kaamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Hääletu"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 5a50a8f..ce26f1e 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"یک PUK با 8 رقم یا بیشتر تایپ کنید."</string> <string name="needPuk" msgid="919668385956251611">"سیم کارت شما با PUK قفل شده است. کد PUK را برای بازگشایی آن بنویسید."</string> <string name="needPuk2" msgid="4526033371987193070">"PUK2 را برای بازگشایی قفل سیم کارت بنویسید."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"شناسه تماس گیرنده ورودی"</string> <string name="ClirMmi" msgid="7784673673446833091">"شناسه تماس گیرنده خروجی"</string> <string name="CfMmi" msgid="5123218989141573515">"هدایت تماس"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"تنظیم زمان"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"تاریخ تنظیم"</string> <string name="date_time_set" msgid="5777075614321087758">"تنظیم"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"پیش فرض"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"جدید: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"مجوزی لازم نیست"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"افزودن یک حساب"</string> <string name="choose_account_text" msgid="6303348737197849675">"کدام حساب را میخواهید استفاده کنید؟"</string> <string name="add_account_button_label" msgid="3611982894853435874">"افزودن حساب"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"افزایش"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"کاهش"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> لمس کرده و نگه دارید."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"برای افزایش به بالا و برای کاهش به پایین بلغزانید."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">" افزایش دقیقه"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"کاهش دقیقه"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"افزایش ساعت"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"کاهش ساعت"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"تنظیم ب.ظ"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"تنظیم ق.ظ"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"ماه افزایشی"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"کاهش ماه"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"افزایش روز"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"کاهش روز"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"افزایش سال"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"کاهش سال"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"علامت زده"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"بدون علامت"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"انتخاب شد"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"اشتراکگذاری با"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"اشتراکگذاری با <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"اهرم کنترل حرکت. لمس کرده و نگهدارید."</string> - <string name="description_direction_up" msgid="1983114130441878529">"بالا برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"پایین برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"چپ برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"راست برای <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"بازکردن قفل"</string> <string name="description_target_camera" msgid="969071997552486814">"دوربین"</string> <string name="description_target_silent" msgid="893551287746522182">"ساکت"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 6d849dd..54e1a1b 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Kirjoita vähintään 8 numeron pituinen PUK-koodi."</string> <string name="needPuk" msgid="919668385956251611">"SIM-korttisi on PUK-lukittu. Poista lukitus antamalla PUK-koodi."</string> <string name="needPuk2" msgid="4526033371987193070">"Pura SIM-kortin esto antamalla PUK2-koodi."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI-koodi"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Soittajan tunnus"</string> <string name="ClirMmi" msgid="7784673673446833091">"Soittajan tunnus"</string> <string name="CfMmi" msgid="5123218989141573515">"Soitonsiirto"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Aseta aika"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Aseta päivämäärä"</string> <string name="date_time_set" msgid="5777075614321087758">"Aseta"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Oletus"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"UUTTA: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Lupia ei tarvita"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Lisää tili"</string> <string name="choose_account_text" msgid="6303348737197849675">"Mitä tiliä haluat käyttää?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Lisää tili"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Lisää"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Vähennä"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> kosketa pitkään."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Kasvata tai pienennä arvoa liu\'uttamalla ylös tai alas."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Kasvata minuuttia"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Pienennä minuuttia"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Kasvata tuntia"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Pienennä tuntia"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Aseta ip"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Aseta ap"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Kasvata kuukautta"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Vähennä kuukautta"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Kasvata päivää"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Pienennä päivää"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Kasvata vuotta"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Pienennä vuotta"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"valittu"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"ei valittu"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"valittu"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Jaa seuraavien kanssa:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Jaa sovelluksessa <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Liukuva valitsin. Kosketa pitkään."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Ylös: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Alas: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Vasemmalle: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Oikealle: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Poista lukitus"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Äänetön"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 548d66b..d4a6f5b 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Saisissez un code PUK comportant au moins huit chiffres."</string> <string name="needPuk" msgid="919668385956251611">"Votre carte SIM est verrouillée par clé PUK. Saisissez la clé PUK pour la déverrouiller."</string> <string name="needPuk2" msgid="4526033371987193070">"Saisissez la clé PUK2 pour débloquer la carte SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"Code IMEI"</string> + <string name="meid" msgid="4841221237681254195">"Code MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Numéro de l\'appelant (entrant)"</string> <string name="ClirMmi" msgid="7784673673446833091">"Numéro de l\'appelant (sortant)"</string> <string name="CfMmi" msgid="5123218989141573515">"Transfert d\'appel"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Définir l\'heure"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Définir la date"</string> <string name="date_time_set" msgid="5777075614321087758">"Définir"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Par défaut"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOUVEAU"</font>" :"</string> <string name="no_permissions" msgid="7283357728219338112">"Aucune autorisation requise"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Ajouter un compte"</string> <string name="choose_account_text" msgid="6303348737197849675">"Quel compte souhaitez-vous utiliser ?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Ajouter un compte"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Augmenter"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Diminuer"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> appuyez de manière prolongée."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Faire glisser vers le haut pour augmenter et vers le bas pour diminuer"</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Minute suivante"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Minute précédente"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Heure suivante"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Heure précédente"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Définir la valeur PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Définir la valeur AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Mois suivant"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Mois précédent"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Jour suivant"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Jour précédent"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Année suivante"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Année précédente"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"coché"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"non coché"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"sélectionné"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Partager avec"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Partager avec <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Poignée coulissante. Appuyez de manière prolongée."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Vers le haut pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_down" msgid="4294993639091088240">"Vers le bas pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_left" msgid="6814008463839915747">"Vers la gauche pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_right" msgid="4296057241963012862">"Vers la droite pour <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Déverrouiller"</string> <string name="description_target_camera" msgid="969071997552486814">"Appareil photo"</string> <string name="description_target_silent" msgid="893551287746522182">"Mode silencieux"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index be85378..d84915e 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"ऐसा PUK लिखें जो 8 अंकों या अधिक का हो."</string> <string name="needPuk" msgid="919668385956251611">"आपका सिम कार्ड PUK लॉक किया गया है. इसे अनलॉक करने के लिए PUK कोड लिखें."</string> <string name="needPuk2" msgid="4526033371987193070">"सिम कार्ड अनब्लॉक करने के लिए PUK2 लिखें."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"इनकमिंग कॉलर ID"</string> <string name="ClirMmi" msgid="7784673673446833091">"आउटगोइंग कॉलर ID"</string> <string name="CfMmi" msgid="5123218989141573515">"कॉल अग्रेषण"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"समय सेट करें"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"दिनांक सेट करें"</string> <string name="date_time_set" msgid="5777075614321087758">"सेट करें"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"डिफ़ॉल्ट"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"नया: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"किसी अनुमति की आवश्यकता नहीं है"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"कोई खाता जोड़ें"</string> <string name="choose_account_text" msgid="6303348737197849675">"आप कौन-सा खाता उपयोग करना चाहते हैं?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"खाता जोड़ें"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"वृद्धि"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"कमी"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> को स्पर्श करके रखें."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"बढ़ते क्रम के लिए ऊपर और घटते क्रम के लिए नीचे की ओर स्लाइड करें."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"बढ़ते क्रम में मिनट"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"घटते क्रम में मिनट"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"बढ़ते क्रम में घंटा"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"घटते क्रम में घंटा"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"सायं सेट करें"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"प्रात: सेट करें"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"बढ़ते क्रम में माह"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"घटते क्रम में माह"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"बढ़ते क्रम में दिन"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"घटते क्रम में दिन"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"बढ़ते क्रम में वर्ष"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"घटते क्रम में वर्ष"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"चेक किया गया"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"चेक नहीं किया गया"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"चयनित"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"इसके साथ साझा करें:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> के साथ साझा करें"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"स्लाइडिंग हैंडल. स्पर्श करके रखें."</string> - <string name="description_direction_up" msgid="1983114130441878529">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए ऊपर."</string> - <string name="description_direction_down" msgid="4294993639091088240">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए नीचे."</string> - <string name="description_direction_left" msgid="6814008463839915747">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए बाएं."</string> - <string name="description_direction_right" msgid="4296057241963012862">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> के लिए दाएं."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"अनलॉक करें"</string> <string name="description_target_camera" msgid="969071997552486814">"कैमरा"</string> <string name="description_target_silent" msgid="893551287746522182">"मौन"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index a30a5e0..b0ebc8a 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Upišite PUK koji se sastoji od barem 8 brojeva."</string> <string name="needPuk" msgid="919668385956251611">"Vaša je SIM kartica zaključana PUK-om. Unesite PUK kôd da biste je otključali."</string> <string name="needPuk2" msgid="4526033371987193070">"Unesite PUK2 da biste odblokirali SIM karticu."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID dolaznog pozivatelja"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID izlaznog pozivatelja"</string> <string name="CfMmi" msgid="5123218989141573515">"Preusmjeravanje poziva"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Postavljanje vremena"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Postavi datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Postavi"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Zadano"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOVO: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nije potrebno dopuštenje"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Dodajte račun"</string> <string name="choose_account_text" msgid="6303348737197849675">"Koji račun želite upotrijebiti?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Dodaj račun"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Povećaj"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Smanji"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> pritisnite i držite."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Klizite prema gore za pomak unaprijed, a prema dolje za pomak unatrag."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Pomak unaprijed za jednu minutu"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Pomak unatrag za jednu minutu"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Pomak unaprijed za jedan sat"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Pomak unatrag za jedan sat"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Postavi PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Postavi AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Pomak unaprijed za jedan mjesec"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Pomak unatrag za jedan mjesec"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Pomak unaprijed za jedan dan"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Pomak unatrag za jedan dan"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Pomak unaprijed za jednu godinu"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Pomak unatrag za jednu godinu"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"označeno"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nije označeno"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"odabran"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Dijeljenje sa"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Dijeli s aplikacijom <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Klizna ručka. Dodirnite i držite."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Gore za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Dolje za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Lijevo za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Desno za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Otključaj"</string> <string name="description_target_camera" msgid="969071997552486814">"Fotoaparat"</string> <string name="description_target_silent" msgid="893551287746522182">"Bešumno"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index f6fd651..5e3464d 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"8 számjegyű vagy hosszabb PUK kódot írjon be."</string> <string name="needPuk" msgid="919668385956251611">"A SIM-kártya le van zárva a PUK-kóddal. A feloldáshoz adja meg a PUK-kódot."</string> <string name="needPuk2" msgid="4526033371987193070">"A SIM-kártya feloldásához adja meg a PUK2-kódot."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Beérkező hívóazonosító"</string> <string name="ClirMmi" msgid="7784673673446833091">"Kimenő hívóazonosító"</string> <string name="CfMmi" msgid="5123218989141573515">"Hívásátirányítás"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Idő beállítása"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Dátum beállítása"</string> <string name="date_time_set" msgid="5777075614321087758">"Beállítás"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Alapértelmezett"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"ÚJ: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nincs szükség engedélyre"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Fiók hozzáadása"</string> <string name="choose_account_text" msgid="6303348737197849675">"Melyik fiókot szeretné használni?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Fiók hozzáadása"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Növelés"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Csökkentés"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> érintse meg és tartsa lenyomva."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Csúsztassa fel a növeléshez és le a csökkentéshez."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Percek növelése"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Percek csökkentése"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Órák növelése"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Órák csökkentése"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Állítsa du. értékre"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Állítsa de. értékre"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Hónapok növelése"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Hónapok csökkentése"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Napok növelése"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Napok csökkentése"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Évek növelése"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Évek csökkentése"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"bejelölve"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nincs bejelölve"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"bejelölve"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Megosztás a következővel:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Ossza meg a következő alkalmazással: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Csúsztatható fogantyú. Érintse meg és tartsa."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Fel: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_down" msgid="4294993639091088240">"Le: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_left" msgid="6814008463839915747">"Balra: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_right" msgid="4296057241963012862">"Jobbra: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Feloldás"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Némítás"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 4a14208..4fb25c1 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Ketik PUK yang terdiri dari 8 angka atau lebih."</string> <string name="needPuk" msgid="919668385956251611">"Kartu SIM Anda dikunci PUK. Ketikkan kode PUK untuk membukanya."</string> <string name="needPuk2" msgid="4526033371987193070">"Ketikkan PUK2 untuk membuka kartu SIM"</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Nomor Penelepon Masuk"</string> <string name="ClirMmi" msgid="7784673673446833091">"Nomor Penelepon Keluar"</string> <string name="CfMmi" msgid="5123218989141573515">"Penerusan panggilan"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Setel waktu"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setel tanggal"</string> <string name="date_time_set" msgid="5777075614321087758">"Setel"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Default"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"BARU: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Tidak perlu izin"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Tambahkan akun"</string> <string name="choose_account_text" msgid="6303348737197849675">"Akun mana yang ingin Anda gunakan?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Tambahkan akun"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Penambahan"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Pengurangan"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> sentuh dan tahan."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Geser ke atas untuk menambah dan ke bawah untuk mengurangi."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Menit penambahan"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Menit pengurangan"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Jam penambahan"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Jam pengurangan"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Menyetel PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Setel AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Bulan penambahan"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Bulan pengurangan"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Hari penambahan"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Hari pengurangan"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Tahun penambahan"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Tahun pengurangan"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"dicentang"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"tidak diperiksa"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"dipilih"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Berbagi dengan"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Berbagi dengan <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Gagang geser. Sentuh & tahan."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Ke atas untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Ke bawah untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Ke kiri untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Ke kanan untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Membuka gembok"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Senyap"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index c682a85..7f399be 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Digita un PUK formato da almeno 8 numeri."</string> <string name="needPuk" msgid="919668385956251611">"La SIM è bloccata tramite PUK. Digita il codice PUK per sbloccarla."</string> <string name="needPuk2" msgid="4526033371987193070">"Digita il PUK2 per sbloccare la SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID chiamante in entrata"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID chiamante in uscita"</string> <string name="CfMmi" msgid="5123218989141573515">"Deviazione chiamate"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Imposta ora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Imposta data"</string> <string name="date_time_set" msgid="5777075614321087758">"Imposta"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Predefinito"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NUOVA: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nessuna autorizzazione richiesta"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Aggiungi un account"</string> <string name="choose_account_text" msgid="6303348737197849675">"Quale account vuoi usare?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Aggiungi account"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Aumenta"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Diminuisci"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Tocca e tieni premuto il numero <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Scorri verso l\'alto per aumentare il valore e verso il basso per diminuirlo."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Aumenta minuto"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Diminuisci minuto"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Aumenta ora"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Diminuisci ora"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Imposta PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Imposta AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Aumenta mese"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Diminuisci mese"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Aumenta giorno"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Diminuisci giorno"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Aumenta anno"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Diminuisci anno"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"selezionata"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"non selezionato"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"selezionato"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Condividi con"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Condividi con <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Maniglia scorrevole. Tocca e tieni premuto."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Su per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Giù per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"A sinistra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"A destra per <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Sblocca"</string> <string name="description_target_camera" msgid="969071997552486814">"Fotocamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Silenzioso"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 9ebc58d..b03207d 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"הקלד PUK באורך 8 מספרים או יותר."</string> <string name="needPuk" msgid="919668385956251611">"כרטיס ה-SIM נעול באמצעות PUK. הקלד את קוד PUK כדי לבטל את נעילתו."</string> <string name="needPuk2" msgid="4526033371987193070">"הקלד PUK2 כדי לבטל את חסימת כרטיס ה-SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"זיהוי מתקשר של שיחה נכנסת"</string> <string name="ClirMmi" msgid="7784673673446833091">"זיהוי מתקשר בשיחה יוצאת"</string> <string name="CfMmi" msgid="5123218989141573515">"העברת שיחות"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"הגדרת שעה"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"הגדר תאריך"</string> <string name="date_time_set" msgid="5777075614321087758">"הגדר"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"ברירת מחדל"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"חדש: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"לא דרושים אישורים"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"הוסף חשבון"</string> <string name="choose_account_text" msgid="6303348737197849675">"באיזה חשבון ברצונך להשתמש?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"הוסף חשבון"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"הגדל"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"הפחת"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> גע והחזק."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"הסט מעלה כדי להוסיף ומטה כדי להפחית."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"הוסף דקה"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"הפחת דקה"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"הוסף שעה"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"הפחת שעה"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"הגדר PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"הגדר AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"הוסף חודש"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"הפחת חודש"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"הוסף יום"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"הפחת יום."</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"הוסף שנה"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"הפחת שנה"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"מסומן"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"לא מסומן"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"נבחר"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"שתף עם"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"שתף עם <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"ידית להחלקה. גע והחזק."</string> - <string name="description_direction_up" msgid="1983114130441878529">"\'למעלה\' עבור <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"\'למטה\' עבור <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"\'שמאל\' עבור <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"\'ימין\' עבור <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"בטל נעילה"</string> <string name="description_target_camera" msgid="969071997552486814">"מצלמה"</string> <string name="description_target_silent" msgid="893551287746522182">"שקט"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 9f70bb3..526535f 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"PUKは8桁以上で入力してください。"</string> <string name="needPuk" msgid="919668385956251611">"SIMカードはPUKでロックされています。ロックを解除するにはPUKコードを入力してください。"</string> <string name="needPuk2" msgid="4526033371987193070">"SIMカードのロック解除のためPUK2を入力します。"</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"着信時の発信者番号"</string> <string name="ClirMmi" msgid="7784673673446833091">"発信者番号"</string> <string name="CfMmi" msgid="5123218989141573515">"着信転送"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"時刻設定"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"日付設定"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"端末既定"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NEW: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"権限の許可は必要ありません"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"アカウントを追加"</string> <string name="choose_account_text" msgid="6303348737197849675">"どのアカウントを使用しますか？"</string> <string name="add_account_button_label" msgid="3611982894853435874">"アカウントを追加"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"増やす"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"減らす"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g>回タップして押し続けます。"</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"上にスライドで大きく、下にスライドで小さくなります。"</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"1分進める"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"1分戻す"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"1時間進める"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"1時間戻す"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"午後に設定"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"午前に設定"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"1か月進める"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"1か月戻す"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"1日進める"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"1日戻す"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"1年進める"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"1年戻す"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"ON"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"OFF"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"ON"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"共有"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>と共有"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"スライダーハンドルです。押し続けます。"</string> - <string name="description_direction_up" msgid="1983114130441878529">"上は<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>です。"</string> - <string name="description_direction_down" msgid="4294993639091088240">"下は<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>です。"</string> - <string name="description_direction_left" msgid="6814008463839915747">"左は<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>です。"</string> - <string name="description_direction_right" msgid="4296057241963012862">"右は<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>です。"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"ロックを解除"</string> <string name="description_target_camera" msgid="969071997552486814">"カメラ"</string> <string name="description_target_silent" msgid="893551287746522182">"マナーモード"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 0057a5b..b38b988 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"8자리 이상의 숫자 PUK를 입력합니다."</string> <string name="needPuk" msgid="919668385956251611">"SIM 카드의 PUK가 잠겨 있습니다. 잠금해제하려면 PUK 코드를 입력하세요."</string> <string name="needPuk2" msgid="4526033371987193070">"SIM 카드 잠금을 해제하려면 PUK2를 입력하세요."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"발신자 번호"</string> <string name="ClirMmi" msgid="7784673673446833091">"내 발신 번호"</string> <string name="CfMmi" msgid="5123218989141573515">"착신전환"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"시간 설정"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"날짜 설정"</string> <string name="date_time_set" msgid="5777075614321087758">"설정"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"기본값"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"신규: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"권한 필요 없음"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"계정 추가"</string> <string name="choose_account_text" msgid="6303348737197849675">"사용할 계정을 선택하세요."</string> <string name="add_account_button_label" msgid="3611982894853435874">"계정 추가"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"올리기"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"줄이기"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> 길게 터치하세요."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"올리려면 위로 슬라이드하고 줄이려면 아래로 슬라이드합니다."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"\'분\'을 올립니다."</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"\'분\'을 줄입니다."</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"\'시\'를 올립니다."</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"\'시\'를 줄입니다."</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"PM 설정"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"AM 설정"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"\'월\'을 올립니다."</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"\'월\'을 줄입니다."</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"\'날짜\'를 올립니다."</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"\'날짜\'를 줄입니다."</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"\'연도\'를 올립니다."</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"\'연도\'를 줄입니다."</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"확인"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"선택 안함"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"선택됨"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"공유 대상:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>와(과) 공유"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"슬라이딩 핸들을 길게 터치하세요."</string> - <string name="description_direction_up" msgid="1983114130441878529">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 위로 슬라이드"</string> - <string name="description_direction_down" msgid="4294993639091088240">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 아래로 슬라이드"</string> - <string name="description_direction_left" msgid="6814008463839915747">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 왼쪽으로 슬라이드"</string> - <string name="description_direction_right" msgid="4296057241963012862">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 오른쪽으로 슬라이드"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"잠금 해제"</string> <string name="description_target_camera" msgid="969071997552486814">"카메라"</string> <string name="description_target_silent" msgid="893551287746522182">"무음"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 8aeb170..4d67940 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Įveskite 8 skaitmenų ar ilgesnį PUK kodą."</string> <string name="needPuk" msgid="919668385956251611">"Jūsų SIM kortelė yra užrakinta PUK kodu. Jei norite ją atrakinti, įveskite PUK kodą."</string> <string name="needPuk2" msgid="4526033371987193070">"Įveskite PUK2 kodą, kad panaikintumėte SIM kortelės blokavimą."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Įeinančio skambintojo ID"</string> <string name="ClirMmi" msgid="7784673673446833091">"Išeinančio skambintojo ID"</string> <string name="CfMmi" msgid="5123218989141573515">"Skambučio peradresavimas"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nustatyti laiką"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nustatyti datą"</string> <string name="date_time_set" msgid="5777075614321087758">"Nustatyti"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Numatytasis"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NAUJAS: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nereikia leidimų"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Pridėti paskyrą"</string> <string name="choose_account_text" msgid="6303348737197849675">"Kurią paskyrą norite naudoti?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Pridėti paskyrą"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Padidinti"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Sumažinti"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Palieskite <xliff:g id="VALUE">%s</xliff:g> ir laikykite."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Slinkite aukštyn, kad būtų parodytas padidėjimas, ir žemyn, kad būtų parodytas sumažėjimas."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Padidėjimo minutė"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Sumažėjimo minutė"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Padidėjimo valanda"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Sumažėjimo valanda"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Nustatyti po pusiaudienio"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Nustatyti prieš pusiaudienį"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Padidėjimo mėnuo"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Sumažėjimo mėnuo"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Padidėjimo diena"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Sumažėjimo diena"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Padidėjimo metai"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Sumažėjimo metai"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"pažymėtas"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nepatikrinta"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"pasirinkta"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Bendrinti su"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Bendrinti su „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Slydimo valdymas. Palieskite ir laikykite."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Aukštyn į <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Žemyn į <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Kairėn į <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Dešinėn į <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Atrakinti"</string> <string name="description_target_camera" msgid="969071997552486814">"Vaizdo kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Begarsis"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index f434e09..12a0e58 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Ierakstiet PUK kodu, kas sastāv no 8 vai vairāk cipariem."</string> <string name="needPuk" msgid="919668385956251611">"SIM karte ir bloķēta ar PUK kodu. Ierakstiet PUK kodu, lai to atbloķētu."</string> <string name="needPuk2" msgid="4526033371987193070">"Ierakstiet PUK2 kodu, lai atbloķētu SIM karti."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Ienākošā zvana zvanītāja ID"</string> <string name="ClirMmi" msgid="7784673673446833091">"Izejošā zvana zvanītāja ID"</string> <string name="CfMmi" msgid="5123218989141573515">"Zvanu pāradresācija"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Laika iestatīšana"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datuma iestatīšana"</string> <string name="date_time_set" msgid="5777075614321087758">"Iestatīt"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Noklusējums"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"JAUNA: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Atļaujas nav nepieciešamas."</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Pievienot kontu"</string> <string name="choose_account_text" msgid="6303348737197849675">"Kuru kontu vēlaties izmantot?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Pievienot kontu"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Palielināt"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Samazināt"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g>: pieskarieties un turiet nospiestu."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Bīdiet uz augšu, lai palielinātu vērtību, un uz leju, lai to samazinātu."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Palielināt minūtes vērtību"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Samazināt minūtes vērtību"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Palielināt stundas vērtību"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Samazināt stundas vērtību"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Iestatīt pēcpusdienas laiku"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Iestatīt priekšpusdienas laiku"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Palielināt mēneša vērtību"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Samazināt mēneša vērtību"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Palielināt datuma vērtību"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Samazināt datuma vērtību"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Palielināt gada vērtību"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Samazināt gada vērtību"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"atzīmēta"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nav atzīmēta"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"atlasīta"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Kopīgot ar:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Kopīgot ar lietojumprogrammu <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Bīdāms turis. Pieskarieties tam un turiet to nospiestu."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Bīdiet uz augšu, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Bīdiet uz leju, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Bīdiet pa kreisi, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Bīdiet pa labi, lai veiktu šādu darbību: <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Atbloķēt"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Klusums"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index a2dd90c..f725896 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Taipkan PUK yang mempunyai 8 nombor atau lebih panjang."</string> <string name="needPuk" msgid="919668385956251611">"Kad SIM anda dikunci PUK. Taipkan kod PUK untuk membuka kuncinya."</string> <string name="needPuk2" msgid="4526033371987193070">"Taipkan PUK2 untuk menyahsekat kad SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID Pemanggil Masuk"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID Pemanggil Keluar"</string> <string name="CfMmi" msgid="5123218989141573515">"Pemajuan panggilan"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Tetapkan masa"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tetapkan tarikh"</string> <string name="date_time_set" msgid="5777075614321087758">"Tetapkan"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Lalai"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"BAHARU: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Tiada kebenaran diperlukan"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Tambah akaun"</string> <string name="choose_account_text" msgid="6303348737197849675">"Akaun mana yang mahu anda gunakan?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Tambah akaun"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Kenaikan"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Penyusutan"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> sentuh terus."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Luncurkan ke atas untuk kenaikan dan ke bawah untuk penyusutan."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Minit kenaikan"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Minit penyusutan"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Jam kenaikan"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Jam penyusutan"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Tetapkan PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Tetapkan AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Bulan kenaikan"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Bulan penyusutan"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Hari kenaikan"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Hari penyusutan"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Tahun kenaikan"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Tahun penyusutan"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"ditandakan"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"tidak ditandakan"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"dipilih"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Kongsi dengan"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Kongsi dengan <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Pemegang gelongsor. Sentuh & tahan."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Atas untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Bawah untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Kiri untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Kanan untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Buka kunci"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Senyap"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index b3ea39f..8bc9dab 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Skriv inn en PUK-kode på åtte tall eller mer."</string> <string name="needPuk" msgid="919668385956251611">"SIM-kortet ditt er PUK-låst. Skriv inn PUK-koden for å låse det opp."</string> <string name="needPuk2" msgid="4526033371987193070">"Skriv inn PUK2 for å låse opp SIM-kortet."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Inngående nummervisning"</string> <string name="ClirMmi" msgid="7784673673446833091">"Utgående nummervisning"</string> <string name="CfMmi" msgid="5123218989141573515">"Viderekobling"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Stille klokken"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Angi dato"</string> <string name="date_time_set" msgid="5777075614321087758">"Lagre"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NYTT: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Trenger ingen rettigheter"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Legg til en konto"</string> <string name="choose_account_text" msgid="6303348737197849675">"Hvilken konto vil du bruke?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Legg til konto"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Øke"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Senke"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> – trykk og hold inne."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Skyv opp for å øke og ned for å redusere."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Endre minutter (fremover)"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Endre minutter (bakover)"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Endre timer (fremover)"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Endre time (bakover)"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Angi p.m."</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Angi a.m."</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Endre måned (fremover)"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Endre måned (bakover)"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Endre dag (fremover)"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Endre dag (bakover)"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Endre år (fremover)"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Endre år (bakover)"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"valgt"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"ikke valgt"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"valgt"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Del med"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Del med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Glidebryter. Trykk og hold inne."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Opp for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Ned for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Venstre for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Høyre for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Lås opp"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Stille"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 5698f03..61f08e0 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Typ een PUK-code die 8 cijfers of langer is."</string> <string name="needPuk" msgid="919668385956251611">"Uw SIM-kaart is vergrendeld met de PUK-code. Typ de PUK-code om te ontgrendelen."</string> <string name="needPuk2" msgid="4526033371987193070">"Voer de PUK2-code in om de SIM-kaart te ontgrendelen."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Inkomende beller-id"</string> <string name="ClirMmi" msgid="7784673673446833091">"Uitgaande beller-id"</string> <string name="CfMmi" msgid="5123218989141573515">"Oproep doorschakelen"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Tijd instellen"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datum instellen"</string> <string name="date_time_set" msgid="5777075614321087758">"Instellen"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Standaard"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NIEUW: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Geen machtigingen vereist"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Een account toevoegen"</string> <string name="choose_account_text" msgid="6303348737197849675">"Welk account wilt u gebruiken?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Account toevoegen"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Hoger"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Lager"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> blijven aanraken."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Schuif omhoog om te verhogen en omlaag om te verlagen."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Minuten verhogen"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Minuten verlagen"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Uren verhogen"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Uren verlagen"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"PM instellen"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"AM instellen"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Maand verhogen"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Maand verlagen"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Dag verhogen"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Dag verlagen"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Jaar verhogen"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Jaar verlagen"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"aangevinkt"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"niet aangevinkt"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"geselecteerd"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Delen met"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Delen met <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Schuifgreep. Tikken en blijven aanraken."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Omhoog voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Omlaag voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Links voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Rechts voor <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Ontgrendelen"</string> <string name="description_target_camera" msgid="969071997552486814">"Camera"</string> <string name="description_target_silent" msgid="893551287746522182">"Stil"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index da2f78d..77f8adc 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Wpisz kod PUK składający się z co najmniej 8 cyfr."</string> <string name="needPuk" msgid="919668385956251611">"Karta SIM jest zablokowana kodem PUK. Wprowadź kod PUK, aby odblokować kartę."</string> <string name="needPuk2" msgid="4526033371987193070">"Wprowadź kod PUK2, aby odblokować kartę SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Identyfikator rozmówcy przy połączeniach przychodzących"</string> <string name="ClirMmi" msgid="7784673673446833091">"Identyfikator rozmówcy przy połączeniach wychodzących"</string> <string name="CfMmi" msgid="5123218989141573515">"Przekazywanie połączeń"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Ustaw godzinę"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ustaw datę"</string> <string name="date_time_set" msgid="5777075614321087758">"Ustaw"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Domyślne"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOWE: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nie są wymagane żadne uprawnienia"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Dodaj konto"</string> <string name="choose_account_text" msgid="6303348737197849675">"Którego konta chcesz użyć?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Dodaj konto"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Zwiększ"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Zmniejsz"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> dotknij i przytrzymaj."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Przesuń w górę, aby zwiększyć wartość, lub w dół, aby ją zmniejszyć."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Następna minuta"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Poprzednia minuta"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Następna godzina"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Poprzednia godzina"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Ustaw PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Ustaw AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Następny miesiąc"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Poprzedni miesiąc"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Następny dzień"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Poprzedni dzień"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Następny rok"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Poprzedni rok"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"zaznaczono"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nie zaznaczono"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"wybrano"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Udostępnij przez"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Udostępnij przez <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Uchwyt przesuwny. Dotknij i przytrzymaj."</string> - <string name="description_direction_up" msgid="1983114130441878529">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>: w górę"</string> - <string name="description_direction_down" msgid="4294993639091088240">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>: w dół"</string> - <string name="description_direction_left" msgid="6814008463839915747">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>: w lewo"</string> - <string name="description_direction_right" msgid="4296057241963012862">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>: w prawo"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Odblokuj"</string> <string name="description_target_camera" msgid="969071997552486814">"Aparat"</string> <string name="description_target_silent" msgid="893551287746522182">"Wyciszenie"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index ec43491..2a3e2b9 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Introduza um PUK que tenha 8 ou mais algarismos."</string> <string name="needPuk" msgid="919668385956251611">"O seu cartão SIM está bloqueado com PUK. Introduza o código PUK para desbloqueá-lo."</string> <string name="needPuk2" msgid="4526033371987193070">"Introduza o PUK2 para desbloquear o cartão SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID do Autor da Chamada"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID do autor da chamada efetuada"</string> <string name="CfMmi" msgid="5123218989141573515">"Encaminhamento de chamadas"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Definir hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Definir data"</string> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Predefinido"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOVA: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Não são necessárias permissões"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Adicionar uma conta"</string> <string name="choose_account_text" msgid="6303348737197849675">"Que conta pretende utilizar?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Adicionar conta"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Aumentar"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Diminuir"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Toque sem soltar em <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Deslize lentamente para cima para aumentar e para baixo para diminuir."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Aumentar minuto"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Diminuir minuto"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Aumentar hora"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Diminuir hora"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Definir PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Definir AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Aumentar mês"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Diminuir mês"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Aumentar dia"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Diminuir dia"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Aumentar ano"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Diminuir ano"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"marcado"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"desmarcado"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"selecionado"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Partilhar com:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Compartilhar com <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Barra deslizante. Toque & não solte."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Para cima para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Para baixo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Para a esquerda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Para a direita para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Desbloquear"</string> <string name="description_target_camera" msgid="969071997552486814">"Câmara"</string> <string name="description_target_silent" msgid="893551287746522182">"Silencioso"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 53e2a96..88b7a57 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Digite um PUK com oito números ou mais."</string> <string name="needPuk" msgid="919668385956251611">"O seu cartão SIM está bloqueado por um PUK. Digite o código PUK para desbloqueá-lo."</string> <string name="needPuk2" msgid="4526033371987193070">"Digite o PUK2 para desbloquear o cartão SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID do chamador de entrada"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID do chamador de saída"</string> <string name="CfMmi" msgid="5123218989141573515">"Encaminhamento de chamada"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Definir hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Definir data"</string> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Padrão"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOVO: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nenhuma permissão necessária"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Adicionar uma conta"</string> <string name="choose_account_text" msgid="6303348737197849675">"Qual conta você deseja usar?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Adicionar conta"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Incremento"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Redução"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> toque e mantenha pressionado."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Deslize para cima para aumentar e para baixo para diminuir."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Aumentar minuto"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Diminuir minuto"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Aumentar hora"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Diminuir hora"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Configurar valor PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Configurar valor AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Aumentar mês"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Diminuir mês"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Aumentar dia"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Reduzir dia"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Aumentar ano"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Diminuir ano"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"verificado"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"não selecionado"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"selecionado"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Compartilhar com"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Compartilhar com <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Recurso deslizante. Toque e segure."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Deslize para cima para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Deslize para baixo para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Deslize para a esquerda para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Deslize para a direita para <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Desbloquear"</string> <string name="description_target_camera" msgid="969071997552486814">"Câmera"</string> <string name="description_target_silent" msgid="893551287746522182">"Silencioso"</string> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 5f0561b..75c5c7e 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -1509,6 +1509,8 @@ <!-- no translation found for date_picker_dialog_title (5879450659453782278) --> <skip /> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> <skip /> @@ -1746,37 +1748,37 @@ <skip /> <!-- no translation found for add_account_button_label (3611982894853435874) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> <skip /> <!-- no translation found for number_picker_increment_scroll_mode (3073101067441638428) --> <skip /> - <!-- no translation found for number_picker_increment_scroll_action (4628981789985093179) --> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> <skip /> - <!-- no translation found for time_picker_increment_minute_button (2843066823236250329) --> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> <skip /> - <!-- no translation found for time_picker_decrement_minute_button (4357907223628449595) --> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> <skip /> - <!-- no translation found for time_picker_increment_hour_button (2484204991937119057) --> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> <skip /> - <!-- no translation found for time_picker_decrement_hour_button (4659353501775842780) --> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> <skip /> <!-- no translation found for time_picker_increment_set_pm_button (4147590696151230863) --> <skip /> <!-- no translation found for time_picker_decrement_set_am_button (8302140353539486752) --> <skip /> - <!-- no translation found for date_picker_increment_month_button (6324978841467899081) --> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> <skip /> - <!-- no translation found for date_picker_decrement_month_button (7304349355000398077) --> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> <skip /> - <!-- no translation found for date_picker_increment_day_button (4397040141921413183) --> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> <skip /> - <!-- no translation found for date_picker_decrement_day_button (2427816793443629131) --> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> <skip /> - <!-- no translation found for date_picker_increment_year_button (3058553394722295105) --> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> <skip /> - <!-- no translation found for date_picker_decrement_year_button (5193062846559743823) --> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> <skip /> <!-- no translation found for checkbox_checked (7222044992652711167) --> <skip /> @@ -1816,13 +1818,13 @@ <skip /> <!-- no translation found for content_description_sliding_handle (415975056159262248) --> <skip /> - <!-- no translation found for description_direction_up (1983114130441878529) --> + <!-- no translation found for description_direction_up (7169032478259485180) --> <skip /> - <!-- no translation found for description_direction_down (4294993639091088240) --> + <!-- no translation found for description_direction_down (5087739728639014595) --> <skip /> - <!-- no translation found for description_direction_left (6814008463839915747) --> + <!-- no translation found for description_direction_left (7207478719805562165) --> <skip /> - <!-- no translation found for description_direction_right (4296057241963012862) --> + <!-- no translation found for description_direction_right (8034433242579600980) --> <skip /> <!-- no translation found for description_target_unlock (2228524900439801453) --> <skip /> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 11199b0..5409290 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Introduceţi un cod PUK care să aibă 8 cifre sau mai mult."</string> <string name="needPuk" msgid="919668385956251611">"Cardul SIM este blocat cu codul PUK. Introduceţi codul PUK pentru a-l debloca."</string> <string name="needPuk2" msgid="4526033371987193070">"Introduceţi codul PUK2 pentru a debloca cardul SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID apelant de primire"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID apelant"</string> <string name="CfMmi" msgid="5123218989141573515">"Redirecţionarea apelurilor"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Setaţi ora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setaţi data"</string> <string name="date_time_set" msgid="5777075614321087758">"Setaţi"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Prestabilit"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOU: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nu se solicită nicio permisiune"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Adăugaţi un cont"</string> <string name="choose_account_text" msgid="6303348737197849675">"Ce cont doriţi să utilizaţi?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Adăugaţi un cont"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Incrementaţi"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Decrementaţi"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Atingeţi şi ţineţi apăsat <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Glisaţi în sus pentru incrementare şi în jos pentru decrementare."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Incrementaţi valoarea pentru minut"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Decrementaţi valoarea pentru minut"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Incrementaţi valoarea pentru oră"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Decrementaţi valoarea pentru oră"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Setaţi valoarea PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Setaţi valoarea AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Incrementaţi valoarea pentru lună"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Decrementaţi valoarea pentru lună"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Incrementaţi valoarea pentru zi"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Decrementaţi valoarea pentru zi"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Incrementaţi valoarea pentru an"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Decrementaţi valoarea pentru an"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"bifată"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nebifată"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"selectat"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Permiteţi accesul pentru"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Permiteţi accesul pentru <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Mâner glisant. Atingeţi şi ţineţi apăsat."</string> - <string name="description_direction_up" msgid="1983114130441878529">"În sus pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"În jos pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"La stânga pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"La dreapta pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Deblocaţi"</string> <string name="description_target_camera" msgid="969071997552486814">"Cameră foto"</string> <string name="description_target_silent" msgid="893551287746522182">"Silenţios"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index d4adfb4..9d8e4a6 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Введите PUK-код из 8 или более цифр."</string> <string name="needPuk" msgid="919668385956251611">"SIM-карта заблокирована с помощью кода PUK. Для разблокировки введите код PUK."</string> <string name="needPuk2" msgid="4526033371987193070">"Для разблокировки SIM-карты введите PUK2."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Идентификация вызывающего абонента"</string> <string name="ClirMmi" msgid="7784673673446833091">"Идентификация звонящего абонента"</string> <string name="CfMmi" msgid="5123218989141573515">"Переадресация вызова"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Настройка времени"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Настройка даты"</string> <string name="date_time_set" msgid="5777075614321087758">"Установить"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"По умолчанию"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"НОВОЕ: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Не требуется разрешений"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Добавить аккаунт"</string> <string name="choose_account_text" msgid="6303348737197849675">"Выберите аккаунт"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Добавить аккаунт"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Увеличить"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Уменьшить"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Нажмите и удерживайте <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Проведите вверх, чтобы увеличить значение, и вниз, чтобы уменьшить его."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"На минуту вперед"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"На минуту назад"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"На час вперед"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"На час назад"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Установить время после полудня"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Установить время до полудня"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"На месяц вперед"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"На месяц назад"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"На день вперед"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"На день назад"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"На год вперед"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"На год назад"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"установлено"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"не установлено"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"выбрано"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Открыть доступ:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Открыть доступ приложению \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Перетаскиваемый значок блокировки. Нажмите и удерживайте."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Проведите вверх, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Проведите вниз, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Проведите влево, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Проведите вправо, чтобы <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Разблокировать"</string> <string name="description_target_camera" msgid="969071997552486814">"Камера"</string> <string name="description_target_silent" msgid="893551287746522182">"Без звука"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index bad739f9..ca80f6b 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Zadajte kód PUK, ktorý má 8 alebo viac čísel."</string> <string name="needPuk" msgid="919668385956251611">"Karta SIM je uzamknutá pomocou kódu PUK. Odomknite ju zadaním kódu PUK."</string> <string name="needPuk2" msgid="4526033371987193070">"Ak chcete odblokovať kartu SIM, zadajte kód PUK2."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Prichádzajúca identifikácia volajúceho"</string> <string name="ClirMmi" msgid="7784673673446833091">"Odchádzajúca identifikácia volajúceho"</string> <string name="CfMmi" msgid="5123218989141573515">"Presmerovanie hovorov"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nastaviť čas"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastaviť dátum"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastaviť"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Predvolené"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOVINKA: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Nevyžadujú sa žiadne oprávnenia."</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Pridať účet"</string> <string name="choose_account_text" msgid="6303348737197849675">"Ktorý účet chcete použiť?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Pridať účet"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Zvýšenie"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Zníženie"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Dotknite sa a podržte <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Ak chcete pripočítať, potiahnite prst nahor. Ak chcete odpočítať, potiahnite prst nadol."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Pripočítať minútu"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Odpočítať minútu"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Pripočítať hodinu"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Odpočítať hodinu"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Nastaviť čas popoludní"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Nastaviť čas dopoludnia"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Pripočítať mesiac"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Odpočítať mesiac"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Pripočítať deň"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Odpočítať deň"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Pripočítať rok"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Odpočítať rok"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"začiarknuté"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"nezačiarknuté"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"vybratý"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Zdieľať s"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Zdieľať s aplikáciou <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Posuvné tlačidlo. Dotknite sa a podržte."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Nahor na <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Nadol na <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Doľava na <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Doprava na <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Odomknúť"</string> <string name="description_target_camera" msgid="969071997552486814">"Fotoaparát"</string> <string name="description_target_silent" msgid="893551287746522182">"Tichý"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 767305c..e664d9c 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Vnesite 8- ali več mestni PUK."</string> <string name="needPuk" msgid="919668385956251611">"Kartica SIM je zaklenjena s kodo PUK. Če jo želite odkleniti, vnesite kodo PUK."</string> <string name="needPuk2" msgid="4526033371987193070">"Če želite odstraniti blokiranje kartice SIM, vnesite PUK2."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID dohodnega klicatelja"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID odhodnega klicatelja"</string> <string name="CfMmi" msgid="5123218989141573515">"Preusmerjanje klicev"</string> @@ -430,7 +428,7 @@ <string name="permlab_readPhoneState" msgid="2326172951448691631">"branje stanja in identitete telefona"</string> <string name="permdesc_readPhoneState" msgid="5127767618743602782">"Programu omogoča dostop do funkcij telefona v napravi. Program lahko s tem dovoljenjem določi telefonsko številko in serijsko številko tega telefona, določi lahko tudi, ali je klic aktiven, številko, s katero je klic povezan, in podobno."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"preprečitev prehoda tabličnega računalnika v stanje pripravljenosti"</string> - <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"preprečevanje prehod v stanje pripravljenosti telefona"</string> + <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"preprečevanje prehoda v stanje pripravljenosti telefona"</string> <string name="permdesc_wakeLock" product="tablet" msgid="7311319824400447868">"Omogoča, da program prepreči prehod tabličnega računalnika v stanje pripravljenosti."</string> <string name="permdesc_wakeLock" product="default" msgid="8559100677372928754">"Programu omogoča, da v telefonu prepreči prehod v stanje pripravljenosti."</string> <string name="permlab_devicePower" product="tablet" msgid="2787034722616350417">"vklop ali izklop tabličnega računalnika"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nastavi uro"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastavi datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastavi"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Privzeto"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NOVO: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Ni zahtevanih dovoljenj"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Dodajanje računa"</string> <string name="choose_account_text" msgid="6303348737197849675">"Kateri račun želite uporabiti?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Dodaj račun"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Povečaj"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Zmanjšaj"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Dotaknite se vrednosti <xliff:g id="VALUE">%s</xliff:g> in jo pridržite."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Povlecite gor za povečanje in dol za zmanjšanje."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Povečaj minute"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Zmanjšaj minute"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Povečaj uro"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Zmanjšaj uro"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Nastavi PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Nastavi AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Naslednji mesec"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Prejšnji mesec"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Naslednji dan"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Prejšnji dan"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Naslednje leto"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Prejšnje leto"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"potrjeno"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"ni odkljukano"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"izbrano"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Delite z"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Delite s programom <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Drsna ročica. Dotaknite se in pridržite."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Gor za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Dol za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Levo za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Desno za <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Odkleni"</string> <string name="description_target_camera" msgid="969071997552486814">"Fotoaparat"</string> <string name="description_target_silent" msgid="893551287746522182">"Tiho"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index d03abd7..4a3839b 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Унесите PUK који се састоји од 8 цифара или више."</string> <string name="needPuk" msgid="919668385956251611">"SIM картица је закључана PUK кодом. Унесите PUK кôд да бисте је откључали."</string> <string name="needPuk2" msgid="4526033371987193070">"Унесите PUK2 да бисте деблокирали SIM картицу."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Долазни ИД позиваоца"</string> <string name="ClirMmi" msgid="7784673673446833091">"Одлазни ИД позиваоца"</string> <string name="CfMmi" msgid="5123218989141573515">"Преусмеравање позива"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Подешавање времена"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Подешавање датума"</string> <string name="date_time_set" msgid="5777075614321087758">"Подеси"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Подразумевано"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"НОВО: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Није потребна ниједна дозвола"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Додај налог"</string> <string name="choose_account_text" msgid="6303348737197849675">"Који налог желите да користите?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Додај налог"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Повећање"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Смањење"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> додирните и задржите."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Превуците нагоре за повећање, а надоле за смањење."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Повећај минуте"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Смањи минуте"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Повећај сате"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Смањи сате"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Подеси по подне"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Подеси пре подне"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Повећај месеце"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Смањи месеце"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Повећај дане"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Смањи дане"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Повећај године"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Смањи године"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"изабрано"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"није потврђено"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"изабрано"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Дели са"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Дели са апликацијом <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Клизна ручица. Додирните и задржите."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Нагоре за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Надоле за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Улево за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Удесно за <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Откључај"</string> <string name="description_target_camera" msgid="969071997552486814">"Камера"</string> <string name="description_target_silent" msgid="893551287746522182">"Нечујно"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index ddaa30a..7ba32ce 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Ange en PUK-kod med minst 8 siffror."</string> <string name="needPuk" msgid="919668385956251611">"Ditt SIM-kort är PUK-låst. Ange PUK-koden om du vill låsa upp det."</string> <string name="needPuk2" msgid="4526033371987193070">"Ange PUK2-koden för att häva spärren av SIM-kortet."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI-kod"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Nummerpresentatör för inkommande samtal"</string> <string name="ClirMmi" msgid="7784673673446833091">"Nummerpresentatör för utgående samtal"</string> <string name="CfMmi" msgid="5123218989141573515">"Vidarebefordra samtal"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Ange tid"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ange datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Ställ in"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Standardinställning"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"NY: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Inga behörigheter krävs"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Lägg till ett konto"</string> <string name="choose_account_text" msgid="6303348737197849675">"Vilket konto vill du använda?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Lägg till konto"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Öka"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Minska"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> tryck länge."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Skjut uppåt för att öka och nedåt för att minska."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Öka minuter"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Minska minuter"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Öka timmar"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Minska timmar"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Ange em"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Ange fm"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Öka månad"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Minska månad"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Öka dagar"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Minska dag"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Öka år"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Minska år"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"markerat"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"inte markerat"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"markerade"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Dela med"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Dela med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Skärmlåsfunktion. Tryck och dra."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Upp för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Ned för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Vänster för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Höger för <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Lås upp"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Tyst"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 0424964..1744095 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Andika PUK ambayo ina urefu wa nambari 8 au zaidi."</string> <string name="needPuk" msgid="919668385956251611">"Kadi yako ya SIM imefungwa na PUK. Anika msimbo wa PUK ili kuifungua."</string> <string name="needPuk2" msgid="4526033371987193070">"Chapisha PUK2 ili kufungua SIM kadi."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Kitambulisho cha Mpigaji wa Simu Inayoingia"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID ya Mpigaji simu Inayotoka nje"</string> <string name="CfMmi" msgid="5123218989141573515">"Kusambaza simu"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Weka muda"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Weka tarehe"</string> <string name="date_time_set" msgid="5777075614321087758">"Weka"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Chaguo-msingi"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">" MPYA: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Hakuna vibali vinavyohitajika"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Ongeza akaunti"</string> <string name="choose_account_text" msgid="6303348737197849675">"Je, ni akaunti gani unataka kutumia?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Ongeza akaunti"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Ongezeko"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Punguza"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> gusa na ushikilie."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Nyiririsha juu kuongeza na chini kupunguza."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Dakika ya nyongeza"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Dakika pungufu"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Saa ya nyongeza"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Saa pungufu."</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Seti PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Seti AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Mwezi wa nyongeza"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Mwezi pungufu"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Siku ya nyongeza"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Siku pungufu"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Mwaka wa nyongeza"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Mwaka pungufu"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"imeangaliwa"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"haijakaguliwa"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"Iliyochaguliwa"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Gawa na"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Gawa na <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Utambo unaosonga. Gusa & shika"</string> - <string name="description_direction_up" msgid="1983114130441878529">"Juu ajili ya<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Chini kwa ajili ya<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Kushoto kwa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Kulia kwa ajili ya <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Fungua"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Kimya"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 7197f90..32281b5 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"พิมพ์รหัส PUK ซึ่งต้องเป็นตัวเลขอย่างน้อย 8 หลัก"</string> <string name="needPuk" msgid="919668385956251611">"ซิมการ์ดของคุณถูกล็อกด้วย PUK พิมพ์รหัส PUK เพื่อปลดล็อก"</string> <string name="needPuk2" msgid="4526033371987193070">"พิมพ์ PUK2 เพื่อยกเลิกการปิดกั้นซิมการ์ด"</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"หมายเลขผู้โทรเข้า"</string> <string name="ClirMmi" msgid="7784673673446833091">"หมายเลขผู้โทรออก"</string> <string name="CfMmi" msgid="5123218989141573515">"การโอนสาย"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"ตั้งเวลา"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ตั้งวันที่"</string> <string name="date_time_set" msgid="5777075614321087758">"ตั้งค่า"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"เริ่มต้น"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"ใหม่: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"ไม่ต้องการการอนุญาต"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"เพิ่มบัญชี"</string> <string name="choose_account_text" msgid="6303348737197849675">"คุณต้องการใช้บัญชีใด"</string> <string name="add_account_button_label" msgid="3611982894853435874">"เพิ่มบัญชี"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"การเพิ่ม"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"การลด"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"แตะ <xliff:g id="VALUE">%s</xliff:g> ค้างไว้"</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"เลื่อนขึ้นเพื่อเพิ่มและเลื่อนลงเพื่อลด"</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"เพิ่มนาที"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"ลดนาที"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"เพิ่มชั่วโมง"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"ลดชั่วโมง"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"ตั้งค่า PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"ตั้งค่า AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"เพิ่มเดือน"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"ลดเดือน"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"เพิ่มวัน"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"ลดวัน"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"เพิ่มปี"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"ลดปี"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"เลือกไว้"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"ไม่ได้ตรวจสอบ"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"เลือกแล้ว"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"แบ่งปันกับ"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"แบ่งปันด้วย <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"ที่จับสำหรับเลื่อน แตะค้างไว้"</string> - <string name="description_direction_up" msgid="1983114130441878529">"เลื่อนขึ้นเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_down" msgid="4294993639091088240">"เลื่อนลงเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_left" msgid="6814008463839915747">"เลื่อนไปทางซ้ายเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> - <string name="description_direction_right" msgid="4296057241963012862">"เลื่อนไปทางขวาเพื่อ <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"ปลดล็อก"</string> <string name="description_target_camera" msgid="969071997552486814">"กล้องถ่ายรูป"</string> <string name="description_target_silent" msgid="893551287746522182">"ปิดเสียง"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index ff2e7ea..fd88fc1 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Mag-type ng PUK na may 8 numbero o mas mahaba."</string> <string name="needPuk" msgid="919668385956251611">"Na-PUK-lock ang iyong SIM card. I-type ang PUK code upang i-unlock ito."</string> <string name="needPuk2" msgid="4526033371987193070">"I-type ang PUK2 upang i-unblock ang SIM card."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Papasok na Caller ID"</string> <string name="ClirMmi" msgid="7784673673446833091">"Papalabas na Caller ID"</string> <string name="CfMmi" msgid="5123218989141573515">"Pagpapasa ng tawag"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Magtakda ng oras"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Itakda ang petsa"</string> <string name="date_time_set" msgid="5777075614321087758">"Itakda"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Default"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"BAGO: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Walang mga kinakailangang pahintulot"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Magdagdag ng account"</string> <string name="choose_account_text" msgid="6303348737197849675">"Aling account ang nais mong gamitin?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Magdagdag ng account"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Taasan"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Babaan"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> pindutin nang matagal."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"I-slide pataas upang magdagdag at pababa upang magbawas."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Minuto ng pagdaragdag"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Minuto ng pagbawas"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Oras ng pagdaragdag"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Oras ng pagbawas"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Itakda ang PM"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Itakda ang AM"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Buwan ng pagdagdag"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Buwan ng pagbawas"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Araw ng pagdaragdag"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Araw ng pagbawas"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Taon ng pagdaragdag"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Taon ng pagbawas"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"nilagyan ng check"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"hindi nilagyan ng check"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"pinili"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Ibahagi sa"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Ibahagi sa <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Hawakan sa pag-slide. Pindutin nang matagal."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Nakataas para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Nakababa para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Pakaliwa para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Pakanan para sa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"I-unlock"</string> <string name="description_target_camera" msgid="969071997552486814">"Camera"</string> <string name="description_target_silent" msgid="893551287746522182">"Tahimik"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index c450761..251e47c 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"8 veya daha uzun basamaklı bir PUK kodu yazın."</string> <string name="needPuk" msgid="919668385956251611">"SIM kartınızın PUK kilidi devrede. Kilidi açmak için PUK kodunu yazın."</string> <string name="needPuk2" msgid="4526033371987193070">"Engellenen SIM kartı açmak için PUK2 kodunu yazın."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Gelen Çağrı Kimliği"</string> <string name="ClirMmi" msgid="7784673673446833091">"Giden Çağrı Kimliği"</string> <string name="CfMmi" msgid="5123218989141573515">"Çağrı yönlendirme"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Saati ayarla"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tarihi ayarla"</string> <string name="date_time_set" msgid="5777075614321087758">"Ayarla"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Varsayılan"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"YENİ: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"İzin gerektirmez"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Hesap ekleyin"</string> <string name="choose_account_text" msgid="6303348737197849675">"Hangi hesabı kullanmak istiyorsunuz?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Hesap ekle"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Artır"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Azalt"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> rakamına dokunun ve basılı tutun."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Artırmak için yukarı, azaltmak için aşağı kaydırın."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Dakika değerini artır"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Dakika değerini azalt"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Saat değerini artır"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Saat değerini azalt"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"ÖS değerini ayarla"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"ÖÖ değerini ayarla"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Ay değerini artır"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Ay değerini azalt"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Gün değerini artır"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Gün değerini azalt"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Yıl değerini artır"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Yıl değerini azalt"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"işaretli"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"işaretlenmedi"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"seçili"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Şununla paylaş:"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ile paylaş"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Kayan tutma yeri. Dokunun ve basılı tutun."</string> - <string name="description_direction_up" msgid="1983114130441878529">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için yukarı."</string> - <string name="description_direction_down" msgid="4294993639091088240">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için aşağı."</string> - <string name="description_direction_left" msgid="6814008463839915747">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için sola."</string> - <string name="description_direction_right" msgid="4296057241963012862">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> için sağa."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Kilidi aç"</string> <string name="description_target_camera" msgid="969071997552486814">"Kamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Sessiz"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 2afb95f..9054295 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Введіть PUK-код із 8 або більше цифр."</string> <string name="needPuk" msgid="919668385956251611">"SIM-карта заблок. PUK-кодом. Введіть PUK-код, щоб її розблок."</string> <string name="needPuk2" msgid="4526033371987193070">"Введ. PUK2, щоб розбл. SIM-карту."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Вхідн. ід. абонента"</string> <string name="ClirMmi" msgid="7784673673446833091">"Вихід. ід. абонента"</string> <string name="CfMmi" msgid="5123218989141573515">"Переадрес. виклику"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Установити час"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Установити дату"</string> <string name="date_time_set" msgid="5777075614321087758">"Застосувати"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"За умовч."</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"НОВИЙ: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Дозвіл не потрібний"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Додати обліковий запис"</string> <string name="choose_account_text" msgid="6303348737197849675">"Який обліковий запис використовувати?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Додати облік. запис"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Додати"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Відняти"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> – торкніться й утримуйте."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Перемістіть угору, щоб додати, і вниз, щоб відняти."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Додати хвилину"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Відняти хвилину"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Додати годину"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Відняти годину"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Установити час \"пп\""</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Установити час \"дп\""</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Додати місяць"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Відняти місяць"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Додати день"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Відняти день"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Додати рік"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Відняти рік"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"перевірено"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"не перевірено"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"вибрано"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Надіслати через"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Надіслати через <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Вказівник-повзунок. Торкніться й утримуйте."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Угору, щоб <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Униз, щоб <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Ліворуч, щоб <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Праворуч, щоб <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Розблокувати"</string> <string name="description_target_camera" msgid="969071997552486814">"Камера"</string> <string name="description_target_silent" msgid="893551287746522182">"Без звуку"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 329917e..609452d 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Nhập PUK có từ 8 số trở lên."</string> <string name="needPuk" msgid="919668385956251611">"Thẻ SIM của bạn đã bị khóa PUK. Nhập mã PUK để mở khóa thẻ SIM đó."</string> <string name="needPuk2" msgid="4526033371987193070">"Nhập mã PUK2 để bỏ chặn thẻ SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"Số gọi đến"</string> <string name="ClirMmi" msgid="7784673673446833091">"Số gọi đi"</string> <string name="CfMmi" msgid="5123218989141573515">"Chuyển tiếp cuộc gọi"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Đặt giờ"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Đặt ngày"</string> <string name="date_time_set" msgid="5777075614321087758">"Đặt"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Mặc định"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"MỚI: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Không yêu cầu quyền"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Thêm tài khoản"</string> <string name="choose_account_text" msgid="6303348737197849675">"Bạn muốn sử dụng tài khoản nào?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Thêm tài khoản"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Tăng dần"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Giảm dần"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Chạm và giữ <xliff:g id="VALUE">%s</xliff:g>."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Trượt lên để tăng và trượt xuống để giảm."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Phút tăng dần"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Phút giảm dần"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Giờ tăng dần"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Giờ giảm dần."</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Đặt CH"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Đặt SA"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Tháng tăng dần"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Tháng giảm dần"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Ngày tăng dần"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Ngày giảm dần"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Năm tăng dần"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Năm giảm dần."</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"đã kiểm tra"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"chưa chọn"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"đã chọn"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Chia sẻ với"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Chia sẻ với <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Tay trượt. Chạm & giữ."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Lên để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Xuống để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Sang trái để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Sang phải để <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Mở khóa"</string> <string name="description_target_camera" msgid="969071997552486814">"Máy ảnh"</string> <string name="description_target_silent" msgid="893551287746522182">"Im lặng"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index d6ed9a9..5a9cadc 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"请键入至少 8 位数字的 PUK 码。"</string> <string name="needPuk" msgid="919668385956251611">"已对 SIM 卡进行 PUK 码锁定。键入 PUK 码将其解锁。"</string> <string name="needPuk2" msgid="4526033371987193070">"输入 PUK2 码以解锁 SIM 卡。"</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"来电显示"</string> <string name="ClirMmi" msgid="7784673673446833091">"本机号码"</string> <string name="CfMmi" msgid="5123218989141573515">"来电转接"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"设置时间"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"设置日期"</string> <string name="date_time_set" msgid="5777075614321087758">"设置"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"默认"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"新增："</font></string> <string name="no_permissions" msgid="7283357728219338112">"不需要任何权限"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"添加帐户"</string> <string name="choose_account_text" msgid="6303348737197849675">"您要使用哪个帐户？"</string> <string name="add_account_button_label" msgid="3611982894853435874">"添加帐户"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"增加"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"减少"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"触摸 <xliff:g id="VALUE">%s</xliff:g> 次并按住。"</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"向上滑动可增加值，向下滑动可减少值。"</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"增加分钟数"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"减少分钟数"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"增加小时数"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"减少小时数"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"设置下午时间"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"设置上午时间"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"增加月份值"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"减少月份值"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"增加天数"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"减少天数"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"增加年数"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"减少年份值"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"已选中"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"未选中"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"已选择"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"共享对象"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"与“<xliff:g id="APPLICATION_NAME">%s</xliff:g>”共享"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"滑动手柄。触摸并按住。"</string> - <string name="description_direction_up" msgid="1983114130441878529">"向上滑动<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> - <string name="description_direction_down" msgid="4294993639091088240">"向下滑动<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> - <string name="description_direction_left" msgid="6814008463839915747">"向左滑动<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> - <string name="description_direction_right" msgid="4296057241963012862">"向右滑动<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"解锁"</string> <string name="description_target_camera" msgid="969071997552486814">"相机"</string> <string name="description_target_silent" msgid="893551287746522182">"静音"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index bc9337b..aa8eda1 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"輸入 8 位數以上的 PUK。"</string> <string name="needPuk" msgid="919668385956251611">"SIM 卡的 PUK 已鎖定。請輸入 PUK 碼解除鎖定。"</string> <string name="needPuk2" msgid="4526033371987193070">"請輸入 PUK2 以解鎖 SIM 卡。"</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"來電顯示"</string> <string name="ClirMmi" msgid="7784673673446833091">"本機號碼"</string> <string name="CfMmi" msgid="5123218989141573515">"來電轉接"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"設定時間"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"日期設定"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"預設值"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"新增："</font></string> <string name="no_permissions" msgid="7283357728219338112">"無須許可"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"新增帳戶"</string> <string name="choose_account_text" msgid="6303348737197849675">"您要使用哪個帳戶？"</string> <string name="add_account_button_label" msgid="3611982894853435874">"新增帳戶"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"增加"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"減少"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> 輕觸並按住。"</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"向上滑動即可增加，向下滑動即可減少。"</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"增加分鐘數"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"減少分鐘數"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"增加時數"</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"減少時數"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"設定 PM 值"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"設定 AM 值"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"增加月份"</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"減少月份"</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"增加天數"</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"減少天數"</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"增加年份"</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"減少年份"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"已勾選"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"尚未勾選"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"已選取"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"分享對象："</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"與「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」分享"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"滑動控制。持續輕觸。"</string> - <string name="description_direction_up" msgid="1983114130441878529">"向上滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> - <string name="description_direction_down" msgid="4294993639091088240">"向下滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> - <string name="description_direction_left" msgid="6814008463839915747">"向左滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> - <string name="description_direction_right" msgid="4296057241963012862">"向右滑動即可<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>。"</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"解除鎖定"</string> <string name="description_target_camera" msgid="969071997552486814">"相機"</string> <string name="description_target_silent" msgid="893551287746522182">"靜音"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 6471965..200bbea 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -50,10 +50,8 @@ <string name="invalidPuk" msgid="8761456210898036513">"Thayipha i-PUK enezinombolo ezingu-8 noma ngaphezu."</string> <string name="needPuk" msgid="919668385956251611">"Ikhadi lakho le-SIM livalwe nge-PUK. Thayipha ikhodi ye-PUK ukulivula."</string> <string name="needPuk2" msgid="4526033371987193070">"Thayipha i-PUK2 ukuze uvule ikhadi le-SIM."</string> - <!-- no translation found for imei (2625429890869005782) --> - <skip /> - <!-- no translation found for meid (4841221237681254195) --> - <skip /> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"I-ID Yocingo Olungenayo"</string> <string name="ClirMmi" msgid="7784673673446833091">"I-ID Yomshayeli Ephumayo"</string> <string name="CfMmi" msgid="5123218989141573515">"Ukudlulisa ikholi"</string> @@ -1021,6 +1019,8 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Hlela isikhathi"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setha idethi"</string> <string name="date_time_set" msgid="5777075614321087758">"Hlela"</string> + <!-- no translation found for date_time_done (2507683751759308828) --> + <skip /> <string name="default_permission_group" msgid="2690160991405646128">"Okuzenzakalelayo"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ffffa3a3">"OKUSHA: "</font></string> <string name="no_permissions" msgid="7283357728219338112">"Ayikho imvume edingekayo"</string> @@ -1170,22 +1170,35 @@ <string name="add_account_label" msgid="2935267344849993553">"Yengeza i-akhawunti"</string> <string name="choose_account_text" msgid="6303348737197849675">"Ingabe iyiphi i-akhawunti ofuna ukuyisebenzisa?"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Engeza i-akhawunti"</string> - <string name="number_picker_increment_button" msgid="4830170763103463443">"Nciphisa"</string> - <string name="number_picker_decrement_button" msgid="2576606679160067262">"Decrement"</string> + <!-- no translation found for number_picker_increment_button (2412072272832284313) --> + <skip /> + <!-- no translation found for number_picker_decrement_button (476050778386779067) --> + <skip /> <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"<xliff:g id="VALUE">%s</xliff:g> thinta bese ucindezela."</string> - <string name="number_picker_increment_scroll_action" msgid="4628981789985093179">"Shishilizisa kwenyuke kuye ekwenyusweni kwehle kuye ekwehlisweni."</string> - <string name="time_picker_increment_minute_button" msgid="2843066823236250329">"Iminithi wokwenyusa"</string> - <string name="time_picker_decrement_minute_button" msgid="4357907223628449595">"Iminithi yokwehlisa"</string> - <string name="time_picker_increment_hour_button" msgid="2484204991937119057">"Ihora lokwenyusa."</string> - <string name="time_picker_decrement_hour_button" msgid="4659353501775842780">"Ihora lokwehlisa"</string> + <!-- no translation found for number_picker_increment_scroll_action (9101473045891835490) --> + <skip /> + <!-- no translation found for time_picker_increment_minute_button (8865885114028614321) --> + <skip /> + <!-- no translation found for time_picker_decrement_minute_button (6246834937080684791) --> + <skip /> + <!-- no translation found for time_picker_increment_hour_button (3652056055810223139) --> + <skip /> + <!-- no translation found for time_picker_decrement_hour_button (1377479863429214792) --> + <skip /> <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Setha Ntambama"</string> <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Setha Ekuseni"</string> - <string name="date_picker_increment_month_button" msgid="6324978841467899081">"Inyanga yokwenyusa."</string> - <string name="date_picker_decrement_month_button" msgid="7304349355000398077">"Inyanga yokwehlisa."</string> - <string name="date_picker_increment_day_button" msgid="4397040141921413183">"Usuku lokwenyusa."</string> - <string name="date_picker_decrement_day_button" msgid="2427816793443629131">"Usuku lokwehlisa."</string> - <string name="date_picker_increment_year_button" msgid="3058553394722295105">"Unyaka wokwenyusa."</string> - <string name="date_picker_decrement_year_button" msgid="5193062846559743823">"Unyaka wokwehlisa"</string> + <!-- no translation found for date_picker_increment_month_button (5369998479067934110) --> + <skip /> + <!-- no translation found for date_picker_decrement_month_button (1832698995541726019) --> + <skip /> + <!-- no translation found for date_picker_increment_day_button (7130465412308173903) --> + <skip /> + <!-- no translation found for date_picker_decrement_day_button (4131881521818750031) --> + <skip /> + <!-- no translation found for date_picker_increment_year_button (6318697384310808899) --> + <skip /> + <!-- no translation found for date_picker_decrement_year_button (4482021813491121717) --> + <skip /> <string name="checkbox_checked" msgid="7222044992652711167">"kuhloliwe"</string> <string name="checkbox_not_checked" msgid="5174639551134444056">"akuhloliwe"</string> <string name="radiobutton_selected" msgid="8603599808486581511">"Okukhethiwe"</string> @@ -1205,10 +1218,14 @@ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Yabelana no"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Yabelana no <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Ihaambis isibambo. Thinta & ubambe."</string> - <string name="description_direction_up" msgid="1983114130441878529">"Phezulu kwe <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_down" msgid="4294993639091088240">"Ngaphansi kwe <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_left" msgid="6814008463839915747">"Kwesokunxeleee kwe <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> - <string name="description_direction_right" msgid="4296057241963012862">"Ngakwesokudla kwe for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <!-- no translation found for description_direction_up (7169032478259485180) --> + <skip /> + <!-- no translation found for description_direction_down (5087739728639014595) --> + <skip /> + <!-- no translation found for description_direction_left (7207478719805562165) --> + <skip /> + <!-- no translation found for description_direction_right (8034433242579600980) --> + <skip /> <string name="description_target_unlock" msgid="2228524900439801453">"Vula"</string> <string name="description_target_camera" msgid="969071997552486814">"Ikhamera"</string> <string name="description_target_silent" msgid="893551287746522182">"Thulile"</string> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 1649c48..d414c7f 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -740,6 +740,9 @@ <flag name="splitActionBarWhenNarrow" value="1" /> </attr> + <!-- The name of the logical parent of the activity as it appears in the manifest. --> + <attr name="parentActivityName" format="string" /> + <!-- The <code>manifest</code> tag is the root of an <code>AndroidManifest.xml</code> file, describing the contents of an Android package (.apk) file. One @@ -1348,6 +1351,7 @@ <attr name="immersive" /> <attr name="hardwareAccelerated" /> <attr name="uiOptions" /> + <attr name="parentActivityName" /> </declare-styleable> <!-- The <code>activity-alias</code> tag declares a new @@ -1384,6 +1388,7 @@ component specific values). --> <attr name="enabled" /> <attr name="exported" /> + <attr name="parentActivityName" /> </declare-styleable> <!-- The <code>meta-data</code> tag is used to attach additional diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 6d6b86b..0442be8 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -32,11 +32,9 @@ <dimen name="toast_y_offset">64dip</dimen> <!-- Height of the status bar --> <dimen name="status_bar_height">25dip</dimen> - <!-- Height of the system bar (combined status + navigation, used on large screens) --> - <dimen name="system_bar_height">48dip</dimen> - <!-- Height of the horizontal navigation bar on devices that require it --> + <!-- Height of the bottom navigation / system bar. --> <dimen name="navigation_bar_height">48dp</dimen> - <!-- Width of the vertical navigation bar on devices that require it --> + <!-- Width of the navigation bar when it is placed vertically on the screen --> <dimen name="navigation_bar_width">42dp</dimen> <!-- Height of notification icons in the status bar --> <dimen name="status_bar_icon_size">24dip</dimen> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 31b444a..72cb73b 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1128,6 +1128,14 @@ <!-- From android.policy --> <java-symbol type="anim" name="app_starting_exit" /> <java-symbol type="anim" name="lock_screen_behind_enter" /> + <java-symbol type="anim" name="dock_top_enter" /> + <java-symbol type="anim" name="dock_top_exit" /> + <java-symbol type="anim" name="dock_bottom_enter" /> + <java-symbol type="anim" name="dock_bottom_exit" /> + <java-symbol type="anim" name="dock_left_enter" /> + <java-symbol type="anim" name="dock_left_exit" /> + <java-symbol type="anim" name="dock_right_enter" /> + <java-symbol type="anim" name="dock_right_exit" /> <java-symbol type="array" name="config_keyboardTapVibePattern" /> <java-symbol type="array" name="config_longPressVibePattern" /> <java-symbol type="array" name="config_safeModeDisabledVibePattern" /> @@ -1153,7 +1161,6 @@ <java-symbol type="dimen" name="navigation_bar_height" /> <java-symbol type="dimen" name="navigation_bar_width" /> <java-symbol type="dimen" name="status_bar_height" /> - <java-symbol type="dimen" name="system_bar_height" /> <java-symbol type="drawable" name="ic_jog_dial_sound_off" /> <java-symbol type="drawable" name="ic_jog_dial_sound_on" /> <java-symbol type="drawable" name="ic_jog_dial_unlock" /> @@ -3567,4 +3574,6 @@ <public type="attr" name="layout_marginStart"/> <public type="attr" name="layout_marginEnd"/> + <public type="attr" name="parentActivityName" /> + </resources> diff --git a/packages/SystemUI/res/anim/status_bar_in.xml b/packages/SystemUI/res/anim/status_bar_in.xml deleted file mode 100644 index 79fe5f1..0000000 --- a/packages/SystemUI/res/anim/status_bar_in.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - > - <translate android:fromYDelta="100%p" android:toYDelta="0" - android:duration="@android:integer/config_longAnimTime" - android:interpolator="@anim/hydraulic_brake_interpolator" - /> - <alpha android:fromAlpha="0.5" android:toAlpha="1.0" - android:duration="@android:integer/config_longAnimTime" - /> -</set> diff --git a/packages/SystemUI/res/anim/status_bar_out.xml b/packages/SystemUI/res/anim/status_bar_out.xml deleted file mode 100644 index 80863cf..0000000 --- a/packages/SystemUI/res/anim/status_bar_out.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - > - <translate android:toYDelta="100%p" android:fromYDelta="0" - android:duration="@android:integer/config_longAnimTime" - android:interpolator="@anim/hydraulic_brake_interpolator" - /> - <alpha android:toAlpha="0.5" android:fromAlpha="1.0" - android:duration="@android:integer/config_longAnimTime" - /> -</set> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index dc5c540..02411d4 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -67,8 +67,6 @@ <!-- Standard animations for hiding and showing the status bar. --> <style name="Animation.StatusBar"> - <item name="android:windowEnterAnimation">@anim/status_bar_enter</item> - <item name="android:windowExitAnimation">@anim/status_bar_exit</item> </style> <style name="Animation.StatusBar.IntruderAlert"> diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java index d7a5056..1ae15be 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java @@ -69,9 +69,9 @@ public class SystemUIService extends Service { IWindowManager wm = IWindowManager.Stub.asInterface( ServiceManager.getService(Context.WINDOW_SERVICE)); try { - SERVICES[0] = wm.canStatusBarHide() - ? R.string.config_statusBarComponent - : R.string.config_systemBarComponent; + SERVICES[0] = wm.hasSystemNavBar() + ? R.string.config_systemBarComponent + : R.string.config_statusBarComponent; } catch (RemoteException e) { Slog.w(TAG, "Failing checking whether status bar can hide", e); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 12c05ed..5ba72c7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1766,11 +1766,6 @@ public class PhoneStatusBar extends BaseStatusBar { // HWComposer is unable to handle SW-rendered RGBX_8888 layers. PixelFormat.RGB_565); - // the status bar should be in an overlay if possible - final Display defaultDisplay - = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE)) - .getDefaultDisplay(); - // We explicitly leave FLAG_HARDWARE_ACCELERATED out of the flags. The status bar occupies // very little screen real-estate and is updated fairly frequently. By using CPU rendering // for the status bar, we prevent the GPU from having to wake up just to do these small @@ -1779,9 +1774,7 @@ public class PhoneStatusBar extends BaseStatusBar { lp.gravity = getStatusBarGravity(); lp.setTitle("StatusBar"); lp.packageName = mContext.getPackageName(); - lp.windowAnimations = R.style.Animation_StatusBar; WindowManagerImpl.getDefault().addView(makeStatusBarView(), lp); - } void addExpandedWindow() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java deleted file mode 100644 index 3e9a9d8..0000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * 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. - */ - -package com.android.systemui.statusbar.tablet; - -import java.util.ArrayList; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.res.Resources; -import android.util.DisplayMetrics; -import android.util.Slog; -import android.view.Display; -import android.view.WindowManager; -import android.view.WindowManagerImpl; -import android.view.WindowManagerPolicy; - -public class HeightReceiver extends BroadcastReceiver { - private static final String TAG = "StatusBar.HeightReceiver"; - - public interface OnBarHeightChangedListener { - public void onBarHeightChanged(int height); - } - - Context mContext; - ArrayList<OnBarHeightChangedListener> mListeners = new ArrayList<OnBarHeightChangedListener>(); - WindowManager mWindowManager; - int mHeight; - boolean mPlugged; - - public HeightReceiver(Context context) { - mContext = context; - mWindowManager = WindowManagerImpl.getDefault(); - } - - public void addOnBarHeightChangedListener(OnBarHeightChangedListener l) { - mListeners.add(l); - l.onBarHeightChanged(mHeight); - } - - public void removeOnBarHeightChangedListener(OnBarHeightChangedListener l) { - mListeners.remove(l); - } - - @Override - public void onReceive(Context context, Intent intent) { - final boolean plugged - = intent.getBooleanExtra(WindowManagerPolicy.EXTRA_HDMI_PLUGGED_STATE, false); - setPlugged(plugged); - } - - public void registerReceiver() { - final IntentFilter filter = new IntentFilter(); - filter.addAction(WindowManagerPolicy.ACTION_HDMI_PLUGGED); - final Intent val = mContext.registerReceiver(this, filter); - onReceive(mContext, val); - } - - private void setPlugged(boolean plugged) { - mPlugged = plugged; - updateHeight(); - } - - public void updateHeight() { - final Resources res = mContext.getResources(); - - int height = -1; - if (mPlugged) { - final DisplayMetrics metrics = new DisplayMetrics(); - Display display = mWindowManager.getDefaultDisplay(); - display.getRealMetrics(metrics); - - //Slog.i(TAG, "updateHeight: display metrics=" + metrics); - final int shortSide = Math.min(metrics.widthPixels, metrics.heightPixels); - final int externalShortSide = Math.min(display.getRawExternalWidth(), - display.getRawExternalHeight()); - height = shortSide - externalShortSide; - } - - final int minHeight - = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height); - if (height < minHeight) { - height = minHeight; - } - Slog.i(TAG, "Resizing status bar plugged=" + mPlugged + " height=" - + height + " old=" + mHeight); - mHeight = height; - - final int N = mListeners.size(); - for (int i=0; i<N; i++) { - mListeners.get(i).onBarHeightChanged(height); - } - } - - public int getHeight() { - return mHeight; - } -} - diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 7325a37..49b1a14 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -87,7 +87,6 @@ import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.Prefs; public class TabletStatusBar extends BaseStatusBar implements - HeightReceiver.OnBarHeightChangedListener, InputMethodsPanel.OnHardKeyboardEnabledChangeListener, RecentsPanelView.OnRecentsPanelVisibilityChangedListener { public static final boolean DEBUG = false; @@ -162,7 +161,6 @@ public class TabletStatusBar extends BaseStatusBar implements ViewGroup mPile; - HeightReceiver mHeightReceiver; BatteryController mBatteryController; BluetoothController mBluetoothController; LocationController mLocationController; @@ -204,12 +202,11 @@ public class TabletStatusBar extends BaseStatusBar implements private void addStatusBarWindow() { final View sb = makeStatusBarView(); - final int height = getStatusBarHeight(); final WindowManager.LayoutParams lp = new WindowManager.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, - height, - WindowManager.LayoutParams.TYPE_STATUS_BAR, + ViewGroup.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.TYPE_NAVIGATION_BAR, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH, @@ -218,20 +215,14 @@ public class TabletStatusBar extends BaseStatusBar implements // HWComposer is unable to handle SW-rendered RGBX_8888 layers. PixelFormat.RGB_565); - // the status bar should be in an overlay if possible - final Display defaultDisplay - = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE)) - .getDefaultDisplay(); - // We explicitly leave FLAG_HARDWARE_ACCELERATED out of the flags. The status bar occupies // very little screen real-estate and is updated fairly frequently. By using CPU rendering // for the status bar, we prevent the GPU from having to wake up just to do these small // updates, which should help keep power consumption down. lp.gravity = getStatusBarGravity(); - lp.setTitle("StatusBar"); + lp.setTitle("SystemBar"); lp.packageName = mContext.getPackageName(); - lp.windowAnimations = R.style.Animation_StatusBar; WindowManagerImpl.getDefault().addView(sb, lp); } @@ -414,7 +405,6 @@ public class TabletStatusBar extends BaseStatusBar implements @Override protected void onConfigurationChanged(Configuration newConfig) { - mHeightReceiver.updateHeight(); // display size may have changed loadDimens(); mNotificationPanelParams.height = getNotificationPanelHeight(); WindowManagerImpl.getDefault().updateViewLayout(mNotificationPanel, @@ -426,7 +416,7 @@ public class TabletStatusBar extends BaseStatusBar implements final Resources res = mContext.getResources(); mNaturalBarHeight = res.getDimensionPixelSize( - com.android.internal.R.dimen.system_bar_height); + com.android.internal.R.dimen.navigation_bar_height); int newIconSize = res.getDimensionPixelSize( com.android.internal.R.dimen.system_bar_icon_size); @@ -478,10 +468,6 @@ public class TabletStatusBar extends BaseStatusBar implements mWindowManager = IWindowManager.Stub.asInterface( ServiceManager.getService(Context.WINDOW_SERVICE)); - // This guy will listen for HDMI plugged broadcasts so we can resize the - // status bar as appropriate. - mHeightReceiver = new HeightReceiver(mContext); - mHeightReceiver.registerReceiver(); loadDimens(); final TabletStatusBarView sb = (TabletStatusBarView)View.inflate( @@ -637,8 +623,6 @@ public class TabletStatusBar extends BaseStatusBar implements // set the initial view visibility setAreThereNotifications(); - mHeightReceiver.addOnBarHeightChangedListener(this); - // receive broadcasts IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); @@ -674,7 +658,9 @@ public class TabletStatusBar extends BaseStatusBar implements } public int getStatusBarHeight() { - return mHeightReceiver.getHeight(); + return mStatusBarView != null ? mStatusBarView.getHeight() + : mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.navigation_bar_height); } protected int getStatusBarGravity() { diff --git a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java index 804cd9e..a472375 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java @@ -105,6 +105,7 @@ public class KeyguardUpdateMonitor { private static final int MSG_CLOCK_VISIBILITY_CHANGED = 307; private static final int MSG_DEVICE_PROVISIONED = 308; protected static final int MSG_DPM_STATE_CHANGED = 309; + protected static final int MSG_USER_CHANGED = 310; /** * When we receive a @@ -209,6 +210,9 @@ public class KeyguardUpdateMonitor { case MSG_DPM_STATE_CHANGED: handleDevicePolicyManagerStateChanged(); break; + case MSG_USER_CHANGED: + handleUserChanged(msg.arg1); + break; } } }; @@ -268,6 +272,8 @@ public class KeyguardUpdateMonitor { filter.addAction(SPN_STRINGS_UPDATED_ACTION); filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION); filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); + filter.addAction(Intent.ACTION_USER_SWITCHED); + filter.addAction(Intent.ACTION_USER_REMOVED); context.registerReceiver(new BroadcastReceiver() { public void onReceive(Context context, Intent intent) { @@ -302,6 +308,9 @@ public class KeyguardUpdateMonitor { } else if (DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED .equals(action)) { mHandler.sendMessage(mHandler.obtainMessage(MSG_DPM_STATE_CHANGED)); + } else if (Intent.ACTION_USER_SWITCHED.equals(action)) { + mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_CHANGED, + intent.getIntExtra(Intent.EXTRA_USERID, 0), 0)); } } }, filter); @@ -313,6 +322,12 @@ public class KeyguardUpdateMonitor { } } + protected void handleUserChanged(int userId) { + for (int i = 0; i < mInfoCallbacks.size(); i++) { + mInfoCallbacks.get(i).onUserChanged(userId); + } + } + protected void handleDeviceProvisioned() { for (int i = 0; i < mInfoCallbacks.size(); i++) { mInfoCallbacks.get(i).onDeviceProvisioned(); @@ -542,6 +557,11 @@ public class KeyguardUpdateMonitor { * See {@link DevicePolicyManager#ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED} */ void onDevicePolicyManagerStateChanged(); + + /** + * Called when the user changes. + */ + void onUserChanged(int userId); } // Simple class that allows methods to easily be overwritten @@ -570,6 +590,9 @@ public class KeyguardUpdateMonitor { public void onDevicePolicyManagerStateChanged() { } + + public void onUserChanged(int userId) { + } } /** diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 377ea66..0031484 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -342,6 +342,10 @@ public class KeyguardViewMediator implements KeyguardViewCallback, if (soundPath == null || mUnlockSoundId == 0) { if (DEBUG) Log.d(TAG, "failed to load sound from " + soundPath); } + IntentFilter userFilter = new IntentFilter(); + userFilter.addAction(Intent.ACTION_USER_SWITCHED); + userFilter.addAction(Intent.ACTION_USER_REMOVED); + mContext.registerReceiver(mUserChangeReceiver, userFilter); } /** @@ -801,6 +805,29 @@ public class KeyguardViewMediator implements KeyguardViewCallback, return mKeyguardViewProperties.isSecure(); } + private void onUserSwitched(int userId) { + mLockPatternUtils.setCurrentUser(userId); + synchronized (KeyguardViewMediator.this) { + resetStateLocked(); + } + } + + private void onUserRemoved(int userId) { + mLockPatternUtils.removeUser(userId); + } + + private BroadcastReceiver mUserChangeReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + if (Intent.ACTION_USER_SWITCHED.equals(action)) { + onUserSwitched(intent.getIntExtra(Intent.EXTRA_USERID, 0)); + } else if (Intent.ACTION_USER_REMOVED.equals(action)) { + onUserRemoved(intent.getIntExtra(Intent.EXTRA_USERID, 0)); + } + } + }; + private BroadcastReceiver mBroadCastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index 2e7769b..404dc6f 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -757,6 +757,12 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler hideFaceLockArea(); } } + + @Override + public void onUserChanged(int userId) { + mLockPatternUtils.setCurrentUser(userId); + updateScreen(getInitialMode(), true); + } }; @Override diff --git a/policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java b/policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java index 9a6d2cc..17e671d 100644 --- a/policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java @@ -41,7 +41,7 @@ import java.util.List; class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient implements KeyguardScreen { - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; /* TODO: revert before JB release */ private static final String TAG = "UnlockScreen"; // how long before we clear the wrong pattern @@ -321,6 +321,7 @@ class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient implements LockPatternView.OnPatternListener { public void onPatternStart() { + if (DEBUG) Log.d(TAG, "Got pattern start"); mLockPatternView.removeCallbacks(mCancelPatternRunnable); } @@ -336,6 +337,7 @@ class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient // Give just a little extra time if they hit one of the first few dots mCallback.pokeWakelock(UNLOCK_PATTERN_WAKE_INTERVAL_FIRST_DOTS_MS); } + if (DEBUG) Log.d(TAG, "Got pattern cell"); } public void onPatternDetected(List<LockPatternView.Cell> pattern) { diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index fb1e106..c3cac6e 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1,5 +1,4 @@ /* - * Copyright (C) 2006 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. @@ -72,6 +71,7 @@ import android.util.EventLog; import android.util.Log; import android.util.Slog; import android.util.SparseArray; +import android.view.Display; import android.view.Gravity; import android.view.HapticFeedbackConstants; import android.view.IApplicationToken; @@ -299,11 +299,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { boolean mHeadless; boolean mSafeMode; WindowState mStatusBar = null; - boolean mStatusBarCanHide; + boolean mHasSystemNavBar; int mStatusBarHeight; final ArrayList<WindowState> mStatusBarPanels = new ArrayList<WindowState>(); WindowState mNavigationBar = null; boolean mHasNavigationBar = false; + boolean mCanHideNavigationBar = false; + boolean mNavigationBarOnBottom = true; int mNavigationBarWidth = 0, mNavigationBarHeight = 0; WindowState mKeyguard = null; @@ -329,6 +331,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { boolean mSystemReady; boolean mSystemBooted; boolean mHdmiPlugged; + int mExternalDisplayWidth; + int mExternalDisplayHeight; int mUiMode; int mDockMode = Intent.EXTRA_DOCK_STATE_UNDOCKED; int mLidOpenRotation; @@ -464,6 +468,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // (See Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR.) int mIncallPowerBehavior; + Display mDisplay; + int mLandscapeRotation = 0; // default landscape rotation int mSeascapeRotation = 0; // "other" landscape rotation, 180 degrees from mLandscapeRotation int mPortraitRotation = 0; // default portrait rotation @@ -927,10 +933,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } - public void setInitialDisplaySize(int width, int height) { - int shortSize; + public void setInitialDisplaySize(Display display, int width, int height) { + mDisplay = display; + + int shortSize, longSize; if (width > height) { shortSize = height; + longSize = width; mLandscapeRotation = Surface.ROTATION_0; mSeascapeRotation = Surface.ROTATION_180; if (mContext.getResources().getBoolean( @@ -943,6 +952,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } else { shortSize = width; + longSize = height; mPortraitRotation = Surface.ROTATION_0; mUpsideDownRotation = Surface.ROTATION_180; if (mContext.getResources().getBoolean( @@ -955,36 +965,61 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + mExternalDisplayWidth = mDisplay.getRawExternalWidth(); + mExternalDisplayHeight = mDisplay.getRawExternalHeight(); + + mStatusBarHeight = mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.status_bar_height); + mNavigationBarHeight = mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.navigation_bar_height); + mNavigationBarWidth = mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.navigation_bar_width); + // Determine whether the status bar can hide based on the size // of the screen. We assume sizes > 600dp are tablets where we // will use the system bar. int shortSizeDp = shortSize * DisplayMetrics.DENSITY_DEFAULT / DisplayMetrics.DENSITY_DEVICE; - mStatusBarCanHide = shortSizeDp < 600; - mStatusBarHeight = mContext.getResources().getDimensionPixelSize( - mStatusBarCanHide - ? com.android.internal.R.dimen.status_bar_height - : com.android.internal.R.dimen.system_bar_height); - - mHasNavigationBar = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_showNavigationBar); - // Allow a system property to override this. Used by the emulator. - // See also hasNavigationBar(). - String navBarOverride = SystemProperties.get("qemu.hw.mainkeys"); - if (! "".equals(navBarOverride)) { - if (navBarOverride.equals("1")) mHasNavigationBar = false; - else if (navBarOverride.equals("0")) mHasNavigationBar = true; - } - - mNavigationBarHeight = mHasNavigationBar - ? mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.navigation_bar_height) - : 0; - mNavigationBarWidth = mHasNavigationBar - ? mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.navigation_bar_width) - : 0; + mHasSystemNavBar = shortSizeDp > 600; + + if (!mHasSystemNavBar) { + mHasNavigationBar = mContext.getResources().getBoolean( + com.android.internal.R.bool.config_showNavigationBar); + // Allow a system property to override this. Used by the emulator. + // See also hasNavigationBar(). + String navBarOverride = SystemProperties.get("qemu.hw.mainkeys"); + if (! "".equals(navBarOverride)) { + if (navBarOverride.equals("1")) mHasNavigationBar = false; + else if (navBarOverride.equals("0")) mHasNavigationBar = true; + } + } else { + mHasNavigationBar = false; + } + + if (mHasSystemNavBar) { + // The system bar is always at the bottom. If you are watching + // a video in landscape, we don't need to hide it if we can still + // show a 16:9 aspect ratio with it. + int longSizeDp = longSize + * DisplayMetrics.DENSITY_DEFAULT + / DisplayMetrics.DENSITY_DEVICE; + int barHeightDp = mNavigationBarHeight + * DisplayMetrics.DENSITY_DEFAULT + / DisplayMetrics.DENSITY_DEVICE; + int aspect = ((shortSizeDp-barHeightDp) * 16) / longSizeDp; + // We have computed the aspect ratio with the bar height taken + // out to be 16:aspect. If this is less than 9, then hiding + // the navigation bar will provide more useful space for wide + // screen movies. + mCanHideNavigationBar = aspect < 9; + } else if (mHasNavigationBar) { + // The navigation bar is at the right in landscape; it seems always + // useful to hide it for showing a video. + mCanHideNavigationBar = true; + } else { + mCanHideNavigationBar = false; + } if ("portrait".equals(SystemProperties.get("persist.demo.hdmirotation"))) { mHdmiRotation = mPortraitRotation; @@ -1318,13 +1353,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { return STATUS_BAR_LAYER; } - public boolean canStatusBarHide() { - return mStatusBarCanHide; + public boolean hasSystemNavBar() { + return mHasSystemNavBar; } public int getNonDecorDisplayWidth(int fullWidth, int fullHeight, int rotation) { // Assumes that the navigation bar appears on the side of the display in landscape. - if (fullWidth > fullHeight) { + if (mHasNavigationBar && fullWidth > fullHeight) { return fullWidth - mNavigationBarWidth; } return fullWidth; @@ -1333,8 +1368,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { public int getNonDecorDisplayHeight(int fullWidth, int fullHeight, int rotation) { // Assumes the navigation bar appears on the bottom of the display in portrait. return fullHeight - - (mStatusBarCanHide ? 0 : mStatusBarHeight) - - ((fullWidth > fullHeight) ? 0 : mNavigationBarHeight); + - (mHasSystemNavBar ? mNavigationBarHeight : 0) + - ((mHasNavigationBar && fullWidth > fullHeight) ? 0 : mNavigationBarHeight); } public int getConfigDisplayWidth(int fullWidth, int fullHeight, int rotation) { @@ -1348,7 +1383,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // exclude it since applications can't generally use that part of the // screen. return getNonDecorDisplayHeight(fullWidth, fullHeight, rotation) - - (mStatusBarCanHide ? mStatusBarHeight : 0); + - (mHasSystemNavBar ? 0 : mStatusBarHeight); } public boolean doesForceHide(WindowState win, WindowManager.LayoutParams attrs) { @@ -1357,6 +1392,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { public boolean canBeForceHidden(WindowState win, WindowManager.LayoutParams attrs) { return attrs.type != WindowManager.LayoutParams.TYPE_STATUS_BAR + && attrs.type != WindowManager.LayoutParams.TYPE_NAVIGATION_BAR && attrs.type != WindowManager.LayoutParams.TYPE_WALLPAPER; } @@ -1495,10 +1531,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.STATUS_BAR_SERVICE, "PhoneWindowManager"); - // TODO: Need to handle the race condition of the status bar proc - // dying and coming back before the removeWindowLw cleanup has happened. if (mStatusBar != null) { - return WindowManagerImpl.ADD_MULTIPLE_SINGLETON; + if (mStatusBar.isAlive()) { + return WindowManagerImpl.ADD_MULTIPLE_SINGLETON; + } } mStatusBar = win; break; @@ -1506,6 +1542,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.STATUS_BAR_SERVICE, "PhoneWindowManager"); + if (mNavigationBar != null) { + if (mNavigationBar.isAlive()) { + return WindowManagerImpl.ADD_MULTIPLE_SINGLETON; + } + } mNavigationBar = win; if (DEBUG_LAYOUT) Log.i(TAG, "NAVIGATION BAR: " + mNavigationBar); break; @@ -1550,7 +1591,28 @@ public class PhoneWindowManager implements WindowManagerPolicy { public int selectAnimationLw(WindowState win, int transit) { if (PRINT_ANIM) Log.i(TAG, "selectAnimation in " + win + ": transit=" + transit); - if (transit == TRANSIT_PREVIEW_DONE) { + if (win == mStatusBar) { + if (transit == TRANSIT_EXIT || transit == TRANSIT_HIDE) { + return R.anim.dock_top_exit; + } else if (transit == TRANSIT_ENTER || transit == TRANSIT_SHOW) { + return R.anim.dock_top_enter; + } + } else if (win == mNavigationBar) { + // This can be on either the bottom or the right. + if (mNavigationBarOnBottom) { + if (transit == TRANSIT_EXIT || transit == TRANSIT_HIDE) { + return R.anim.dock_bottom_exit; + } else if (transit == TRANSIT_ENTER || transit == TRANSIT_SHOW) { + return R.anim.dock_bottom_enter; + } + } else { + if (transit == TRANSIT_EXIT || transit == TRANSIT_HIDE) { + return R.anim.dock_right_exit; + } else if (transit == TRANSIT_ENTER || transit == TRANSIT_SHOW) { + return R.anim.dock_right_enter; + } + } + } if (transit == TRANSIT_PREVIEW_DONE) { if (win.hasAppShownWindows()) { if (PRINT_ANIM) Log.i(TAG, "**** STARTING EXIT"); return com.android.internal.R.anim.app_starting_exit; @@ -2036,7 +2098,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { if ((fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_FULLSCREEN | FLAG_LAYOUT_INSET_DECOR)) == (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR)) { int availRight, availBottom; - if ((attrs.systemUiVisibility & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0) { + if (mCanHideNavigationBar && + (attrs.systemUiVisibility & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0) { availRight = mUnrestrictedScreenLeft + mUnrestrictedScreenWidth; availBottom = mUnrestrictedScreenTop + mUnrestrictedScreenHeight; } else { @@ -2082,8 +2145,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { pf.right = df.right = vf.right = mDockRight; pf.bottom = df.bottom = vf.bottom = mDockBottom; - final boolean navVisible = (mNavigationBar == null || mNavigationBar.isVisibleLw()) && - (mLastSystemUiFlags&View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0; + // For purposes of putting out fake window up to steal focus, we will + // drive nav being hidden only by whether it is requested. + boolean navVisible = (mLastSystemUiFlags&View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0; // When the navigation bar isn't visible, we put up a fake // input window to catch all touch events. This way we can @@ -2101,57 +2165,71 @@ public class PhoneWindowManager implements WindowManagerPolicy { 0, false, false, true); } - // decide where the status bar goes ahead of time - if (mStatusBar != null) { - if (mNavigationBar != null) { - // Force the navigation bar to its appropriate place and - // size. We need to do this directly, instead of relying on - // it to bubble up from the nav bar, because this needs to - // change atomically with screen rotations. - if (displayWidth < displayHeight) { - // Portrait screen; nav bar goes on bottom. - mTmpNavigationFrame.set(0, displayHeight-mNavigationBarHeight, - displayWidth, displayHeight); - mStableBottom = mTmpNavigationFrame.top; - if (navVisible) { - mDockBottom = mTmpNavigationFrame.top; - mRestrictedScreenHeight = mDockBottom - mDockTop; - } else { - // We currently want to hide the navigation UI. Do this by just - // moving it off the screen, so it can still receive input events - // to know when to be re-shown. - mTmpNavigationFrame.offset(0, mNavigationBarHeight); + // For purposes of positioning and showing the nav bar, if we have + // decided that it can't be hidden (because of the screen aspect ratio), + // then take that into account. + navVisible |= !mCanHideNavigationBar; + + if (mNavigationBar != null) { + // Force the navigation bar to its appropriate place and + // size. We need to do this directly, instead of relying on + // it to bubble up from the nav bar, because this needs to + // change atomically with screen rotations. + mNavigationBarOnBottom = !mHasNavigationBar || displayWidth < displayHeight; + if (mNavigationBarOnBottom) { + // It's a system nav bar or a portrait screen; nav bar goes on bottom. + int top = displayHeight - mNavigationBarHeight; + if (mHdmiPlugged) { + if (top > mExternalDisplayHeight) { + top = mExternalDisplayHeight; } + } + mTmpNavigationFrame.set(0, top, displayWidth, displayHeight); + mStableBottom = mTmpNavigationFrame.top; + if (navVisible) { + mNavigationBar.showLw(true); + mDockBottom = mTmpNavigationFrame.top; + mRestrictedScreenHeight = mDockBottom - mDockTop; } else { - // Landscape screen; nav bar goes to the right. - mTmpNavigationFrame.set(displayWidth-mNavigationBarWidth, 0, - displayWidth, displayHeight); - mStableRight = mTmpNavigationFrame.left; - if (navVisible) { - mDockRight = mTmpNavigationFrame.left; - mRestrictedScreenWidth = mDockRight - mDockLeft; - } else { - // We currently want to hide the navigation UI. Do this by just - // moving it off the screen, so it can still receive input events - // to know when to be re-shown. - mTmpNavigationFrame.offset(mNavigationBarWidth, 0); + // We currently want to hide the navigation UI. + mNavigationBar.hideLw(true); + } + } else { + // Landscape screen; nav bar goes to the right. + int left = displayWidth - mNavigationBarWidth; + if (mHdmiPlugged) { + if (left > mExternalDisplayWidth) { + left = mExternalDisplayWidth; } } - // Make sure the content and current rectangles are updated to - // account for the restrictions from the navigation bar. - mContentTop = mCurTop = mDockTop; - mContentBottom = mCurBottom = mDockBottom; - mContentLeft = mCurLeft = mDockLeft; - mContentRight = mCurRight = mDockRight; - // And compute the final frame. - mNavigationBar.computeFrameLw(mTmpNavigationFrame, mTmpNavigationFrame, - mTmpNavigationFrame, mTmpNavigationFrame); - if (DEBUG_LAYOUT) Log.i(TAG, "mNavigationBar frame: " + mTmpNavigationFrame); + mTmpNavigationFrame.set(left, 0, displayWidth, displayHeight); + mStableRight = mTmpNavigationFrame.left; + if (navVisible) { + mNavigationBar.showLw(true); + mDockRight = mTmpNavigationFrame.left; + mRestrictedScreenWidth = mDockRight - mDockLeft; + } else { + // We currently want to hide the navigation UI. + mNavigationBar.hideLw(true); + } } - if (DEBUG_LAYOUT) Log.i(TAG, String.format("mDock rect: (%d,%d - %d,%d)", - mDockLeft, mDockTop, mDockRight, mDockBottom)); + // Make sure the content and current rectangles are updated to + // account for the restrictions from the navigation bar. + mContentTop = mCurTop = mDockTop; + mContentBottom = mCurBottom = mDockBottom; + mContentLeft = mCurLeft = mDockLeft; + mContentRight = mCurRight = mDockRight; + // And compute the final frame. + mNavigationBar.computeFrameLw(mTmpNavigationFrame, mTmpNavigationFrame, + mTmpNavigationFrame, mTmpNavigationFrame); + if (DEBUG_LAYOUT) Log.i(TAG, "mNavigationBar frame: " + mTmpNavigationFrame); + } + if (DEBUG_LAYOUT) Log.i(TAG, String.format("mDock rect: (%d,%d - %d,%d)", + mDockLeft, mDockTop, mDockRight, mDockBottom)); - // apply navigation bar insets + // decide where the status bar goes ahead of time + if (mStatusBar != null) { + // apply any navigation bar insets pf.left = df.left = vf.left = mDockLeft; pf.top = df.top = vf.top = mDockTop; pf.right = df.right = vf.right = mDockRight; @@ -2161,57 +2239,29 @@ public class PhoneWindowManager implements WindowManagerPolicy { final Rect r = mStatusBar.getFrameLw(); // Compute the stable dimensions whether or not the status bar is hidden. - if (mStatusBarCanHide) { - if (mDockTop == r.top) mStableTop = r.bottom; - else if (mDockBottom == r.bottom) mStableBottom = r.top; - } else { - if (mStableTop == r.top) { - mStableTop = r.bottom; - } else if (mStableBottom == r.bottom) { - mStableBottom = r.top; - } - } + if (mDockTop == r.top) mStableTop = r.bottom; + else if (mDockBottom == r.bottom) mStableBottom = r.top; + // If the status bar is hidden, we don't want to cause + // windows behind it to scroll. if (mStatusBar.isVisibleLw()) { - // If the status bar is hidden, we don't want to cause - // windows behind it to scroll. - if (mStatusBarCanHide) { - // Status bar may go away, so the screen area it occupies - // is available to apps but just covering them when the - // status bar is visible. - if (mDockTop == r.top) mDockTop = r.bottom; - else if (mDockBottom == r.bottom) mDockBottom = r.top; - - mContentTop = mCurTop = mDockTop; - mContentBottom = mCurBottom = mDockBottom; - mContentLeft = mCurLeft = mDockLeft; - mContentRight = mCurRight = mDockRight; - - if (DEBUG_LAYOUT) Log.v(TAG, "Status bar: " + - String.format( - "dock=[%d,%d][%d,%d] content=[%d,%d][%d,%d] cur=[%d,%d][%d,%d]", - mDockLeft, mDockTop, mDockRight, mDockBottom, - mContentLeft, mContentTop, mContentRight, mContentBottom, - mCurLeft, mCurTop, mCurRight, mCurBottom)); - } else { - // Status bar can't go away; the part of the screen it - // covers does not exist for anything behind it. - if (mRestrictedScreenTop == r.top) { - mRestrictedScreenTop = r.bottom; - mRestrictedScreenHeight -= (r.bottom-r.top); - } else if ((mRestrictedScreenHeight-mRestrictedScreenTop) == r.bottom) { - mRestrictedScreenHeight -= (r.bottom-r.top); - } + // Status bar may go away, so the screen area it occupies + // is available to apps but just covering them when the + // status bar is visible. + if (mDockTop == r.top) mDockTop = r.bottom; + else if (mDockBottom == r.bottom) mDockBottom = r.top; + + mContentTop = mCurTop = mDockTop; + mContentBottom = mCurBottom = mDockBottom; + mContentLeft = mCurLeft = mDockLeft; + mContentRight = mCurRight = mDockRight; - mContentTop = mCurTop = mDockTop = mRestrictedScreenTop; - mContentBottom = mCurBottom = mDockBottom - = mRestrictedScreenTop + mRestrictedScreenHeight; - if (DEBUG_LAYOUT) Log.v(TAG, "Status bar: restricted screen area: (" - + mRestrictedScreenLeft + "," - + mRestrictedScreenTop + "," - + (mRestrictedScreenLeft + mRestrictedScreenWidth) + "," - + (mRestrictedScreenTop + mRestrictedScreenHeight) + ")"); - } + if (DEBUG_LAYOUT) Log.v(TAG, "Status bar: " + + String.format( + "dock=[%d,%d][%d,%d] content=[%d,%d][%d,%d] cur=[%d,%d][%d,%d]", + mDockLeft, mDockTop, mDockRight, mDockBottom, + mContentLeft, mContentTop, mContentRight, mContentBottom, + mCurLeft, mCurTop, mCurRight, mCurBottom)); } } } @@ -2333,7 +2383,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { "Laying out status bar window: (%d,%d - %d,%d)", pf.left, pf.top, pf.right, pf.bottom)); } - } else if ((sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0 + } else if (mCanHideNavigationBar + && (sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0 && attrs.type >= WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW && attrs.type <= WindowManager.LayoutParams.LAST_SUB_WINDOW) { // Asking for layout as if the nav bar is hidden, lets the @@ -2426,7 +2477,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { pf.right = df.right = cf.right = mUnrestrictedScreenLeft+mUnrestrictedScreenWidth; pf.bottom = df.bottom = cf.bottom = mUnrestrictedScreenTop+mUnrestrictedScreenHeight; - } else if ((sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0 + } else if (mCanHideNavigationBar + && (sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0 && attrs.type >= WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW && attrs.type <= WindowManager.LayoutParams.LAST_SUB_WINDOW) { // Asking for layout as if the nav bar is hidden, lets the @@ -2623,19 +2675,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { // has the FLAG_FULLSCREEN set. Not sure if there is another way that to be the // case though. if (topIsFullscreen) { - if (mStatusBarCanHide) { - if (DEBUG_LAYOUT) Log.v(TAG, "** HIDING status bar"); - if (mStatusBar.hideLw(true)) { - changes |= FINISH_LAYOUT_REDO_LAYOUT; - - mHandler.post(new Runnable() { public void run() { - if (mStatusBarService != null) { - try { - mStatusBarService.collapse(); - } catch (RemoteException ex) {} - } - }}); - } + if (DEBUG_LAYOUT) Log.v(TAG, "** HIDING status bar"); + if (mStatusBar.hideLw(true)) { + changes |= FINISH_LAYOUT_REDO_LAYOUT; + + mHandler.post(new Runnable() { public void run() { + if (mStatusBarService != null) { + try { + mStatusBarService.collapse(); + } catch (RemoteException ex) {} + } + }}); } else if (DEBUG_LAYOUT) { Log.v(TAG, "Preventing status bar from hiding by policy"); } @@ -2699,30 +2749,24 @@ public class PhoneWindowManager implements WindowManagerPolicy { // behind it. return false; } - if (false) { - // Don't do this on the tablet, since the system bar never completely - // covers the screen, and with all its transparency this will - // incorrectly think it does cover it when it doesn't. We'll revisit - // this later when we re-do the phone status bar. - if (mStatusBar != null && mStatusBar.isVisibleLw()) { - RectF rect = new RectF(mStatusBar.getShownFrameLw()); - for (int i=mStatusBarPanels.size()-1; i>=0; i--) { - WindowState w = mStatusBarPanels.get(i); - if (w.isVisibleLw()) { - rect.union(w.getShownFrameLw()); - } - } - final int insetw = mRestrictedScreenWidth/10; - final int inseth = mRestrictedScreenHeight/10; - if (rect.contains(insetw, inseth, mRestrictedScreenWidth-insetw, - mRestrictedScreenHeight-inseth)) { - // All of the status bar windows put together cover the - // screen, so the app can't be seen. (Note this test doesn't - // work if the rects of these windows are at off offsets or - // sizes, causing gaps in the rect union we have computed.) - return false; + if (mStatusBar != null && mStatusBar.isVisibleLw()) { + RectF rect = new RectF(mStatusBar.getShownFrameLw()); + for (int i=mStatusBarPanels.size()-1; i>=0; i--) { + WindowState w = mStatusBarPanels.get(i); + if (w.isVisibleLw()) { + rect.union(w.getShownFrameLw()); } } + final int insetw = mRestrictedScreenWidth/10; + final int inseth = mRestrictedScreenHeight/10; + if (rect.contains(insetw, inseth, mRestrictedScreenWidth-insetw, + mRestrictedScreenHeight-inseth)) { + // All of the status bar windows put together cover the + // screen, so the app can't be seen. (Note this test doesn't + // work if the rects of these windows are at odd offsets or + // sizes, causing gaps in the rect union we have computed.) + return false; + } } return true; } @@ -2776,7 +2820,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { void setHdmiPlugged(boolean plugged) { if (mHdmiPlugged != plugged) { mHdmiPlugged = plugged; - updateRotation(true); + if (plugged && mDisplay != null) { + mExternalDisplayWidth = mDisplay.getRawExternalWidth(); + mExternalDisplayHeight = mDisplay.getRawExternalHeight(); + } + updateRotation(true, true); Intent intent = new Intent(ACTION_HDMI_PLUGGED); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); intent.putExtra(EXTRA_HDMI_PLUGGED_STATE, plugged); @@ -3871,7 +3919,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { void updateRotation(boolean alwaysSendConfiguration) { try { //set orientation on WindowManager - mWindowManager.updateRotation(alwaysSendConfiguration); + mWindowManager.updateRotation(alwaysSendConfiguration, false); + } catch (RemoteException e) { + // Ignore + } + } + + void updateRotation(boolean alwaysSendConfiguration, boolean forceRelayout) { + try { + //set orientation on WindowManager + mWindowManager.updateRotation(alwaysSendConfiguration, forceRelayout); } catch (RemoteException e) { // Ignore } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index e091edf..00f80ba 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -47,6 +47,7 @@ import android.view.WindowManager; import com.android.internal.app.ShutdownThread; import com.android.internal.os.BinderInternal; import com.android.internal.os.SamplingProfilerIntegration; +import com.android.internal.widget.LockSettingsService; import com.android.server.accessibility.AccessibilityManagerService; import com.android.server.am.ActivityManagerService; import com.android.server.net.NetworkPolicyManagerService; @@ -266,6 +267,7 @@ class ServerThread extends Thread { LocationManagerService location = null; CountryDetectorService countryDetector = null; TextServicesManagerService tsms = null; + LockSettingsService lockSettings = null; // Bring up services needed for UI. if (factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) { @@ -308,6 +310,14 @@ class ServerThread extends Thread { if (factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL) { try { + Slog.i(TAG, "LockSettingsService"); + lockSettings = new LockSettingsService(context); + ServiceManager.addService("lock_settings", lockSettings); + } catch (Throwable e) { + reportWtf("starting LockSettingsService service", e); + } + + try { Slog.i(TAG, "Device Policy"); devicePolicy = new DevicePolicyManagerService(context); ServiceManager.addService(Context.DEVICE_POLICY_SERVICE, devicePolicy); @@ -661,6 +671,11 @@ class ServerThread extends Thread { } catch (Throwable e) { reportWtf("making Package Manager Service ready", e); } + try { + lockSettings.systemReady(); + } catch (Throwable e) { + reportWtf("making Lock Settings Service ready", e); + } // These are needed to propagate to the runnable below. final Context contextF = context; diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index a6fbdd7..33250b8 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -62,10 +62,10 @@ import android.content.ContentProvider; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; -import android.content.Intent; -import android.content.IntentFilter; import android.content.IIntentReceiver; import android.content.IIntentSender; +import android.content.Intent; +import android.content.IntentFilter; import android.content.IntentSender; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; @@ -75,12 +75,12 @@ import android.content.pm.IPackageManager; import android.content.pm.InstrumentationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PathPermission; import android.content.pm.ProviderInfo; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.graphics.Bitmap; @@ -113,10 +113,10 @@ import android.os.UserId; import android.provider.Settings; import android.text.format.Time; import android.util.EventLog; -import android.util.Pair; -import android.util.Slog; import android.util.Log; +import android.util.Pair; import android.util.PrintWriterPrinter; +import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; import android.util.TimeUtils; @@ -140,7 +140,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; import java.io.StringWriter; -import java.lang.IllegalStateException; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collection; @@ -13281,6 +13280,102 @@ public final class ActivityManagerService extends ActivityManagerNative } } + @Override + public boolean targetTaskAffinityMatchesActivity(IBinder token, String destAffinity) { + ActivityRecord srec = ActivityRecord.forToken(token); + return srec.task.affinity != null && srec.task.affinity.equals(destAffinity); + } + + public boolean navigateUpTo(IBinder token, Intent destIntent, int resultCode, + Intent resultData) { + ComponentName dest = destIntent.getComponent(); + + synchronized (this) { + ActivityRecord srec = ActivityRecord.forToken(token); + ArrayList<ActivityRecord> history = srec.stack.mHistory; + final int start = history.indexOf(srec); + if (start < 0) { + // Current activity is not in history stack; do nothing. + return false; + } + int finishTo = start - 1; + ActivityRecord parent = null; + boolean foundParentInTask = false; + if (dest != null) { + TaskRecord tr = srec.task; + for (int i = start - 1; i >= 0; i--) { + ActivityRecord r = history.get(i); + if (tr != r.task) { + // Couldn't find parent in the same task; stop at the one above this. + // (Root of current task; in-app "home" behavior) + // Always at least finish the current activity. + finishTo = Math.min(start - 1, i + 1); + parent = history.get(finishTo); + break; + } else if (r.info.packageName.equals(dest.getPackageName()) && + r.info.name.equals(dest.getClassName())) { + finishTo = i; + parent = r; + foundParentInTask = true; + break; + } + } + } + + if (mController != null) { + ActivityRecord next = mMainStack.topRunningActivityLocked(token, 0); + if (next != null) { + // ask watcher if this is allowed + boolean resumeOK = true; + try { + resumeOK = mController.activityResuming(next.packageName); + } catch (RemoteException e) { + mController = null; + } + + if (!resumeOK) { + return false; + } + } + } + final long origId = Binder.clearCallingIdentity(); + for (int i = start; i > finishTo; i--) { + ActivityRecord r = history.get(i); + mMainStack.requestFinishActivityLocked(r.appToken, resultCode, resultData, + "navigate-up"); + // Only return the supplied result for the first activity finished + resultCode = Activity.RESULT_CANCELED; + resultData = null; + } + + if (parent != null && foundParentInTask) { + final int parentLaunchMode = parent.info.launchMode; + final int destIntentFlags = destIntent.getFlags(); + if (parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE || + parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK || + parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP || + (destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { + parent.deliverNewIntentLocked(srec.app.uid, destIntent); + } else { + try { + ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo( + destIntent.getComponent(), 0, UserId.getCallingUserId()); + int res = mMainStack.startActivityLocked(srec.app.thread, destIntent, + null, aInfo, parent.appToken, null, + 0, -1, parent.launchedFromUid, 0, null, true, null); + foundParentInTask = res == ActivityManager.START_SUCCESS; + } catch (RemoteException e) { + foundParentInTask = false; + } + mMainStack.requestFinishActivityLocked(parent.appToken, resultCode, + resultData, "navigate-up"); + } + } + Binder.restoreCallingIdentity(origId); + return foundParentInTask; + } + } + // ========================================================= // LIFETIME MANAGEMENT // ========================================================= diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 77f94d9..9b196cc 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -139,7 +139,7 @@ public class WindowAnimator { final int NEAT = mService.mExitingAppTokens.size(); for (i=0; i<NEAT; i++) { - final AppWindowAnimator appAnimator = mService.mAppTokens.get(i).mAppAnimator; + final AppWindowAnimator appAnimator = mService.mExitingAppTokens.get(i).mAppAnimator; final boolean wasAnimating = appAnimator.animation != null && appAnimator.animation != WindowManagerService.sDummyAnimation; if (appAnimator.stepAnimationLocked(mCurrentTime, mInnerDw, mInnerDh)) { diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 7eca401..654cfdf 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -5109,7 +5109,7 @@ public class WindowManagerService extends IWindowManager.Stub mPolicy.enableScreenAfterBoot(); // Make sure the last requested orientation has been applied. - updateRotationUnchecked(false); + updateRotationUnchecked(false, false); } public void showBootMessage(final CharSequence msg, final boolean always) { @@ -5383,7 +5383,7 @@ public class WindowManagerService extends IWindowManager.Stub mPolicy.setUserRotationMode(WindowManagerPolicy.USER_ROTATION_LOCKED, rotation == -1 ? mRotation : rotation); - updateRotationUnchecked(false); + updateRotationUnchecked(false, false); } /** @@ -5399,7 +5399,7 @@ public class WindowManagerService extends IWindowManager.Stub if (DEBUG_ORIENTATION) Slog.v(TAG, "thawRotation: mRotation=" + mRotation); mPolicy.setUserRotationMode(WindowManagerPolicy.USER_ROTATION_FREE, 777); // rot not used - updateRotationUnchecked(false); + updateRotationUnchecked(false, false); } /** @@ -5409,8 +5409,8 @@ public class WindowManagerService extends IWindowManager.Stub * such that the current rotation might need to be updated, such as when the * device is docked or rotated into a new posture. */ - public void updateRotation(boolean alwaysSendConfiguration) { - updateRotationUnchecked(alwaysSendConfiguration); + public void updateRotation(boolean alwaysSendConfiguration, boolean forceRelayout) { + updateRotationUnchecked(alwaysSendConfiguration, forceRelayout); } /** @@ -5440,8 +5440,7 @@ public class WindowManagerService extends IWindowManager.Stub } } - public void updateRotationUnchecked( - boolean alwaysSendConfiguration) { + public void updateRotationUnchecked(boolean alwaysSendConfiguration, boolean forceRelayout) { if(DEBUG_ORIENTATION) Slog.v(TAG, "updateRotationUnchecked(" + "alwaysSendConfiguration=" + alwaysSendConfiguration + ")"); @@ -5449,6 +5448,10 @@ public class WindowManagerService extends IWindowManager.Stub boolean changed; synchronized(mWindowMap) { changed = updateRotationUncheckedLocked(false); + if (!changed || forceRelayout) { + mLayoutNeeded = true; + performLayoutAndPlaceSurfacesLocked(); + } } if (changed || alwaysSendConfiguration) { @@ -6641,7 +6644,7 @@ public class WindowManagerService extends IWindowManager.Stub mInputManager.setDisplaySize(Display.DEFAULT_DISPLAY, mDisplay.getRawWidth(), mDisplay.getRawHeight(), mDisplay.getRawExternalWidth(), mDisplay.getRawExternalHeight()); - mPolicy.setInitialDisplaySize(mInitialDisplayWidth, mInitialDisplayHeight); + mPolicy.setInitialDisplaySize(mDisplay, mInitialDisplayWidth, mInitialDisplayHeight); } try { @@ -7361,7 +7364,7 @@ public class WindowManagerService extends IWindowManager.Stub mBaseDisplayWidth = width; mBaseDisplayHeight = height; } - mPolicy.setInitialDisplaySize(mBaseDisplayWidth, mBaseDisplayHeight); + mPolicy.setInitialDisplaySize(mDisplay, mBaseDisplayWidth, mBaseDisplayHeight); mLayoutNeeded = true; @@ -7393,8 +7396,8 @@ public class WindowManagerService extends IWindowManager.Stub } } - public boolean canStatusBarHide() { - return mPolicy.canStatusBarHide(); + public boolean hasSystemNavBar() { + return mPolicy.hasSystemNavBar(); } // ------------------------------------------------------------- diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 05797a4..a4708d3 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -870,6 +870,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { return true; } + @Override public boolean hideLw(boolean doAnimation) { return hideLw(doAnimation, true); } @@ -912,6 +913,11 @@ final class WindowState implements WindowManagerPolicy.WindowState { return true; } + @Override + public boolean isAlive() { + return mClient.asBinder().isBinderAlive(); + } + private static void applyInsets(Region outRegion, Rect frame, Rect inset) { outRegion.set( frame.left + inset.left, frame.top + inset.top, diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java index c3ac22c..58f65be 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -412,7 +412,7 @@ public class WindowManagerPermissionTests extends TestCase { @SmallTest public void testSET_ORIENTATION() { try { - mWm.updateRotation(true); + mWm.updateRotation(true, false); mWm.getSwitchState(0); fail("IWindowManager.updateRotation did not throw SecurityException as" + " expected"); diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java index 8b1d41a..0755670 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java @@ -88,7 +88,7 @@ public class BridgeWindowManager implements IWindowManager { // ---- unused implementation of IWindowManager ---- @Override - public boolean canStatusBarHide() throws RemoteException { + public boolean hasSystemNavBar() throws RemoteException { // TODO Auto-generated method stub return false; } @@ -468,9 +468,8 @@ public class BridgeWindowManager implements IWindowManager { } @Override - public void updateRotation(boolean arg0) throws RemoteException { + public void updateRotation(boolean arg0, boolean arg1) throws RemoteException { // TODO Auto-generated method stub - } @Override |