diff options
320 files changed, 4091 insertions, 4392 deletions
diff --git a/api/current.xml b/api/current.xml index 03c72f54f5f1..64a7d7a29632 100644 --- a/api/current.xml +++ b/api/current.xml @@ -3162,7 +3162,7 @@ value="16843395" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -3239,7 +3239,7 @@ value="16843362" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -5109,7 +5109,7 @@ value="16842997" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -5230,7 +5230,7 @@ value="16842996" static="true" final="true" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </field> @@ -23917,6 +23917,17 @@ visibility="public" > </field> +<field name="INTENT_ACTION_SELECT_SEARCH_SOURCE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.SELECT_SEARCH_SOURCE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="INTENT_ACTION_WEB_SEARCH_SETTINGS" type="java.lang.String" transient="false" @@ -108238,6 +108249,17 @@ visibility="public" > </field> +<field name="UNKNOWN" + type="java.lang.String" + transient="false" + volatile="false" + value=""unknown"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="USER" type="java.lang.String" transient="false" @@ -174003,6 +174025,17 @@ value="-1" static="true" final="true" + deprecated="deprecated" + visibility="public" +> +</field> +<field name="MATCH_PARENT" + type="int" + transient="false" + volatile="false" + value="-1" + static="true" + final="true" deprecated="not deprecated" visibility="public" > @@ -187991,6 +188024,17 @@ <parameter name="response" type="android.os.Message"> </parameter> </method> +<method name="emulateShiftHeld" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="enablePlatformNotifications" return="void" abstract="false" diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 9980c9d9333f..fae1f2604131 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -16,7 +16,6 @@ ** limitations under the License. */ -//#define LOG_NDEBUG 0 #define LOG_TAG "CameraService" #include <utils/Log.h> @@ -95,7 +94,7 @@ CameraService::~CameraService() sp<ICamera> CameraService::connect(const sp<ICameraClient>& cameraClient) { int callingPid = getCallingPid(); - LOGD("CameraService::connect E (pid %d, client %p)", callingPid, + LOGV("CameraService::connect E (pid %d, client %p)", callingPid, cameraClient->asBinder().get()); Mutex::Autolock lock(mServiceLock); @@ -106,30 +105,30 @@ sp<ICamera> CameraService::connect(const sp<ICameraClient>& cameraClient) sp<ICameraClient> currentCameraClient(currentClient->getCameraClient()); if (cameraClient->asBinder() == currentCameraClient->asBinder()) { // This is the same client reconnecting... - LOGD("CameraService::connect X (pid %d, same client %p) is reconnecting...", + LOGV("CameraService::connect X (pid %d, same client %p) is reconnecting...", callingPid, cameraClient->asBinder().get()); return currentClient; } else { // It's another client... reject it - LOGD("CameraService::connect X (pid %d, new client %p) rejected. " + LOGV("CameraService::connect X (pid %d, new client %p) rejected. " "(old pid %d, old client %p)", callingPid, cameraClient->asBinder().get(), currentClient->mClientPid, currentCameraClient->asBinder().get()); if (kill(currentClient->mClientPid, 0) == -1 && errno == ESRCH) { - LOGD("The old client is dead!"); + LOGV("The old client is dead!"); } return client; } } else { // can't promote, the previous client has died... - LOGD("New client (pid %d) connecting, old reference was dangling...", + LOGV("New client (pid %d) connecting, old reference was dangling...", callingPid); mClient.clear(); } } if (mUsers > 0) { - LOGD("Still have client, rejected"); + LOGV("Still have client, rejected"); return client; } @@ -141,7 +140,7 @@ sp<ICamera> CameraService::connect(const sp<ICameraClient>& cameraClient) // the refcount. client->trackMe(true, true); #endif - LOGD("CameraService::connect X"); + LOGV("CameraService::connect X"); return client; } @@ -157,7 +156,7 @@ void CameraService::removeClient(const sp<ICameraClient>& cameraClient) if (mClient == 0) { // This happens when we have already disconnected. - LOGD("removeClient (pid %d): already disconnected", callingPid); + LOGV("removeClient (pid %d): already disconnected", callingPid); return; } @@ -165,7 +164,7 @@ void CameraService::removeClient(const sp<ICameraClient>& cameraClient) // Client::~Client() -> disconnect() -> removeClient(). client = mClient.promote(); if (client == 0) { - LOGD("removeClient (pid %d): no more strong reference", callingPid); + LOGV("removeClient (pid %d): no more strong reference", callingPid); mClient.clear(); return; } @@ -178,7 +177,7 @@ void CameraService::removeClient(const sp<ICameraClient>& cameraClient) mClient.clear(); } - LOGD("removeClient (pid %d) done", callingPid); + LOGV("removeClient (pid %d) done", callingPid); } // The reason we need this count is a new CameraService::connect() request may @@ -212,7 +211,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, const sp<ICameraClient>& cameraClient, pid_t clientPid) { int callingPid = getCallingPid(); - LOGD("Client::Client E (pid %d)", callingPid); + LOGV("Client::Client E (pid %d)", callingPid); mCameraService = cameraService; mCameraClient = cameraClient; mClientPid = clientPid; @@ -237,7 +236,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, // Callback is disabled by default mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP; cameraService->incUsers(); - LOGD("Client::Client X (pid %d)", callingPid); + LOGV("Client::Client X (pid %d)", callingPid); } status_t CameraService::Client::checkPid() @@ -253,7 +252,7 @@ status_t CameraService::Client::checkPid() status_t CameraService::Client::lock() { int callingPid = getCallingPid(); - LOGD("lock from pid %d (mClientPid %d)", callingPid, mClientPid); + LOGV("lock from pid %d (mClientPid %d)", callingPid, mClientPid); Mutex::Autolock _l(mLock); // lock camera to this client if the the camera is unlocked if (mClientPid == 0) { @@ -267,13 +266,13 @@ status_t CameraService::Client::lock() status_t CameraService::Client::unlock() { int callingPid = getCallingPid(); - LOGD("unlock from pid %d (mClientPid %d)", callingPid, mClientPid); + LOGV("unlock from pid %d (mClientPid %d)", callingPid, mClientPid); Mutex::Autolock _l(mLock); // allow anyone to use camera status_t result = checkPid(); if (result == NO_ERROR) { mClientPid = 0; - LOGD("clear mCameraClient (pid %d)", callingPid); + LOGV("clear mCameraClient (pid %d)", callingPid); // we need to remove the reference so that when app goes // away, the reference count goes to 0. mCameraClient.clear(); @@ -286,7 +285,7 @@ status_t CameraService::Client::connect(const sp<ICameraClient>& client) int callingPid = getCallingPid(); // connect a new process to the camera - LOGD("Client::connect E (pid %d, client %p)", callingPid, client->asBinder().get()); + LOGV("Client::connect E (pid %d, client %p)", callingPid, client->asBinder().get()); // I hate this hack, but things get really ugly when the media recorder // service is handing back the camera to the app. The ICameraClient @@ -310,14 +309,14 @@ status_t CameraService::Client::connect(const sp<ICameraClient>& client) // did the client actually change? if ((mCameraClient != NULL) && (client->asBinder() == mCameraClient->asBinder())) { - LOGD("Connect to the same client"); + LOGV("Connect to the same client"); return NO_ERROR; } mCameraClient = client; mClientPid = -1; mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP; - LOGD("Connect to the new client (pid %d, client %p)", + LOGV("Connect to the new client (pid %d, client %p)", callingPid, mCameraClient->asBinder().get()); } @@ -344,7 +343,7 @@ CameraService::Client::~Client() int callingPid = getCallingPid(); // tear down client - LOGD("Client::~Client E (pid %d, client %p)", + LOGV("Client::~Client E (pid %d, client %p)", callingPid, getCameraClient()->asBinder().get()); if (mSurface != 0 && !mUseOverlay) { #if HAVE_ANDROID_OS @@ -373,23 +372,23 @@ CameraService::Client::~Client() // make sure we tear down the hardware mClientPid = callingPid; disconnect(); - LOGD("Client::~Client X (pid %d)", mClientPid); + LOGV("Client::~Client X (pid %d)", mClientPid); } void CameraService::Client::disconnect() { int callingPid = getCallingPid(); - LOGD("Client::disconnect() E (pid %d client %p)", + LOGV("Client::disconnect() E (pid %d client %p)", callingPid, getCameraClient()->asBinder().get()); Mutex::Autolock lock(mLock); if (mClientPid <= 0) { - LOGD("camera is unlocked (mClientPid = %d), don't tear down hardware", mClientPid); + LOGV("camera is unlocked (mClientPid = %d), don't tear down hardware", mClientPid); return; } if (checkPid() != NO_ERROR) { - LOGD("Different client - don't disconnect"); + LOGV("Different client - don't disconnect"); return; } @@ -397,7 +396,7 @@ void CameraService::Client::disconnect() // from the user directly, or called by the destructor. if (mHardware == 0) return; - LOGD("hardware teardown"); + LOGV("hardware teardown"); // Before destroying mHardware, we must make sure it's in the // idle state. mHardware->stopPreview(); @@ -421,7 +420,7 @@ void CameraService::Client::disconnect() mCameraService->removeClient(mCameraClient); mCameraService->decUsers(); - LOGD("Client::disconnect() X (pid %d)", callingPid); + LOGV("Client::disconnect() X (pid %d)", callingPid); } // pass the buffered ISurface to the camera service @@ -805,14 +804,14 @@ static void dump_to_file(const char *fname, int nw, cnt = 0; uint32_t written = 0; - LOGD("opening file [%s]\n", fname); + LOGV("opening file [%s]\n", fname); int fd = open(fname, O_RDWR | O_CREAT); if (fd < 0) { LOGE("failed to create file [%s]: %s", fname, strerror(errno)); return; } - LOGD("writing %d bytes to file [%s]\n", size, fname); + LOGV("writing %d bytes to file [%s]\n", size, fname); while (written < size) { nw = ::write(fd, buf + written, @@ -825,7 +824,7 @@ static void dump_to_file(const char *fname, written += nw; cnt++; } - LOGD("done writing %d bytes to file [%s] in %d passes\n", + LOGV("done writing %d bytes to file [%s] in %d passes\n", size, fname, cnt); ::close(fd); } @@ -1189,7 +1188,7 @@ void CameraService::Client::dataCallbackTimestamp(nsecs_t timestamp, int32_t msg // set preview/capture parameters - key/value pairs status_t CameraService::Client::setParameters(const String8& params) { - LOGD("setParameters(%s)", params.string()); + LOGV("setParameters(%s)", params.string()); Mutex::Autolock lock(mLock); status_t result = checkPid(); @@ -1215,7 +1214,7 @@ String8 CameraService::Client::getParameters() const } String8 params(mHardware->getParameters().flatten()); - LOGD("getParameters(%s)", params.string()); + LOGV("getParameters(%s)", params.string()); return params; } @@ -1327,7 +1326,7 @@ status_t CameraService::onTransact( status_t err = BnCameraService::onTransact(code, data, reply, flags); #if DEBUG_HEAP_LEAKS - LOGD("+++ onTransact err %d code %d", err, code); + LOGV("+++ onTransact err %d code %d", err, code); if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) { // the 'service' command interrogates this binder for its name, and then supplies it @@ -1335,7 +1334,7 @@ status_t CameraService::onTransact( // ISurfaceComposer (since we delegated the INTERFACE_TRANSACTION handling to // BnSurfaceComposer before falling through to this code). - LOGD("+++ onTransact code %d", code); + LOGV("+++ onTransact code %d", code); CHECK_INTERFACE(ICameraService, data, reply); @@ -1345,13 +1344,13 @@ status_t CameraService::onTransact( if (gWeakHeap != 0) { sp<IMemoryHeap> h = gWeakHeap.promote(); IMemoryHeap *p = gWeakHeap.unsafe_get(); - LOGD("CHECKING WEAK REFERENCE %p (%p)", h.get(), p); + LOGV("CHECKING WEAK REFERENCE %p (%p)", h.get(), p); if (h != 0) h->printRefs(); bool attempt_to_delete = data.readInt32() == 1; if (attempt_to_delete) { // NOT SAFE! - LOGD("DELETING WEAK REFERENCE %p (%p)", h.get(), p); + LOGV("DELETING WEAK REFERENCE %p (%p)", h.get(), p); if (p) delete p; } return NO_ERROR; diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index 236c0fe675d4..a2b5d8df9f2c 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -28,7 +28,7 @@ #include <cutils/sockets.h> #include "private/android_filesystem_config.h" -#define LOG_NDEBUG 0 + #define LOG_TAG "dumpstate" #include <utils/Log.h> diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 49ebce38f778..1c3414d14438 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2087,8 +2087,8 @@ public class Activity extends ContextThemeWrapper event.setPackageName(getPackageName()); LayoutParams params = getWindow().getAttributes(); - boolean isFullScreen = (params.width == LayoutParams.FILL_PARENT) && - (params.height == LayoutParams.FILL_PARENT); + boolean isFullScreen = (params.width == LayoutParams.MATCH_PARENT) && + (params.height == LayoutParams.MATCH_PARENT); event.setFullScreen(isFullScreen); CharSequence title = getTitle(); diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java index 20a579a86196..2603579f21b8 100644 --- a/core/java/android/app/AlertDialog.java +++ b/core/java/android/app/AlertDialog.java @@ -40,7 +40,7 @@ import com.android.internal.app.AlertController; * * <pre> * FrameLayout fl = (FrameLayout) findViewById(R.id.body); - * fl.add(myView, new LayoutParams(FILL_PARENT, WRAP_CONTENT)); + * fl.add(myView, new LayoutParams(MATCH_PARENT, WRAP_CONTENT)); * </pre> * * <p>The AlertDialog class takes care of automatically setting diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index 58e8b3212547..fa5d4a880ffe 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -668,8 +668,8 @@ public class Dialog implements DialogInterface, Window.Callback, event.setPackageName(mContext.getPackageName()); LayoutParams params = getWindow().getAttributes(); - boolean isFullScreen = (params.width == LayoutParams.FILL_PARENT) && - (params.height == LayoutParams.FILL_PARENT); + boolean isFullScreen = (params.width == LayoutParams.MATCH_PARENT) && + (params.height == LayoutParams.MATCH_PARENT); event.setFullScreen(isFullScreen); return false; diff --git a/core/java/android/app/ExpandableListActivity.java b/core/java/android/app/ExpandableListActivity.java index a2e048f53f48..965107831966 100644 --- a/core/java/android/app/ExpandableListActivity.java +++ b/core/java/android/app/ExpandableListActivity.java @@ -65,21 +65,21 @@ import java.util.Map; * <?xml version="1.0" encoding="UTF-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" * android:orientation="vertical" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:paddingLeft="8dp" * android:paddingRight="8dp"> * * <ExpandableListView android:id="@id/android:list" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#00FF00" * android:layout_weight="1" * android:drawSelectorOnTop="false"/> * * <TextView android:id="@id/android:empty" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#FF0000" * android:text="No data"/> * </LinearLayout> @@ -114,19 +114,19 @@ import java.util.Map; * <pre> * <?xml version="1.0" encoding="utf-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content" * android:orientation="vertical"> * * <TextView android:id="@+id/text1" * android:textSize="16sp" * android:textStyle="bold" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * * <TextView android:id="@+id/text2" * android:textSize="16sp" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * </LinearLayout> * </pre> diff --git a/core/java/android/app/ListActivity.java b/core/java/android/app/ListActivity.java index 19b99c874afb..4b4cc050dcbe 100644 --- a/core/java/android/app/ListActivity.java +++ b/core/java/android/app/ListActivity.java @@ -56,21 +56,21 @@ import android.widget.ListView; * <?xml version="1.0" encoding="utf-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" * android:orientation="vertical" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:paddingLeft="8dp" * android:paddingRight="8dp"> * * <ListView android:id="@id/android:list" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#00FF00" * android:layout_weight="1" * android:drawSelectorOnTop="false"/> * * <TextView id="@id/android:empty" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * android:background="#FF0000" * android:text="No data"/> * </LinearLayout> @@ -100,19 +100,19 @@ import android.widget.ListView; * <pre> * <?xml version="1.0" encoding="utf-8"?> * <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content" * android:orientation="vertical"> * * <TextView android:id="@+id/text1" * android:textSize="16sp" * android:textStyle="bold" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * * <TextView android:id="@+id/text2" * android:textSize="16sp" - * android:layout_width="fill_parent" + * android:layout_width="match_parent" * android:layout_height="wrap_content"/> * </LinearLayout> * </pre> diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index b204c79355aa..b3963968b09a 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -60,7 +60,6 @@ import android.widget.AdapterView; import android.widget.AutoCompleteTextView; import android.widget.Button; import android.widget.ImageButton; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; @@ -106,7 +105,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS // views & widgets private TextView mBadgeLabel; - private ImageView mAppIcon; + private SearchSourceSelector mSourceSelector; private SearchAutoComplete mSearchAutoComplete; private Button mGoButton; private ImageButton mVoiceButton; @@ -182,11 +181,11 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS Window theWindow = getWindow(); WindowManager.LayoutParams lp = theWindow.getAttributes(); lp.type = WindowManager.LayoutParams.TYPE_SEARCH_BAR; - lp.width = ViewGroup.LayoutParams.FILL_PARENT; + lp.width = ViewGroup.LayoutParams.MATCH_PARENT; // taking up the whole window (even when transparent) is less than ideal, // but necessary to show the popup window until the window manager supports // having windows anchored by their parent but not clipped by them. - lp.height = ViewGroup.LayoutParams.FILL_PARENT; + lp.height = ViewGroup.LayoutParams.MATCH_PARENT; lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; theWindow.setAttributes(lp); @@ -209,7 +208,8 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS mBadgeLabel = (TextView) findViewById(com.android.internal.R.id.search_badge); mSearchAutoComplete = (SearchAutoComplete) findViewById(com.android.internal.R.id.search_src_text); - mAppIcon = (ImageView) findViewById(com.android.internal.R.id.search_app_icon); + mSourceSelector = new SearchSourceSelector( + findViewById(com.android.internal.R.id.search_source_selector)); mGoButton = (Button) findViewById(com.android.internal.R.id.search_go_btn); mVoiceButton = (ImageButton) findViewById(com.android.internal.R.id.search_voice_btn); mSearchPlate = findViewById(com.android.internal.R.id.search_plate); @@ -606,13 +606,16 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS } private void updateSearchAppIcon() { + mSourceSelector.setSource(mSearchable.getSearchActivity()); + mSourceSelector.setAppSearchData(mAppSearchData); + // In Donut, we special-case the case of the browser to hide the app icon as if it were // global search, for extra space for url entry. // // TODO: Remove this special case once the issue has been reconciled in Eclair. if (mGlobalSearchMode || isBrowserSearch()) { - mAppIcon.setImageResource(0); - mAppIcon.setVisibility(View.GONE); + mSourceSelector.setSourceIcon(null); + mSourceSelector.setVisibility(View.GONE); mSearchPlate.setPadding(SEARCH_PLATE_LEFT_PADDING_GLOBAL, mSearchPlate.getPaddingTop(), mSearchPlate.getPaddingRight(), @@ -628,8 +631,8 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS icon = pm.getDefaultActivityIcon(); Log.w(LOG_TAG, mLaunchComponent + " not found, using generic app icon"); } - mAppIcon.setImageDrawable(icon); - mAppIcon.setVisibility(View.VISIBLE); + mSourceSelector.setSourceIcon(icon); + mSourceSelector.setVisibility(View.VISIBLE); mSearchPlate.setPadding(SEARCH_PLATE_LEFT_PADDING_NON_GLOBAL, mSearchPlate.getPaddingTop(), mSearchPlate.getPaddingRight(), @@ -812,6 +815,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS if (!mSearchAutoComplete.isPerformingCompletion()) { // The user changed the query, remember it. mUserQuery = s == null ? "" : s.toString(); + mSourceSelector.setQuery(mUserQuery); } } @@ -1927,6 +1931,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS query = ""; } mUserQuery = query; + mSourceSelector.setQuery(query); mSearchAutoComplete.setText(query); mSearchAutoComplete.setSelection(query.length()); } diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 5d9034b516a8..5961ef55924e 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -1346,6 +1346,7 @@ public class SearchManager * @hide Pending API council approval */ public final static String SELECT_INITIAL_QUERY = "select_initial_query"; + /** * Defines the constants used in the communication between {@link android.app.SearchDialog} and * the global search provider via {@link Cursor#respond(android.os.Bundle)}. @@ -1612,6 +1613,15 @@ public class SearchManager public final static String SUGGEST_PARAMETER_LIMIT = "limit"; /** + * Intent action for opening the search source selection activity. + * The intent may include these extra values: + * {@link #QUERY}, + * {@link #APP_DATA}. + */ + public static final String INTENT_ACTION_SELECT_SEARCH_SOURCE + = "android.intent.action.SELECT_SEARCH_SOURCE"; + + /** * If a suggestion has this value in {@link #SUGGEST_COLUMN_INTENT_ACTION}, * the search dialog will switch to a different suggestion source when the * suggestion is clicked. diff --git a/core/java/android/app/SearchSourceSelector.java b/core/java/android/app/SearchSourceSelector.java new file mode 100644 index 000000000000..fabf858a52a3 --- /dev/null +++ b/core/java/android/app/SearchSourceSelector.java @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2009 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 com.android.internal.R; + +import android.content.ActivityNotFoundException; +import android.content.ComponentName; +import android.content.ContentResolver; +import android.content.Intent; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.net.Uri; +import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; +import android.view.View; +import android.widget.ImageButton; + +import java.util.List; + +/** + * Utilities for setting up the search source selector. + * + * This class has two copies: + * android.app.SearchSourceSelector + * com.android.quicksearchbox.ui.SearchSourceSelector + * + * They should keep the same look and feel as much as possible, + * but only the intent details must absolutely stay in sync. + * + * @hide + */ +public class SearchSourceSelector implements View.OnClickListener { + + private static final String TAG = "SearchSourceSelector"; + + // TODO: This should be defined in android.provider.Applications, + // and have a less made-up value. + private static final String APPLICATION_TYPE = "application/vnd.android.application"; + + public static final int ICON_VIEW_ID = R.id.search_source_selector_icon; + + private final View mView; + + private final ImageButton mIconView; + + private ComponentName mSource; + + private Bundle mAppSearchData; + + private String mQuery; + + public SearchSourceSelector(View view) { + mView = view; + mIconView = (ImageButton) view.findViewById(ICON_VIEW_ID); + mIconView.setOnClickListener(this); + } + + /** + * Sets the icon displayed in the search source selector. + */ + public void setSourceIcon(Drawable icon) { + mIconView.setImageDrawable(icon); + } + + /** + * Sets the current search source. + */ + public void setSource(ComponentName source) { + mSource = source; + } + + /** + * Sets the app-specific data that will be passed to the search activity if + * the user opens the source selector and chooses a source. + */ + public void setAppSearchData(Bundle appSearchData) { + mAppSearchData = appSearchData; + } + + /** + * Sets the initial query that will be passed to the search activity if + * the user opens the source selector and chooses a source. + */ + public void setQuery(String query) { + mQuery = query; + } + + public void setVisibility(int visibility) { + mView.setVisibility(visibility); + } + + /** + * Creates an intent for opening the search source selector activity. + * + * @param source The current search source. + * @param query The initial query that will be passed to the search activity if + * the user opens the source selector and chooses a source. + * @param appSearchData The app-specific data that will be passed to the search + * activity if the user opens the source selector and chooses a source. + */ + public static Intent createIntent(ComponentName source, String query, Bundle appSearchData) { + Intent intent = new Intent(SearchManager.INTENT_ACTION_SELECT_SEARCH_SOURCE); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_CLEAR_TOP + | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); + Uri sourceUri = componentNameToUri(source); + if (sourceUri != null) { + intent.setDataAndType(sourceUri, APPLICATION_TYPE); + } + if (query != null) { + intent.putExtra(SearchManager.QUERY, query); + } + if (query != null) { + intent.putExtra(SearchManager.APP_DATA, appSearchData); + } + return intent; + } + + /** + * Gets the search source from which the given + * {@link SearchManager.INTENT_ACTION_SELECT_SEARCH_SOURCE} intent was sent. + */ + public static ComponentName getSource(Intent intent) { + return uriToComponentName(intent.getData()); + } + + private static Uri componentNameToUri(ComponentName name) { + if (name == null) return null; + // TODO: This URI format is specificed in android.provider.Applications which is @hidden + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) + .authority("applications") + .appendEncodedPath("applications") + .appendPath(name.getPackageName()) + .appendPath(name.getClassName()) + .build(); + } + + private static ComponentName uriToComponentName(Uri uri) { + if (uri == null) return null; + List<String> path = uri.getPathSegments(); + if (path == null || path.size() != 3) return null; + String pkg = path.get(1); + String cls = path.get(2); + if (TextUtils.isEmpty(pkg) || TextUtils.isEmpty(cls)) return null; + return new ComponentName(pkg, cls); + } + + public void onClick(View v) { + trigger(); + } + + private void trigger() { + try { + Intent intent = createIntent(mSource, mQuery, mAppSearchData); + intent.setSourceBounds(getOnScreenRect(mIconView)); + mIconView.getContext().startActivity(intent); + } catch (ActivityNotFoundException ex) { + Log.e(TAG, "No source selector activity found", ex); + } + } + + // TODO: This code is replicated in lots of places: + // - android.provider.ContactsContract.QuickContact.showQuickContact() + // - android.widget.RemoteViews.setOnClickPendingIntent() + // - com.android.launcher2.Launcher.onClick() + // - com.android.launcher.Launcher.onClick() + // - com.android.server.status.StatusBarService.Launcher.onClick() + private static Rect getOnScreenRect(View v) { + final float appScale = v.getResources().getCompatibilityInfo().applicationScale; + final int[] pos = new int[2]; + v.getLocationOnScreen(pos); + final Rect rect = new Rect(); + rect.left = (int) (pos[0] * appScale + 0.5f); + rect.top = (int) (pos[1] * appScale + 0.5f); + rect.right = (int) ((pos[0] + v.getWidth()) * appScale + 0.5f); + rect.bottom = (int) ((pos[1] + v.getHeight()) * appScale + 0.5f); + return rect; + } + +} diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index 2f719f3c5bd7..792b2897df67 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -311,8 +311,8 @@ public class AppWidgetHostView extends FrameLayout { // Take requested dimensions from child, but apply default gravity. FrameLayout.LayoutParams requested = (FrameLayout.LayoutParams)view.getLayoutParams(); if (requested == null) { - requested = new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT, - LayoutParams.FILL_PARENT); + requested = new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, + LayoutParams.MATCH_PARENT); } requested.gravity = Gravity.CENTER; diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 6e7e6d7f3457..eb2d7b143dc7 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -88,11 +88,11 @@ public abstract class ContentResolver { * <code>content://com.company.provider.imap/inbox/1</code> for a particular * message in the inbox, whose MIME type would be reported as * <code>CURSOR_ITEM_BASE_TYPE + "/vnd.company.imap-msg"</code> - * + * * <p>Compare with {@link #CURSOR_DIR_BASE_TYPE}. */ public static final String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item"; - + /** * This is the Android platform's base MIME type for a content: URI * containing a Cursor of zero or more items. Applications should use this @@ -102,7 +102,7 @@ public abstract class ContentResolver { * <code>content://com.company.provider.imap/inbox</code> for all of the * messages in its inbox, whose MIME type would be reported as * <code>CURSOR_DIR_BASE_TYPE + "/vnd.company.imap-msg"</code> - * + * * <p>Note how the base MIME type varies between this and * {@link #CURSOR_ITEM_BASE_TYPE} depending on whether there is * one single item or multiple items in the data set, while the sub-type @@ -173,13 +173,25 @@ public abstract class ContentResolver { } /** + * <p> * Query the given URI, returning a {@link Cursor} over the result set. + * </p> + * <p> + * For best performance, the caller should follow these guidelines: + * <ul> + * <li>Provide an explicit projection, to prevent + * reading data from storage that aren't going to be used.</li> + * <li>Use question mark parameter markers such as 'phone=?' instead of + * explicit values in the {@code selection} parameter, so that queries + * that differ only by those values will be recognized as the same + * for caching purposes.</li> + * </ul> + * </p> * * @param uri The URI, using the content:// scheme, for the content to * retrieve. * @param projection A list of which columns to return. Passing null will - * return all columns, which is discouraged to prevent reading data - * from storage that isn't going to be used. + * return all columns, which is inefficient. * @param selection A filter declaring which rows to return, formatted as an * SQL WHERE clause (excluding the WHERE itself). Passing null will * return all rows for the given URI. @@ -225,10 +237,10 @@ public abstract class ContentResolver { * <li>android.resource ({@link #SCHEME_ANDROID_RESOURCE})</li> * <li>file ({@link #SCHEME_FILE})</li> * </ul> - * + * * <p>See {@link #openAssetFileDescriptor(Uri, String)} for more information * on these schemes. - * + * * @param uri The desired URI. * @return InputStream * @throws FileNotFoundException if the provided URI could not be opened. @@ -283,7 +295,7 @@ public abstract class ContentResolver { * * <p>See {@link #openAssetFileDescriptor(Uri, String)} for more information * on these schemes. - * + * * @param uri The desired URI. * @param mode May be "w", "wa", "rw", or "rwt". * @return OutputStream @@ -318,7 +330,7 @@ public abstract class ContentResolver { * * <p>See {@link #openAssetFileDescriptor(Uri, String)} for more information * on these schemes. - * + * * @param uri The desired URI to open. * @param mode The file mode to use, as per {@link ContentProvider#openFile * ContentProvider.openFile}. @@ -334,19 +346,19 @@ public abstract class ContentResolver { if (afd == null) { return null; } - + if (afd.getDeclaredLength() < 0) { // This is a full file! return afd.getParcelFileDescriptor(); } - + // Client can't handle a sub-section of a file, so close what // we got and bail with an exception. try { afd.close(); } catch (IOException e) { } - + throw new FileNotFoundException("Not a whole file"); } @@ -491,7 +503,7 @@ public abstract class ContentResolver { res.id = id; return res; } - + /** @hide */ static public int modeToMode(Uri uri, String mode) throws FileNotFoundException { int modeBits; @@ -518,7 +530,7 @@ public abstract class ContentResolver { } return modeBits; } - + /** * Inserts a row into a table at the given URL. * @@ -1146,7 +1158,7 @@ public abstract class ContentResolver { /** @hide */ public static final String CONTENT_SERVICE_NAME = "content"; - + /** @hide */ public static IContentService getContentService() { if (sContentService != null) { @@ -1158,7 +1170,7 @@ public abstract class ContentResolver { if (Config.LOGV) Log.v("ContentService", "default service = " + sContentService); return sContentService; } - + private static IContentService sContentService; private final Context mContext; private static final String TAG = "ContentResolver"; diff --git a/core/java/android/content/package.html b/core/java/android/content/package.html index dd5360f651b4..eac679dbfd58 100644 --- a/core/java/android/content/package.html +++ b/core/java/android/content/package.html @@ -421,7 +421,7 @@ can supply them explicitly in the XML file:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" <b>android:textSize="18" android:textColor="#008"</b> android:text="Hello, World!" /> </root> @@ -447,7 +447,7 @@ one of those resources:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" <b>android:textColor="@color/opaque_red"</b> android:text="Hello, World!" /> </root> @@ -463,7 +463,7 @@ reference a system resource, you would need to write:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" android:textColor="@<b>android:</b>color/opaque_red" android:text="Hello, World!" /> </root> @@ -476,7 +476,7 @@ strings in a layout file so that they can be localized:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" android:textColor="@android:color/opaque_red" android:text="@string/hello_world" /> </root> @@ -509,7 +509,7 @@ one of the standard colors defined in the base system theme:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" <b>android:textColor="?android:textDisabledColor"</b> android:text="@string/hello_world" /> </root> @@ -637,10 +637,10 @@ new style resource with the desired values:</p> <?xml version="1.0" encoding="utf-8"?> <root> <EditText id="text1" <b>style="@style/SpecialText"</b> - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Hello, World!" /> <EditText id="text2" <b>style="@style/SpecialText"</b> - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="I love you all." /> </root></pre> <h4> </h4> diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 01c67cf2a229..0c6bb1afd2c4 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -545,8 +545,8 @@ public class SensorManager i = sensors_module_get_next_sensor(sensor, i); if (i>=0) { - Log.d(TAG, "found sensor: " + sensor.getName() + - ", handle=" + sensor.getHandle()); + //Log.d(TAG, "found sensor: " + sensor.getName() + + // ", handle=" + sensor.getHandle()); sensor.setLegacyType(getLegacySensorType(sensor.getType())); fullList.add(sensor); sHandleToSensor.append(sensor.getHandle(), sensor); diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 5499bbafb0ff..b31593277063 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -16,7 +16,7 @@ package android.inputmethodservice; -import static android.view.ViewGroup.LayoutParams.FILL_PARENT; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import android.app.Dialog; @@ -556,7 +556,7 @@ public class InputMethodService extends AbstractInputMethodService { Context.LAYOUT_INFLATER_SERVICE); mWindow = new SoftInputWindow(this, mTheme, mDispatcherState); initViews(); - mWindow.getWindow().setLayout(FILL_PARENT, WRAP_CONTENT); + mWindow.getWindow().setLayout(MATCH_PARENT, WRAP_CONTENT); } /** @@ -803,8 +803,8 @@ public class InputMethodService extends AbstractInputMethodService { * candidates only mode changes. * * <p>The default implementation makes the layout for the window - * FILL_PARENT x FILL_PARENT when in fullscreen mode, and - * FILL_PARENT x WRAP_CONTENT when in non-fullscreen mode. + * MATCH_PARENT x MATCH_PARENT when in fullscreen mode, and + * MATCH_PARENT x WRAP_CONTENT when in non-fullscreen mode. * * @param win The input method's window. * @param isFullscreen If true, the window is running in fullscreen mode @@ -816,9 +816,9 @@ public class InputMethodService extends AbstractInputMethodService { public void onConfigureWindow(Window win, boolean isFullscreen, boolean isCandidatesOnly) { if (isFullscreen) { - mWindow.getWindow().setLayout(FILL_PARENT, FILL_PARENT); + mWindow.getWindow().setLayout(MATCH_PARENT, MATCH_PARENT); } else { - mWindow.getWindow().setLayout(FILL_PARENT, WRAP_CONTENT); + mWindow.getWindow().setLayout(MATCH_PARENT, WRAP_CONTENT); } } @@ -1049,8 +1049,8 @@ public class InputMethodService extends AbstractInputMethodService { public void setExtractView(View view) { mExtractFrame.removeAllViews(); mExtractFrame.addView(view, new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mExtractView = view; if (view != null) { mExtractEditText = (ExtractEditText)view.findViewById( @@ -1079,7 +1079,7 @@ public class InputMethodService extends AbstractInputMethodService { public void setCandidatesView(View view) { mCandidatesFrame.removeAllViews(); mCandidatesFrame.addView(view, new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); } @@ -1092,7 +1092,7 @@ public class InputMethodService extends AbstractInputMethodService { public void setInputView(View view) { mInputFrame.removeAllViews(); mInputFrame.addView(view, new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); mInputView = view; } diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 5f6c9d6a5400..4870b7c710e1 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -21,7 +21,7 @@ package android.os; */ public class Build { /** Value used for when a build property is unknown. */ - private static final String UNKNOWN = "unknown"; + public static final String UNKNOWN = "unknown"; /** Either a changelist number, or a label like "M4-rc20". */ public static final String ID = getString("ro.build.id"); diff --git a/core/java/android/os/IMountService.aidl b/core/java/android/os/IMountService.aidl index 2f60c34d0a9c..f0526893cff4 100644 --- a/core/java/android/os/IMountService.aidl +++ b/core/java/android/os/IMountService.aidl @@ -65,60 +65,47 @@ interface IMountService void setPlayNotificationSounds(boolean value); /** - * Returns true if USB Mass Storage is automatically started - * when a UMS host is detected. - */ - boolean getAutoStartUms(); - - /** - * Sets whether or not USB Mass Storage is automatically started - * when a UMS host is detected. - */ - void setAutoStartUms(boolean value); - - /** * Gets the state of an volume via it's mountpoint. */ String getVolumeState(String mountPoint); /* - * Creates a secure cache with the specified parameters. - * On success, the filesystem cache-path is returned. + * Creates a secure container with the specified parameters. + * On success, the filesystem container-path is returned. */ - String createSecureCache(String id, int sizeMb, String fstype, String key, int ownerUid); + String createSecureContainer(String id, int sizeMb, String fstype, String key, int ownerUid); /* - * Finalize a cache which has just been created and populated. - * After finalization, the cache is immutable. + * Finalize a container which has just been created and populated. + * After finalization, the container is immutable. */ - void finalizeSecureCache(String id); + void finalizeSecureContainer(String id); /* - * Destroy a secure cache, and free up all resources associated with it. + * Destroy a secure container, and free up all resources associated with it. * NOTE: Ensure all references are released prior to deleting. */ - void destroySecureCache(String id); + void destroySecureContainer(String id); /* - * Mount a secure cache with the specified key and owner UID. - * On success, the filesystem cache-path is returned. + * Mount a secure container with the specified key and owner UID. + * On success, the filesystem container-path is returned. */ - String mountSecureCache(String id, String key, int ownerUid); + String mountSecureContainer(String id, String key, int ownerUid); /* - * Returns the filesystem path of a mounted secure cache. + * Returns the filesystem path of a mounted secure container. */ - String getSecureCachePath(String id); + String getSecureContainerPath(String id); /** - * Gets an Array of currently known secure cache IDs + * Gets an Array of currently known secure container IDs */ - String[] getSecureCacheList(); + String[] getSecureContainerList(); /** * Shuts down the MountService and gracefully unmounts * all external media. */ void shutdown(); - } diff --git a/core/java/android/preference/EditTextPreference.java b/core/java/android/preference/EditTextPreference.java index 84ee950becee..aa27627ad3e1 100644 --- a/core/java/android/preference/EditTextPreference.java +++ b/core/java/android/preference/EditTextPreference.java @@ -28,7 +28,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; import android.widget.EditText; -import android.widget.LinearLayout; /** * A {@link Preference} that allows for string @@ -128,7 +127,7 @@ public class EditTextPreference extends DialogPreference { ViewGroup container = (ViewGroup) dialogView .findViewById(com.android.internal.R.id.edittext_container); if (container != null) { - container.addView(editText, ViewGroup.LayoutParams.FILL_PARENT, + container.addView(editText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); } } diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java index d210ed45f304..7f947e93207e 100644 --- a/core/java/android/provider/Calendar.java +++ b/core/java/android/provider/Calendar.java @@ -1049,18 +1049,6 @@ public final class Calendar { public static final String MAX_INSTANCE = "maxInstance"; /** - * The minimum Julian day in the BusyBits table. - * <P>Type: INTEGER</P> - */ - public static final String MIN_BUSYBITS = "minBusyBits"; - - /** - * The maximum Julian day in the BusyBits table. - * <P>Type: INTEGER</P> - */ - public static final String MAX_BUSYBITS = "maxBusyBits"; - - /** * The minimum Julian day in the EventDays table. * <P>Type: INTEGER</P> */ @@ -1075,68 +1063,6 @@ public final class Calendar { public static final class CalendarMetaData implements CalendarMetaDataColumns { } - /*busybits*/ - public interface BusyBitsColumns { - /** - * The Julian day number. - * <P>Type: INTEGER (int)</P> - */ - public static final String DAY = "day"; - - /** - * The 24 bits representing the 24 1-hour time slots in a day. - * If an event in the Instances table overlaps part of a 1-hour - * time slot then the corresponding bit is set. The first time slot - * (12am to 1am) is bit 0. The last time slot (11pm to midnight) - * is bit 23. - * <P>Type: INTEGER (int)</P> - */ - public static final String BUSYBITS = "busyBits"; - - /** - * The number of all-day events that occur on this day. - * <P>Type: INTEGER (int)</P> - */ - public static final String ALL_DAY_COUNT = "allDayCount"; - } - - /*busybits*/ - public static final class BusyBits implements BusyBitsColumns { - public static final Uri CONTENT_URI = Uri.parse("content://calendar/busybits/when"); - - public static final String[] PROJECTION = { DAY, BUSYBITS, ALL_DAY_COUNT }; - - // The number of minutes represented by one busy bit - public static final int MINUTES_PER_BUSY_INTERVAL = 60; - - // The number of intervals in a day - public static final int INTERVALS_PER_DAY = 24 * 60 / MINUTES_PER_BUSY_INTERVAL; - - /** - * Retrieves the busy bits for the Julian days starting at "startDay" - * for "numDays". - * This is being phased out so has been changed to an empty method so - * that it doesn't reference anything that needs to be cleaned up else- - * where. - * - * @param cr the ContentResolver - * @param startDay the first Julian day in the range - * @param numDays the number of days to load (must be at least 1) - * @return a database cursor - */ - public static final Cursor query(ContentResolver cr, int startDay, int numDays) { -// if (numDays < 1) { -// return null; -// } -// int endDay = startDay + numDays - 1; -// Uri.Builder builder = CONTENT_URI.buildUpon(); -// ContentUris.appendId(builder, startDay); -// ContentUris.appendId(builder, endDay); -// return cr.query(builder.build(), PROJECTION, null /* selection */, -// null /* selection args */, DAY); - return null; - } - } public interface EventDaysColumns { /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e19810b784ea..a3472c013474 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2918,6 +2918,29 @@ public final class Settings { public static final String SEARCH_PER_SOURCE_CONCURRENT_QUERY_LIMIT = "search_per_source_concurrent_query_limit"; + /** + * Whether or not alert sounds are played on MountService events. (0 = false, 1 = true) + * @hide + */ + public static final String MOUNT_PLAY_NOTIFICATION_SND = "mount_play_not_snd"; + + /** + * Whether or not UMS auto-starts on UMS host detection. (0 = false, 1 = true) + * @hide + */ + public static final String MOUNT_UMS_AUTOSTART = "mount_ums_autostart"; + + /** + * Whether or not a notification is displayed on UMS host detection. (0 = false, 1 = true) + * @hide + */ + public static final String MOUNT_UMS_PROMPT = "mount_ums_prompt"; + + /** + * Whether or not a notification is displayed while UMS is enabled. (0 = false, 1 = true) + * @hide + */ + public static final String MOUNT_UMS_NOTIFY_ENABLED = "mount_ums_notify_enabled"; /** @@ -2941,6 +2964,10 @@ public final class Settings { WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, WIFI_NUM_ALLOWED_CHANNELS, WIFI_NUM_OPEN_NETWORKS_KEPT, + MOUNT_PLAY_NOTIFICATION_SND, + MOUNT_UMS_AUTOSTART, + MOUNT_UMS_PROMPT, + MOUNT_UMS_NOTIFY_ENABLED }; /** diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index e41f9de39761..5e234da3210c 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -466,10 +466,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { checkSinkSuspendState(state); mTargetA2dpState = -1; - if (state == BluetoothA2dp.STATE_CONNECTING) { - mAudioManager.setParameters("A2dpSuspended=false"); - } - if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF && state == BluetoothA2dp.STATE_CONNECTING || state == BluetoothA2dp.STATE_CONNECTED) { diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 45719e49fdde..fe3b149640ce 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -434,9 +434,9 @@ public abstract class WallpaperService extends Service { } int myWidth = mSurfaceHolder.getRequestedWidth(); - if (myWidth <= 0) myWidth = ViewGroup.LayoutParams.FILL_PARENT; + if (myWidth <= 0) myWidth = ViewGroup.LayoutParams.MATCH_PARENT; int myHeight = mSurfaceHolder.getRequestedHeight(); - if (myHeight <= 0) myHeight = ViewGroup.LayoutParams.FILL_PARENT; + if (myHeight <= 0) myHeight = ViewGroup.LayoutParams.MATCH_PARENT; final boolean creating = !mCreated; final boolean formatChanged = mFormat != mSurfaceHolder.getRequestedFormat(); diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index bd19f9e9c358..bbbeb3f00a56 100755 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -129,8 +129,8 @@ public class TextToSpeech { * {@link TextToSpeech#synthesizeToFile(String, HashMap, String)} with the * {@link TextToSpeech.Engine#KEY_PARAM_UTTERANCE_ID} key. * @param utteranceId the identifier of the utterance. - */
- public void onUtteranceCompleted(String utteranceId);
+ */ + public void onUtteranceCompleted(String utteranceId); } @@ -286,6 +286,10 @@ public class TextToSpeech { */ public static final String KEY_PARAM_VARIANT = "variant"; /** + * {@hide} + */ + public static final String KEY_PARAM_ENGINE = "engine"; + /** * Parameter key to specify the audio stream type to be used when speaking text * or playing back a file. * @see TextToSpeech#speak(String, int, HashMap) @@ -327,10 +331,16 @@ public class TextToSpeech { * {@hide} */ protected static final int PARAM_POSITION_UTTERANCE_ID = 10; + + /** + * {@hide} + */ + protected static final int PARAM_POSITION_ENGINE = 12; + /** * {@hide} */ - protected static final int NB_CACHED_PARAMS = 6; + protected static final int NB_CACHED_PARAMS = 7; } /** @@ -373,6 +383,7 @@ public class TextToSpeech { mCachedParams[Engine.PARAM_POSITION_VARIANT] = Engine.KEY_PARAM_VARIANT; mCachedParams[Engine.PARAM_POSITION_STREAM] = Engine.KEY_PARAM_STREAM; mCachedParams[Engine.PARAM_POSITION_UTTERANCE_ID] = Engine.KEY_PARAM_UTTERANCE_ID; + mCachedParams[Engine.PARAM_POSITION_ENGINE] = Engine.KEY_PARAM_ENGINE; mCachedParams[Engine.PARAM_POSITION_RATE + 1] = String.valueOf(Engine.DEFAULT_RATE); @@ -381,10 +392,10 @@ public class TextToSpeech { mCachedParams[Engine.PARAM_POSITION_LANGUAGE + 1] = defaultLoc.getISO3Language(); mCachedParams[Engine.PARAM_POSITION_COUNTRY + 1] = defaultLoc.getISO3Country(); mCachedParams[Engine.PARAM_POSITION_VARIANT + 1] = defaultLoc.getVariant(); - mCachedParams[Engine.PARAM_POSITION_STREAM + 1] = String.valueOf(Engine.DEFAULT_STREAM); mCachedParams[Engine.PARAM_POSITION_UTTERANCE_ID + 1] = ""; + mCachedParams[Engine.PARAM_POSITION_ENGINE + 1] = Engine.DEFAULT_SYNTH; initTts(); } @@ -684,6 +695,10 @@ public class TextToSpeech { if (extra != null) { mCachedParams[Engine.PARAM_POSITION_UTTERANCE_ID + 1] = extra; } + extra = params.get(Engine.KEY_PARAM_ENGINE); + if (extra != null) { + mCachedParams[Engine.PARAM_POSITION_ENGINE + 1] = extra; + } } result = mITts.speak(mPackageName, text, queueMode, mCachedParams); } catch (RemoteException e) { @@ -819,7 +834,7 @@ public class TextToSpeech { mStarted = false; initTts(); } finally { - return result; + return result; } } } @@ -894,7 +909,7 @@ public class TextToSpeech { mStarted = false; initTts(); } finally { - return result; + return result; } } } @@ -943,7 +958,7 @@ public class TextToSpeech { mStarted = false; initTts(); } finally { - return result; + return result; } } } @@ -990,7 +1005,7 @@ public class TextToSpeech { mStarted = false; initTts(); } finally { - return result; + return result; } } } @@ -1046,7 +1061,7 @@ public class TextToSpeech { mStarted = false; initTts(); } finally { - return result; + return result; } } } @@ -1064,7 +1079,7 @@ public class TextToSpeech { return null; } try { - String[] locStrings = mITts.getLanguage(); + String[] locStrings = mITts.getLanguage(); if ((locStrings != null) && (locStrings.length == 3)) { return new Locale(locStrings[0], locStrings[1], locStrings[2]); } else { @@ -1131,7 +1146,7 @@ public class TextToSpeech { mStarted = false; initTts(); } finally { - return result; + return result; } } } @@ -1166,6 +1181,10 @@ public class TextToSpeech { if (extra != null) { mCachedParams[Engine.PARAM_POSITION_UTTERANCE_ID + 1] = extra; } + extra = params.get(Engine.KEY_PARAM_ENGINE); + if (extra != null) { + mCachedParams[Engine.PARAM_POSITION_ENGINE + 1] = extra; + } } if (mITts.synthesizeToFile(mPackageName, text, mCachedParams, filename)){ result = SUCCESS; @@ -1214,19 +1233,19 @@ public class TextToSpeech { * * @return Code indicating success or failure. See {@link #ERROR} and {@link #SUCCESS}. */ - public int setOnUtteranceCompletedListener(
- final OnUtteranceCompletedListener listener) {
+ public int setOnUtteranceCompletedListener( + final OnUtteranceCompletedListener listener) { synchronized (mStartLock) { int result = ERROR; if (!mStarted) { return result; } mITtscallback = new ITtsCallback.Stub() { - public void utteranceCompleted(String utteranceId) throws RemoteException {
- if (listener != null) {
- listener.onUtteranceCompleted(utteranceId);
- }
- }
+ public void utteranceCompleted(String utteranceId) throws RemoteException { + if (listener != null) { + listener.onUtteranceCompleted(utteranceId); + } + } }; try { result = mITts.registerCallback(mPackageName, mITtscallback); @@ -1251,7 +1270,7 @@ public class TextToSpeech { } finally { return result; } - }
+ } } /** @@ -1262,36 +1281,39 @@ public class TextToSpeech { * * @return Code indicating success or failure. See {@link #ERROR} and {@link #SUCCESS}. */ - public int setEngineByPackageName(String enginePackageName) {
- synchronized (mStartLock) {
- int result = TextToSpeech.ERROR;
- if (!mStarted) {
- return result;
- }
- try {
- result = mITts.setEngineByPackageName(enginePackageName);
- } catch (RemoteException e) {
- // TTS died; restart it.
- Log.e("TextToSpeech.java - setEngineByPackageName", "RemoteException");
- e.printStackTrace();
- mStarted = false;
- initTts();
- } catch (NullPointerException e) {
- // TTS died; restart it.
- Log.e("TextToSpeech.java - setEngineByPackageName", "NullPointerException");
- e.printStackTrace();
- mStarted = false;
- initTts();
- } catch (IllegalStateException e) {
- // TTS died; restart it.
- Log.e("TextToSpeech.java - setEngineByPackageName", "IllegalStateException");
- e.printStackTrace();
- mStarted = false;
- initTts();
- } finally {
- return result;
- }
- }
+ public int setEngineByPackageName(String enginePackageName) { + synchronized (mStartLock) { + int result = TextToSpeech.ERROR; + if (!mStarted) { + return result; + } + try { + result = mITts.setEngineByPackageName(enginePackageName); + if (result == TextToSpeech.SUCCESS){ + mCachedParams[Engine.PARAM_POSITION_ENGINE + 1] = enginePackageName; + } + } catch (RemoteException e) { + // TTS died; restart it. + Log.e("TextToSpeech.java - setEngineByPackageName", "RemoteException"); + e.printStackTrace(); + mStarted = false; + initTts(); + } catch (NullPointerException e) { + // TTS died; restart it. + Log.e("TextToSpeech.java - setEngineByPackageName", "NullPointerException"); + e.printStackTrace(); + mStarted = false; + initTts(); + } catch (IllegalStateException e) { + // TTS died; restart it. + Log.e("TextToSpeech.java - setEngineByPackageName", "IllegalStateException"); + e.printStackTrace(); + mStarted = false; + initTts(); + } finally { + return result; + } + } } } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 5bd45a66a2d8..df4cab03e480 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -379,7 +379,7 @@ import java.util.WeakHashMap; * dimension, it can specify one of: * <ul> * <li> an exact number - * <li>FILL_PARENT, which means the view wants to be as big as its parent + * <li>MATCH_PARENT, which means the view wants to be as big as its parent * (minus padding) * <li> WRAP_CONTENT, which means that the view wants to be just big enough to * enclose its content (plus padding). diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 66461361950d..763f273f93ad 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3070,7 +3070,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (childDimension >= 0) { resultSize = childDimension; resultMode = MeasureSpec.EXACTLY; - } else if (childDimension == LayoutParams.FILL_PARENT) { + } else if (childDimension == LayoutParams.MATCH_PARENT) { // Child wants to be our size. So be it. resultSize = size; resultMode = MeasureSpec.EXACTLY; @@ -3088,7 +3088,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // Child wants a specific size... so be it resultSize = childDimension; resultMode = MeasureSpec.EXACTLY; - } else if (childDimension == LayoutParams.FILL_PARENT) { + } else if (childDimension == LayoutParams.MATCH_PARENT) { // Child wants to be our size, but our size is not fixed. // Constrain child to not be bigger than us. resultSize = size; @@ -3107,7 +3107,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // Child wants a specific size... let him have it resultSize = childDimension; resultMode = MeasureSpec.EXACTLY; - } else if (childDimension == LayoutParams.FILL_PARENT) { + } else if (childDimension == LayoutParams.MATCH_PARENT) { // Child wants to be our size... find out how big it should // be resultSize = 0; @@ -3362,7 +3362,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * for both width and height. For each dimension, it can specify one of: * <ul> * <li> an exact number - * <li>FILL_PARENT, which means the view wants to be as big as its parent + * <li>MATCH_PARENT, which means the view wants to be as big as its parent * (minus padding) * <li> WRAP_CONTENT, which means that the view wants to be just big enough * to enclose its content (plus padding) @@ -3376,14 +3376,22 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ public static class LayoutParams { /** - * Special value for the height or width requested by a View. - * FILL_PARENT means that the view wants to fill the available space - * within the parent, taking the parent's padding into account. + * This value has the same meaning as {@link #MATCH_PARENT} but has + * been deprecated. */ + @SuppressWarnings({"UnusedDeclaration"}) + @Deprecated public static final int FILL_PARENT = -1; /** * Special value for the height or width requested by a View. + * MATCH_PARENT means that the view wants to be as bigas its parent, + * minus the parent's padding, if any. + */ + public static final int MATCH_PARENT = -1; + + /** + * Special value for the height or width requested by a View. * WRAP_CONTENT means that the view wants to be just large enough to fit * its own internal content, taking its own padding into account. */ @@ -3391,20 +3399,20 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * Information about how wide the view wants to be. Can be an exact - * size, or one of the constants FILL_PARENT or WRAP_CONTENT. + * size, or one of the constants MATCH_PARENT or WRAP_CONTENT. */ @ViewDebug.ExportedProperty(mapping = { - @ViewDebug.IntToString(from = FILL_PARENT, to = "FILL_PARENT"), + @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT") }) public int width; /** * Information about how tall the view wants to be. Can be an exact - * size, or one of the constants FILL_PARENT or WRAP_CONTENT. + * size, or one of the constants MATCH_PARENT or WRAP_CONTENT. */ @ViewDebug.ExportedProperty(mapping = { - @ViewDebug.IntToString(from = FILL_PARENT, to = "FILL_PARENT"), + @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT") }) public int height; @@ -3421,9 +3429,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * * <ul> * <li><code>layout_width</code>: the width, either an exact value, - * {@link #WRAP_CONTENT} or {@link #FILL_PARENT}</li> + * {@link #WRAP_CONTENT} or {@link #MATCH_PARENT}</li> * <li><code>layout_height</code>: the height, either an exact value, - * {@link #WRAP_CONTENT} or {@link #FILL_PARENT}</li> + * {@link #WRAP_CONTENT} or {@link #MATCH_PARENT}</li> * </ul> * * @param c the application environment @@ -3442,9 +3450,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * Creates a new set of layout parameters with the specified width * and height. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels */ public LayoutParams(int width, int height) { @@ -3507,8 +3515,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (size == WRAP_CONTENT) { return "wrap-content"; } - if (size == FILL_PARENT) { - return "fill-parent"; + if (size == MATCH_PARENT) { + return "match-parent"; } return String.valueOf(size); } diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 47b976bc2f4d..094b7dd2d4ea 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -1167,7 +1167,7 @@ public final class ViewRoot extends Handler implements ViewParent, int measureSpec; switch (rootDimension) { - case ViewGroup.LayoutParams.FILL_PARENT: + case ViewGroup.LayoutParams.MATCH_PARENT: // Window can't resize. Force root view to be windowSize. measureSpec = MeasureSpec.makeMeasureSpec(windowSize, MeasureSpec.EXACTLY); break; diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 1932765438f3..7dd5085f1075 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -484,7 +484,7 @@ public abstract class Window { /** * Set the width and height layout parameters of the window. The default - * for both of these is FILL_PARENT; you can change them to WRAP_CONTENT to + * for both of these is MATCH_PARENT; you can change them to WRAP_CONTENT to * make a window that is not full-screen. * * @param width The desired layout width of the window. diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index fe329f284321..8e15f89e6325 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -771,26 +771,26 @@ public interface WindowManager extends ViewManager { public LayoutParams() { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = TYPE_APPLICATION; format = PixelFormat.OPAQUE; } public LayoutParams(int _type) { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = _type; format = PixelFormat.OPAQUE; } public LayoutParams(int _type, int _flags) { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = _type; flags = _flags; format = PixelFormat.OPAQUE; } public LayoutParams(int _type, int _flags, int _format) { - super(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); type = _type; flags = _flags; format = _format; @@ -1036,9 +1036,9 @@ public interface WindowManager extends ViewManager { sb.append(','); sb.append(y); sb.append(")("); - sb.append((width==FILL_PARENT?"fill":(width==WRAP_CONTENT?"wrap":width))); + sb.append((width== MATCH_PARENT ?"fill":(width==WRAP_CONTENT?"wrap":width))); sb.append('x'); - sb.append((height==FILL_PARENT?"fill":(height==WRAP_CONTENT?"wrap":height))); + sb.append((height== MATCH_PARENT ?"fill":(height==WRAP_CONTENT?"wrap":height))); sb.append(")"); if (softInputMode != 0) { sb.append(" sim=#"); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index c17d69d37589..b10d7860c923 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -25,11 +25,9 @@ import android.database.DataSetObserver; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Paint; import android.graphics.Picture; import android.graphics.Point; import android.graphics.Rect; -import android.graphics.Region; import android.graphics.drawable.Drawable; import android.net.http.SslCertificate; import android.net.Uri; @@ -55,7 +53,6 @@ import android.view.VelocityTracker; import android.view.View; import android.view.ViewConfiguration; import android.view.ViewGroup; -import android.view.ViewParent; import android.view.ViewTreeObserver; import android.view.animation.AlphaAnimation; import android.view.inputmethod.InputMethodManager; @@ -203,6 +200,8 @@ public class WebView extends AbsoluteLayout implements ViewTreeObserver.OnGlobalFocusChangeListener, ViewGroup.OnHierarchyChangeListener { + // enable debug output for drag trackers + private static final boolean DEBUG_DRAG_TRACKER = false; // if AUTO_REDRAW_HACK is true, then the CALL key will toggle redrawing // the screen all-the-time. Good for profiling our drawing code static private final boolean AUTO_REDRAW_HACK = false; @@ -1847,7 +1846,7 @@ public class WebView extends AbsoluteLayout } if (null != v) { addView(v, new AbsoluteLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0)); if (mTitleShadow == null) { mTitleShadow = (Drawable) mContext.getResources().getDrawable( @@ -3193,14 +3192,17 @@ public class WebView extends AbsoluteLayout mWebViewCore.sendMessage(EventHub.SET_SELECTION, start, end); } - // Called by JNI when a touch event puts a textfield into focus. + /** + * Called in response to a message from webkit telling us that the soft + * keyboard should be launched. + */ private void displaySoftKeyboard(boolean isTextView) { InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE); if (isTextView) { - if (mWebTextView == null) return; - + rebuildWebTextView(); + if (!inEditingMode()) return; imm.showSoftInput(mWebTextView, 0); if (mInZoomOverview) { // if in zoom overview mode, call doDoubleTap() to bring it back @@ -3663,9 +3665,6 @@ public class WebView extends AbsoluteLayout nativeHideCursor(); } - /** - * @hide - */ public void emulateShiftHeld() { if (0 == mNativeClass) return; // client isn't initialized setUpSelectXY(); @@ -3970,7 +3969,7 @@ public class WebView extends AbsoluteLayout mMinDY = -viewTop; mMaxDY = docBottom - viewBottom; - if (DebugFlags.DRAG_TRACKER) { + if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) { Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, " dragtracker y= " + y + " up/down= " + mMinDY + " " + mMaxDY); } @@ -4007,7 +4006,7 @@ public class WebView extends AbsoluteLayout if (mCurrStretchX != sx || mCurrStretchY != sy) { mCurrStretchX = sx; mCurrStretchY = sy; - if (DebugFlags.DRAG_TRACKER) { + if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) { Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, "---- stretch " + sx + " " + sy); } @@ -4018,7 +4017,7 @@ public class WebView extends AbsoluteLayout } public void stopDrag() { - if (DebugFlags.DRAG_TRACKER) { + if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) { Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, "----- stopDrag"); } mProxy.onStopDrag(); @@ -4055,7 +4054,7 @@ public class WebView extends AbsoluteLayout canvas.restoreToCount(count); return true; } - if (DebugFlags.DRAG_TRACKER) { + if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) { Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, " -- draw false " + mCurrStretchX + " " + mCurrStretchY); } @@ -4070,7 +4069,7 @@ public class WebView extends AbsoluteLayout canvas.translate(-sx, -sy); drawContent(canvas); - if (DebugFlags.DRAG_TRACKER) { + if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) { Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, "--- buildBitmap " + sx + " " + sy + " " + w + " " + h); } @@ -5107,10 +5106,6 @@ public class WebView extends AbsoluteLayout /*package*/ void centerKeyPressOnTextField() { mWebViewCore.sendMessage(EventHub.CLICK, nativeCursorFramePointer(), nativeCursorNodePointer()); - // Need to show the soft keyboard if it's not readonly. - if (!nativeCursorIsReadOnly()) { - displaySoftKeyboard(true); - } } private void doShortPress() { @@ -5738,7 +5733,7 @@ public class WebView extends AbsoluteLayout if (msg.arg1 == 0) { hideSoftKeyboard(); } else { - displaySoftKeyboard(false); + displaySoftKeyboard(1 == msg.arg2); } break; @@ -6341,7 +6336,6 @@ public class WebView extends AbsoluteLayout /* package */ native boolean nativeCursorMatchesFocus(); private native boolean nativeCursorIntersects(Rect visibleRect); private native boolean nativeCursorIsAnchor(); - private native boolean nativeCursorIsReadOnly(); private native boolean nativeCursorIsTextInput(); private native Point nativeCursorPosition(); private native String nativeCursorText(); diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 724493b03269..f7989204a52d 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -2236,10 +2236,11 @@ final class WebViewCore { } // called by JNI - private void requestKeyboard(boolean showKeyboard) { + private void requestKeyboard(boolean showKeyboard, boolean isTextView) { if (mWebView != null) { Message.obtain(mWebView.mPrivateHandler, - WebView.REQUEST_KEYBOARD, showKeyboard ? 1 : 0, 0) + WebView.REQUEST_KEYBOARD, showKeyboard ? 1 : 0, + isTextView ? 1 : 0) .sendToTarget(); } } diff --git a/core/java/android/widget/AbsSpinner.java b/core/java/android/widget/AbsSpinner.java index 424a93603e7d..c939e3f2980b 100644 --- a/core/java/android/widget/AbsSpinner.java +++ b/core/java/android/widget/AbsSpinner.java @@ -249,7 +249,7 @@ public abstract class AbsSpinner extends AdapterView<SpinnerAdapter> { @Override protected ViewGroup.LayoutParams generateDefaultLayoutParams() { return new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); } diff --git a/core/java/android/widget/AbsoluteLayout.java b/core/java/android/widget/AbsoluteLayout.java index c77f7aec62f1..b8296553893b 100644 --- a/core/java/android/widget/AbsoluteLayout.java +++ b/core/java/android/widget/AbsoluteLayout.java @@ -161,9 +161,9 @@ public class AbsoluteLayout extends ViewGroup { * Creates a new set of layout parameters with the specified width, * height and location. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, {@link #WRAP_CONTENT} or a fixed size in pixels * @param x the X location of the child * @param y the Y location of the child diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index b455d472eb67..bb9a672e84af 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -172,7 +172,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe mDropDownAnchorId = a.getResourceId(R.styleable.AutoCompleteTextView_dropDownAnchor, View.NO_ID); - // For dropdown width, the developer can specify a specific width, or FILL_PARENT + // For dropdown width, the developer can specify a specific width, or MATCH_PARENT // (for full screen width) or WRAP_CONTENT (to match the width of the anchored view). mDropDownWidth = a.getLayoutDimension(R.styleable.AutoCompleteTextView_dropDownWidth, ViewGroup.LayoutParams.WRAP_CONTENT); @@ -240,7 +240,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Returns the current width for the auto-complete drop down list. This can - * be a fixed width, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill the screen, or + * be a fixed width, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill the screen, or * {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the width of its anchor view.</p> * * @return the width for the drop down list @@ -253,7 +253,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Sets the current width for the auto-complete drop down list. This can - * be a fixed width, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill the screen, or + * be a fixed width, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill the screen, or * {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the width of its anchor view.</p> * * @param width the width to use @@ -266,7 +266,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Returns the current height for the auto-complete drop down list. This can - * be a fixed height, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill + * be a fixed height, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill * the screen, or {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the height * of the drop down's content.</p> * @@ -280,7 +280,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe /** * <p>Sets the current height for the auto-complete drop down list. This can - * be a fixed height, or {@link ViewGroup.LayoutParams#FILL_PARENT} to fill + * be a fixed height, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill * the screen, or {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the height * of the drop down's content.</p> * @@ -1129,7 +1129,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe boolean noInputMethod = isInputMethodNotNeeded(); if (mPopup.isShowing()) { - if (mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT) { + if (mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT) { // The call to PopupWindow's update method below can accept -1 for any // value you do not want to update. widthSpec = -1; @@ -1139,19 +1139,19 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe widthSpec = mDropDownWidth; } - if (mDropDownHeight == ViewGroup.LayoutParams.FILL_PARENT) { + if (mDropDownHeight == ViewGroup.LayoutParams.MATCH_PARENT) { // The call to PopupWindow's update method below can accept -1 for any // value you do not want to update. - heightSpec = noInputMethod ? height : ViewGroup.LayoutParams.FILL_PARENT; + heightSpec = noInputMethod ? height : ViewGroup.LayoutParams.MATCH_PARENT; if (noInputMethod) { mPopup.setWindowLayoutMode( - mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT ? - ViewGroup.LayoutParams.FILL_PARENT : 0, 0); + mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT ? + ViewGroup.LayoutParams.MATCH_PARENT : 0, 0); } else { mPopup.setWindowLayoutMode( - mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT ? - ViewGroup.LayoutParams.FILL_PARENT : 0, - ViewGroup.LayoutParams.FILL_PARENT); + mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT ? + ViewGroup.LayoutParams.MATCH_PARENT : 0, + ViewGroup.LayoutParams.MATCH_PARENT); } } else if (mDropDownHeight == ViewGroup.LayoutParams.WRAP_CONTENT) { heightSpec = height; @@ -1164,8 +1164,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe mPopup.update(getDropDownAnchorView(), mDropDownHorizontalOffset, mDropDownVerticalOffset, widthSpec, heightSpec); } else { - if (mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT) { - widthSpec = ViewGroup.LayoutParams.FILL_PARENT; + if (mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT) { + widthSpec = ViewGroup.LayoutParams.MATCH_PARENT; } else { if (mDropDownWidth == ViewGroup.LayoutParams.WRAP_CONTENT) { mPopup.setWidth(getDropDownAnchorView().getWidth()); @@ -1174,8 +1174,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe } } - if (mDropDownHeight == ViewGroup.LayoutParams.FILL_PARENT) { - heightSpec = ViewGroup.LayoutParams.FILL_PARENT; + if (mDropDownHeight == ViewGroup.LayoutParams.MATCH_PARENT) { + heightSpec = ViewGroup.LayoutParams.MATCH_PARENT; } else { if (mDropDownHeight == ViewGroup.LayoutParams.WRAP_CONTENT) { mPopup.setHeight(height); @@ -1295,7 +1295,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe hintContainer.setOrientation(LinearLayout.VERTICAL); LinearLayout.LayoutParams hintParams = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, 0, 1.0f + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1.0f ); hintContainer.addView(dropDownView, hintParams); hintContainer.addView(hintView); @@ -1331,7 +1331,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe final int maxHeight = mPopup.getMaxAvailableHeight( getDropDownAnchorView(), mDropDownVerticalOffset, ignoreBottomDecorations); - if (mDropDownAlwaysVisible || mDropDownHeight == ViewGroup.LayoutParams.FILL_PARENT) { + if (mDropDownAlwaysVisible || mDropDownHeight == ViewGroup.LayoutParams.MATCH_PARENT) { // getMaxAvailableHeight() subtracts the padding, so we put it back, // to get the available height for the whole window int padding = 0; diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 3afd5d42f857..65a46736d149 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -164,12 +164,12 @@ public class FrameLayout extends ViewGroup { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}, - * and a height of {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}. + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}, + * and a height of {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}. */ @Override protected LayoutParams generateDefaultLayoutParams() { - return new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT); + return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); } /** @@ -467,9 +467,9 @@ public class FrameLayout extends ViewGroup { * Creates a new set of layout parameters with the specified width, height * and weight. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels * @param gravity the gravity * diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index 2e91e52aaac6..30a38df954e2 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -935,7 +935,7 @@ public class GridView extends AbsListView { AbsListView.LayoutParams p = (AbsListView.LayoutParams)child.getLayoutParams(); if (p == null) { - p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); child.setLayoutParams(p); } @@ -1254,7 +1254,7 @@ public class GridView extends AbsListView { // some up... AbsListView.LayoutParams p = (AbsListView.LayoutParams)child.getLayoutParams(); if (p == null) { - p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); } p.viewType = mAdapter.getItemViewType(position); diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index f49079c81155..37372c5ce6d8 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -378,7 +378,7 @@ public class LinearLayout extends ViewGroup { } boolean matchWidthLocally = false; - if (widthMode != MeasureSpec.EXACTLY && lp.width == LayoutParams.FILL_PARENT) { + if (widthMode != MeasureSpec.EXACTLY && lp.width == LayoutParams.MATCH_PARENT) { // The width of the linear layout will scale, and at least one // child said it wanted to match our width. Set a flag // indicating that we need to remeasure at least that view when @@ -391,7 +391,7 @@ public class LinearLayout extends ViewGroup { final int measuredWidth = child.getMeasuredWidth() + margin; maxWidth = Math.max(maxWidth, measuredWidth); - allFillParent = allFillParent && lp.width == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.width == LayoutParams.MATCH_PARENT; if (lp.weight > 0) { /* * Widths of weighted Views are bogus if we end up @@ -472,12 +472,12 @@ public class LinearLayout extends ViewGroup { maxWidth = Math.max(maxWidth, measuredWidth); boolean matchWidthLocally = widthMode != MeasureSpec.EXACTLY && - lp.width == LayoutParams.FILL_PARENT; + lp.width == LayoutParams.MATCH_PARENT; alternativeMaxWidth = Math.max(alternativeMaxWidth, matchWidthLocally ? margin : measuredWidth); - allFillParent = allFillParent && lp.width == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.width == LayoutParams.MATCH_PARENT; mTotalLength += child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin + getNextLocationOffset(child); @@ -515,7 +515,7 @@ public class LinearLayout extends ViewGroup { if (child.getVisibility() != GONE) { LinearLayout.LayoutParams lp = ((LinearLayout.LayoutParams)child.getLayoutParams()); - if (lp.width == LayoutParams.FILL_PARENT) { + if (lp.width == LayoutParams.MATCH_PARENT) { // Temporarily force children to reuse their old measured height // FIXME: this may not be right for something like wrapping text? int oldHeight = lp.height; @@ -629,7 +629,7 @@ public class LinearLayout extends ViewGroup { } boolean matchHeightLocally = false; - if (heightMode != MeasureSpec.EXACTLY && lp.height == LayoutParams.FILL_PARENT) { + if (heightMode != MeasureSpec.EXACTLY && lp.height == LayoutParams.MATCH_PARENT) { // The height of the linear layout will scale, and at least one // child said it wanted to match our height. Set a flag indicating that // we need to remeasure at least that view when we know our height. @@ -657,7 +657,7 @@ public class LinearLayout extends ViewGroup { maxHeight = Math.max(maxHeight, childHeight); - allFillParent = allFillParent && lp.height == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.height == LayoutParams.MATCH_PARENT; if (lp.weight > 0) { /* * Heights of weighted Views are bogus if we end up @@ -758,7 +758,7 @@ public class LinearLayout extends ViewGroup { lp.rightMargin + getNextLocationOffset(child); boolean matchHeightLocally = heightMode != MeasureSpec.EXACTLY && - lp.height == LayoutParams.FILL_PARENT; + lp.height == LayoutParams.MATCH_PARENT; final int margin = lp.topMargin + lp .bottomMargin; int childHeight = child.getMeasuredHeight() + margin; @@ -766,7 +766,7 @@ public class LinearLayout extends ViewGroup { alternativeMaxHeight = Math.max(alternativeMaxHeight, matchHeightLocally ? margin : childHeight); - allFillParent = allFillParent && lp.height == LayoutParams.FILL_PARENT; + allFillParent = allFillParent && lp.height == LayoutParams.MATCH_PARENT; if (baselineAligned) { final int childBaseline = child.getBaseline(); @@ -832,7 +832,7 @@ public class LinearLayout extends ViewGroup { if (child.getVisibility() != GONE) { LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) child.getLayoutParams(); - if (lp.height == LayoutParams.FILL_PARENT) { + if (lp.height == LayoutParams.MATCH_PARENT) { // Temporarily force children to reuse their old measured width // FIXME: this may not be right for something like wrapping text? int oldWidth = lp.width; @@ -1065,7 +1065,7 @@ public class LinearLayout extends ViewGroup { final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) child.getLayoutParams(); - if (baselineAligned && lp.height != LayoutParams.FILL_PARENT) { + if (baselineAligned && lp.height != LayoutParams.MATCH_PARENT) { childBaseline = child.getBaseline(); } @@ -1199,7 +1199,7 @@ public class LinearLayout extends ViewGroup { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT} + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT} * and a height of {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} * when the layout's orientation is {@link #VERTICAL}. When the orientation is * {@link #HORIZONTAL}, the width is set to {@link LayoutParams#WRAP_CONTENT} @@ -1210,7 +1210,7 @@ public class LinearLayout extends ViewGroup { if (mOrientation == HORIZONTAL) { return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); } else if (mOrientation == VERTICAL) { - return new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); + return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); } return null; } @@ -1290,9 +1290,9 @@ public class LinearLayout extends ViewGroup { * Creates a new set of layout parameters with the specified width, height * and weight. * - * @param width the width, either {@link #FILL_PARENT}, + * @param width the width, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels - * @param height the height, either {@link #FILL_PARENT}, + * @param height the height, either {@link #MATCH_PARENT}, * {@link #WRAP_CONTENT} or a fixed size in pixels * @param weight the weight */ diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index f4008f92d31a..c63774ab8a27 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -1067,7 +1067,7 @@ public class ListView extends AbsListView { private void measureScrapChild(View child, int position, int widthMeasureSpec) { LayoutParams p = (LayoutParams) child.getLayoutParams(); if (p == null) { - p = new LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); child.setLayoutParams(p); } @@ -1702,7 +1702,7 @@ public class ListView extends AbsListView { // noinspection unchecked AbsListView.LayoutParams p = (AbsListView.LayoutParams) child.getLayoutParams(); if (p == null) { - p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + p = new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0); } p.viewType = mAdapter.getItemViewType(position); @@ -2388,7 +2388,7 @@ public class ListView extends AbsListView { ViewGroup.LayoutParams p = child.getLayoutParams(); if (p == null) { p = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); } diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index 446a992595ca..c246c247a53e 100644 --- a/core/java/android/widget/MediaController.java +++ b/core/java/android/widget/MediaController.java @@ -167,8 +167,8 @@ public class MediaController extends FrameLayout { mAnchor = view; FrameLayout.LayoutParams frameParams = new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT ); removeAllViews(); diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index e4cc6090bc8e..d20ab3beadf6 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -569,7 +569,7 @@ public class PopupWindow { * the current width or height is requested as an explicit size from * the window manager. You can supply * {@link ViewGroup.LayoutParams#WRAP_CONTENT} or - * {@link ViewGroup.LayoutParams#FILL_PARENT} to have that measure + * {@link ViewGroup.LayoutParams#MATCH_PARENT} to have that measure * spec supplied instead, replacing the absolute width and height that * has been set in the popup.</p> * @@ -578,11 +578,11 @@ public class PopupWindow { * * @param widthSpec an explicit width measure spec mode, either * {@link ViewGroup.LayoutParams#WRAP_CONTENT}, - * {@link ViewGroup.LayoutParams#FILL_PARENT}, or 0 to use the absolute + * {@link ViewGroup.LayoutParams#MATCH_PARENT}, or 0 to use the absolute * width. * @param heightSpec an explicit height measure spec mode, either * {@link ViewGroup.LayoutParams#WRAP_CONTENT}, - * {@link ViewGroup.LayoutParams#FILL_PARENT}, or 0 to use the absolute + * {@link ViewGroup.LayoutParams#MATCH_PARENT}, or 0 to use the absolute * height. */ public void setWindowLayoutMode(int widthSpec, int heightSpec) { @@ -785,7 +785,7 @@ public class PopupWindow { if (mBackground != null) { final ViewGroup.LayoutParams layoutParams = mContentView.getLayoutParams(); - int height = ViewGroup.LayoutParams.FILL_PARENT; + int height = ViewGroup.LayoutParams.MATCH_PARENT; if (layoutParams != null && layoutParams.height == ViewGroup.LayoutParams.WRAP_CONTENT) { height = ViewGroup.LayoutParams.WRAP_CONTENT; @@ -795,7 +795,7 @@ public class PopupWindow { // within another view that owns the background drawable PopupViewContainer popupViewContainer = new PopupViewContainer(mContext); PopupViewContainer.LayoutParams listParams = new PopupViewContainer.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, height + ViewGroup.LayoutParams.MATCH_PARENT, height ); popupViewContainer.setBackgroundDrawable(mBackground); popupViewContainer.addView(mContentView, listParams); diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 533c60716bf0..fad994b12a0a 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -560,7 +560,7 @@ public class RelativeLayout extends ViewGroup { mPaddingLeft, mPaddingRight, myWidth); int childHeightMeasureSpec; - if (params.width == LayoutParams.FILL_PARENT) { + if (params.width == LayoutParams.MATCH_PARENT) { childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(myHeight, MeasureSpec.EXACTLY); } else { childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(myHeight, MeasureSpec.AT_MOST); @@ -622,7 +622,7 @@ public class RelativeLayout extends ViewGroup { // We can grow in this dimension. childSpecSize = childSize; } - } else if (childSize == LayoutParams.FILL_PARENT) { + } else if (childSize == LayoutParams.MATCH_PARENT) { // Child wanted to be as big as possible. Give all availble // space childSpecMode = MeasureSpec.EXACTLY; diff --git a/core/java/android/widget/SlidingDrawer.java b/core/java/android/widget/SlidingDrawer.java index f70674430135..11d72de84dfb 100644 --- a/core/java/android/widget/SlidingDrawer.java +++ b/core/java/android/widget/SlidingDrawer.java @@ -43,7 +43,7 @@ import android.view.accessibility.AccessibilityEvent; * SlidingDrawer should be used as an overlay inside layouts. This means SlidingDrawer * should only be used inside of a FrameLayout or a RelativeLayout for instance. The * size of the SlidingDrawer defines how much space the content will occupy once slid - * out so SlidingDrawer should usually use fill_parent for both its dimensions. + * out so SlidingDrawer should usually use match_parent for both its dimensions. * * Inside an XML layout, SlidingDrawer must define the id of the handle and of the * content: @@ -51,8 +51,8 @@ import android.view.accessibility.AccessibilityEvent; * <pre class="prettyprint"> * <SlidingDrawer * android:id="@+id/drawer" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" + * android:layout_width="match_parent" + * android:layout_height="match_parent" * * android:handle="@+id/handle" * android:content="@+id/content"> @@ -64,8 +64,8 @@ import android.view.accessibility.AccessibilityEvent; * * <GridView * android:id="@id/content" - * android:layout_width="fill_parent" - * android:layout_height="fill_parent" /> + * android:layout_width="match_parent" + * android:layout_height="match_parent" /> * * </SlidingDrawer> * </pre> diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java index 412f817353a9..78e2fee3b4d2 100644 --- a/core/java/android/widget/TabHost.java +++ b/core/java/android/widget/TabHost.java @@ -327,8 +327,8 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); .addView( mCurrentView, new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); } if (!mTabWidget.hasFocus()) { diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index c12d098ba666..aa47e6daaf4e 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -16,8 +16,6 @@ package android.widget; -import com.android.internal.R; - import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -26,7 +24,6 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.View.OnFocusChangeListener; @@ -313,7 +310,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { if (child.getLayoutParams() == null) { final LinearLayout.LayoutParams lp = new LayoutParams( 0, - ViewGroup.LayoutParams.FILL_PARENT, 1.0f); + ViewGroup.LayoutParams.MATCH_PARENT, 1.0f); lp.setMargins(0, 0, 0, 0); child.setLayoutParams(lp); } @@ -328,7 +325,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { ImageView divider = new ImageView(mContext); final LinearLayout.LayoutParams lp = new LayoutParams( mDividerDrawable.getIntrinsicWidth(), - LayoutParams.FILL_PARENT); + LayoutParams.MATCH_PARENT); lp.setMargins(0, 0, 0, 0); divider.setLayoutParams(lp); divider.setBackgroundDrawable(mDividerDrawable); diff --git a/core/java/android/widget/TableLayout.java b/core/java/android/widget/TableLayout.java index afa2f3b2faee..66500a33227d 100644 --- a/core/java/android/widget/TableLayout.java +++ b/core/java/android/widget/TableLayout.java @@ -52,7 +52,7 @@ import java.util.regex.Pattern; * {@link #setColumnCollapsed(int,boolean) setColumnCollapsed()}.</p> * * <p>The children of a TableLayout cannot specify the <code>layout_width</code> - * attribute. Width is always <code>FILL_PARENT</code>. However, the + * attribute. Width is always <code>MATCH_PARENT</code>. However, the * <code>layout_height</code> attribute can be defined by a child; default value * is {@link android.widget.TableLayout.LayoutParams#WRAP_CONTENT}. If the child * is a {@link android.widget.TableRow}, then the height is always @@ -621,7 +621,7 @@ public class TableLayout extends LinearLayout { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}, + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}, * and a height of {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}. */ @Override @@ -647,7 +647,7 @@ public class TableLayout extends LinearLayout { /** * <p>This set of layout parameters enforces the width of each child to be - * {@link #FILL_PARENT} and the height of each child to be + * {@link #MATCH_PARENT} and the height of each child to be * {@link #WRAP_CONTENT}, but only if the height is not specified.</p> */ @SuppressWarnings({"UnusedDeclaration"}) @@ -663,14 +663,14 @@ public class TableLayout extends LinearLayout { * {@inheritDoc} */ public LayoutParams(int w, int h) { - super(FILL_PARENT, h); + super(MATCH_PARENT, h); } /** * {@inheritDoc} */ public LayoutParams(int w, int h, float initWeight) { - super(FILL_PARENT, h, initWeight); + super(MATCH_PARENT, h, initWeight); } /** @@ -679,7 +679,7 @@ public class TableLayout extends LinearLayout { * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}.</p> */ public LayoutParams() { - super(FILL_PARENT, WRAP_CONTENT); + super(MATCH_PARENT, WRAP_CONTENT); } /** @@ -698,7 +698,7 @@ public class TableLayout extends LinearLayout { /** * <p>Fixes the row's width to - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}; the row's + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}; the row's * height is fixed to * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} if no layout * height is specified.</p> @@ -710,7 +710,7 @@ public class TableLayout extends LinearLayout { @Override protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr) { - this.width = FILL_PARENT; + this.width = MATCH_PARENT; if (a.hasValue(heightAttr)) { this.height = a.getLayoutDimension(heightAttr, "layout_height"); } else { diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java index 5628cab9d313..abf08bfed273 100644 --- a/core/java/android/widget/TableRow.java +++ b/core/java/android/widget/TableRow.java @@ -35,7 +35,7 @@ import android.view.ViewDebug; * <p>The children of a TableRow do not need to specify the * <code>layout_width</code> and <code>layout_height</code> attributes in the * XML file. TableRow always enforces those values to be respectively - * {@link android.widget.TableLayout.LayoutParams#FILL_PARENT} and + * {@link android.widget.TableLayout.LayoutParams#MATCH_PARENT} and * {@link android.widget.TableLayout.LayoutParams#WRAP_CONTENT}.</p> * * <p> @@ -299,7 +299,7 @@ public class TableRow extends LinearLayout { case LayoutParams.WRAP_CONTENT: spec = getChildMeasureSpec(widthMeasureSpec, 0, LayoutParams.WRAP_CONTENT); break; - case LayoutParams.FILL_PARENT: + case LayoutParams.MATCH_PARENT: spec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); break; default: @@ -351,7 +351,7 @@ public class TableRow extends LinearLayout { /** * Returns a set of layout parameters with a width of - * {@link android.view.ViewGroup.LayoutParams#FILL_PARENT}, + * {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}, * a height of {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} and no spanning. */ @Override @@ -451,7 +451,7 @@ public class TableRow extends LinearLayout { * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}.</p> */ public LayoutParams() { - super(FILL_PARENT, WRAP_CONTENT); + super(MATCH_PARENT, WRAP_CONTENT); column = -1; span = 1; } @@ -459,7 +459,7 @@ public class TableRow extends LinearLayout { /** * <p>Puts the view in the specified column.</p> * - * <p>Sets the child width to {@link android.view.ViewGroup.LayoutParams#FILL_PARENT} + * <p>Sets the child width to {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT} * and the child height to * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT}.</p> * @@ -490,7 +490,7 @@ public class TableRow extends LinearLayout { if (a.hasValue(widthAttr)) { width = a.getLayoutDimension(widthAttr, "layout_width"); } else { - width = FILL_PARENT; + width = MATCH_PARENT; } // We don't want to force users to specify a layout_height diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 455b5932f90a..12e8e298aa8b 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4992,7 +4992,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener final int height = mLayoutParams.height; // If the size of the view does not depend on the size of the text, try to // start the marquee immediately - if (height != LayoutParams.WRAP_CONTENT && height != LayoutParams.FILL_PARENT) { + if (height != LayoutParams.WRAP_CONTENT && height != LayoutParams.MATCH_PARENT) { startMarquee(); } else { // Defer the start of the marquee until we know our width (see setFrame()) @@ -5307,7 +5307,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (desiredHeight != this.getHeight()) { sizeChanged = true; } - } else if (mLayoutParams.height == LayoutParams.FILL_PARENT) { + } else if (mLayoutParams.height == LayoutParams.MATCH_PARENT) { if (mDesiredHeightAtMeasure >= 0) { int desiredHeight = getDesiredHeight(); @@ -5354,7 +5354,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (mEllipsize != TextUtils.TruncateAt.MARQUEE) { // In a fixed-height view, so use our new text layout. if (mLayoutParams.height != LayoutParams.WRAP_CONTENT && - mLayoutParams.height != LayoutParams.FILL_PARENT) { + mLayoutParams.height != LayoutParams.MATCH_PARENT) { invalidate(); return; } diff --git a/core/java/android/widget/ViewSwitcher.java b/core/java/android/widget/ViewSwitcher.java index 0dcaf954279e..71ae6249cd93 100644 --- a/core/java/android/widget/ViewSwitcher.java +++ b/core/java/android/widget/ViewSwitcher.java @@ -80,7 +80,7 @@ public class ViewSwitcher extends ViewAnimator { View child = mFactory.makeView(); LayoutParams lp = (LayoutParams) child.getLayoutParams(); if (lp == null) { - lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); + lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); } addView(child, lp); return child; diff --git a/core/java/android/widget/ZoomButtonsController.java b/core/java/android/widget/ZoomButtonsController.java index e55fbb8c062e..bea009c0d5ca 100644 --- a/core/java/android/widget/ZoomButtonsController.java +++ b/core/java/android/widget/ZoomButtonsController.java @@ -247,7 +247,7 @@ public class ZoomButtonsController implements View.OnTouchListener { LayoutParams.FLAG_LAYOUT_NO_LIMITS | LayoutParams.FLAG_ALT_FOCUSABLE_IM; lp.height = LayoutParams.WRAP_CONTENT; - lp.width = LayoutParams.FILL_PARENT; + lp.width = LayoutParams.MATCH_PARENT; lp.type = LayoutParams.TYPE_APPLICATION_PANEL; lp.format = PixelFormat.TRANSLUCENT; lp.windowAnimations = com.android.internal.R.style.Animation_ZoomButtons; diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index 57dbb449288f..f56b15c9ebd7 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -16,7 +16,7 @@ package com.android.internal.app; -import static android.view.ViewGroup.LayoutParams.FILL_PARENT; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -361,7 +361,7 @@ public class AlertController { if (mView != null) { customPanel = (FrameLayout) mWindow.findViewById(R.id.customPanel); FrameLayout custom = (FrameLayout) mWindow.findViewById(R.id.custom); - custom.addView(mView, new LayoutParams(FILL_PARENT, FILL_PARENT)); + custom.addView(mView, new LayoutParams(MATCH_PARENT, MATCH_PARENT)); if (mViewSpacingSpecified) { custom.setPadding(mViewSpacingLeft, mViewSpacingTop, mViewSpacingRight, mViewSpacingBottom); @@ -391,7 +391,7 @@ public class AlertController { if (mCustomTitleView != null) { // Add the custom title view directly to the topPanel layout LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); topPanel.addView(mCustomTitleView, lp); @@ -460,8 +460,8 @@ public class AlertController { if (mListView != null) { contentPanel.removeView(mWindow.findViewById(R.id.scrollView)); contentPanel.addView(mListView, - new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT)); - contentPanel.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, 0, 1.0f)); + new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)); + contentPanel.setLayoutParams(new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1.0f)); } else { contentPanel.setVisibility(View.GONE); } @@ -657,8 +657,8 @@ public class AlertController { ViewGroup parent = (ViewGroup) mWindow.findViewById(R.id.parentPanel); parent.removeView(buttonPanel); AbsListView.LayoutParams params = new AbsListView.LayoutParams( - AbsListView.LayoutParams.FILL_PARENT, - AbsListView.LayoutParams.FILL_PARENT); + AbsListView.LayoutParams.MATCH_PARENT, + AbsListView.LayoutParams.MATCH_PARENT); buttonPanel.setLayoutParams(params); mListView.addFooterView(buttonPanel); */ diff --git a/core/java/com/android/internal/view/menu/IconMenuItemView.java b/core/java/com/android/internal/view/menu/IconMenuItemView.java index 66e15c1c28b9..3c5b422a4a42 100644 --- a/core/java/com/android/internal/view/menu/IconMenuItemView.java +++ b/core/java/com/android/internal/view/menu/IconMenuItemView.java @@ -254,7 +254,7 @@ public final class IconMenuItemView extends TextView implements MenuView.ItemVie if (lp == null) { // Default layout parameters lp = new IconMenuView.LayoutParams( - IconMenuView.LayoutParams.FILL_PARENT, IconMenuView.LayoutParams.FILL_PARENT); + IconMenuView.LayoutParams.MATCH_PARENT, IconMenuView.LayoutParams.MATCH_PARENT); } // Set the desired width of item diff --git a/core/java/com/android/internal/widget/SlidingTab.java b/core/java/com/android/internal/widget/SlidingTab.java index f07b2f1092f6..adafbb41399b 100644 --- a/core/java/com/android/internal/widget/SlidingTab.java +++ b/core/java/com/android/internal/widget/SlidingTab.java @@ -23,8 +23,6 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.os.Handler; -import android.os.Message; import android.os.Vibrator; import android.util.AttributeSet; import android.util.Log; @@ -34,7 +32,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; -import android.view.animation.AnimationSet; import android.view.animation.LinearInterpolator; import android.view.animation.TranslateAnimation; import android.view.animation.Animation.AnimationListener; @@ -214,7 +211,7 @@ public class SlidingTab extends ViewGroup { // Create hint TextView text = new TextView(parent.getContext()); text.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, - LayoutParams.FILL_PARENT)); + LayoutParams.MATCH_PARENT)); text.setBackgroundResource(barId); text.setTextAppearance(parent.getContext(), R.style.TextAppearance_SlidingTabNormal); // hint.setSingleLine(); // Hmm.. this causes the text to disappear off-screen diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 11463a2f944c..64ee4f0c9881 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -328,7 +328,7 @@ static void android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobj static void android_hardware_Camera_release(JNIEnv *env, jobject thiz) { // TODO: Change to LOGV - LOGD("release camera"); + LOGV("release camera"); JNICameraContext* context = NULL; sp<Camera> camera; { @@ -526,7 +526,7 @@ static void android_hardware_Camera_unlock(JNIEnv *env, jobject thiz) static void android_hardware_Camera_startSmoothZoom(JNIEnv *env, jobject thiz, jint value) { - LOGD("startSmoothZoom"); + LOGV("startSmoothZoom"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; @@ -537,7 +537,7 @@ static void android_hardware_Camera_startSmoothZoom(JNIEnv *env, jobject thiz, j static void android_hardware_Camera_stopSmoothZoom(JNIEnv *env, jobject thiz) { - LOGD("stopSmoothZoom"); + LOGV("stopSmoothZoom"); sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index 3e27978ec02e..9a90b72fe50a 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "SensorManager" -#define LOG_NDEBUG 0 #include "utils/Log.h" #include <hardware/sensors.h> diff --git a/core/res/res/drawable-hdpi/search_source_selector_indicator.png b/core/res/res/drawable-hdpi/search_source_selector_indicator.png Binary files differnew file mode 100644 index 000000000000..b93a0c0bbfb3 --- /dev/null +++ b/core/res/res/drawable-hdpi/search_source_selector_indicator.png diff --git a/core/res/res/drawable-mdpi/search_source_selector_indicator.png b/core/res/res/drawable-mdpi/search_source_selector_indicator.png Binary files differnew file mode 100644 index 000000000000..26bf18a68870 --- /dev/null +++ b/core/res/res/drawable-mdpi/search_source_selector_indicator.png diff --git a/core/res/res/drawable/search_source_selector_background.xml b/core/res/res/drawable/search_source_selector_background.xml new file mode 100644 index 000000000000..fcacd892f3b7 --- /dev/null +++ b/core/res/res/drawable/search_source_selector_background.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <!-- TODO: Need focused and pressed backgrounds --> + +</selector> diff --git a/core/res/res/layout-ja/contact_header_name.xml b/core/res/res/layout-ja/contact_header_name.xml index 7c0f63e5b751..39d559315f33 100644 --- a/core/res/res/layout-ja/contact_header_name.xml +++ b/core/res/res/layout-ja/contact_header_name.xml @@ -20,11 +20,11 @@ android:orientation="vertical" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent"> + android:layout_height="match_parent"> <TextView android:id="@+id/name" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:singleLine="true" android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceMedium" diff --git a/core/res/res/layout-land/icon_menu_layout.xml b/core/res/res/layout-land/icon_menu_layout.xml index d1b25d91382d..58f7bfb9af14 100644 --- a/core/res/res/layout-land/icon_menu_layout.xml +++ b/core/res/res/layout-land/icon_menu_layout.xml @@ -16,7 +16,7 @@ <com.android.internal.view.menu.IconMenuView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/icon_menu" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:rowHeight="65dip" android:maxItems="6" diff --git a/core/res/res/layout-port/icon_menu_layout.xml b/core/res/res/layout-port/icon_menu_layout.xml index 08edfcc20dce..c84f7d2bce5f 100644 --- a/core/res/res/layout-port/icon_menu_layout.xml +++ b/core/res/res/layout-port/icon_menu_layout.xml @@ -16,7 +16,7 @@ <com.android.internal.view.menu.IconMenuView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/icon_menu" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:rowHeight="65dip" android:maxItems="6" diff --git a/core/res/res/layout/activity_list.xml b/core/res/res/layout/activity_list.xml index 2967f0f269f8..f489ab76382c 100644 --- a/core/res/res/layout/activity_list.xml +++ b/core/res/res/layout/activity_list.xml @@ -15,20 +15,20 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <ListView android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <TextView android:id="@android:id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" android:text="@string/activity_list_empty" android:visibility="gone" diff --git a/core/res/res/layout/activity_list_item.xml b/core/res/res/layout/activity_list_item.xml index 7a2a0e289122..25d95fd74e5d 100644 --- a/core/res/res/layout/activity_list_item.xml +++ b/core/res/res/layout/activity_list_item.xml @@ -18,7 +18,7 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="1dip" android:paddingBottom="1dip" diff --git a/core/res/res/layout/activity_list_item_2.xml b/core/res/res/layout/activity_list_item_2.xml index 78eca026c241..e937d7bc1d21 100644 --- a/core/res/res/layout/activity_list_item_2.xml +++ b/core/res/res/layout/activity_list_item_2.xml @@ -15,7 +15,7 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/alert_dialog.xml b/core/res/res/layout/alert_dialog.xml index 40e3f42e0ae2..409dcd310f7f 100644 --- a/core/res/res/layout/alert_dialog.xml +++ b/core/res/res/layout/alert_dialog.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingTop="9dip" @@ -30,12 +30,12 @@ > <LinearLayout android:id="@+id/topPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="54dip" android:orientation="vertical"> <LinearLayout android:id="@+id/title_template" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" @@ -54,11 +54,11 @@ style="?android:attr/textAppearanceLarge" android:singleLine="true" android:ellipsize="end" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> <ImageView android:id="@+id/titleDivider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:visibility="gone" android:scaleType="fitXY" @@ -68,12 +68,12 @@ </LinearLayout> <LinearLayout android:id="@+id/contentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical"> <ScrollView android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="2dip" android:paddingBottom="12dip" @@ -81,30 +81,30 @@ android:paddingRight="10dip"> <TextView android:id="@+id/message" style="?android:attr/textAppearanceMedium" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="5dip" /> </ScrollView> </LinearLayout> <FrameLayout android:id="@+id/customPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1"> <FrameLayout android:id="@+android:id/custom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="5dip" android:paddingBottom="5dip" /> </FrameLayout> <LinearLayout android:id="@+id/buttonPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="54dip" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="4dip" diff --git a/core/res/res/layout/alert_dialog_progress.xml b/core/res/res/layout/alert_dialog_progress.xml index d2bb691c36c2..c51969292564 100644 --- a/core/res/res/layout/alert_dialog_progress.xml +++ b/core/res/res/layout/alert_dialog_progress.xml @@ -15,10 +15,10 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" android:layout_height="fill_parent"> + android:layout_width="wrap_content" android:layout_height="match_parent"> <ProgressBar android:id="@+id/progress" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dip" android:layout_marginBottom="1dip" diff --git a/core/res/res/layout/always_use_checkbox.xml b/core/res/res/layout/always_use_checkbox.xml index 1f8d256d3712..baa4bee88066 100644 --- a/core/res/res/layout/always_use_checkbox.xml +++ b/core/res/res/layout/always_use_checkbox.xml @@ -18,7 +18,7 @@ to make their selection the preferred activity. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="14dip" android:paddingRight="15dip" diff --git a/core/res/res/layout/app_permission_item.xml b/core/res/res/layout/app_permission_item.xml index 8db4dd79e825..1bd267f43cb4 100644 --- a/core/res/res/layout/app_permission_item.xml +++ b/core/res/res/layout/app_permission_item.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView diff --git a/core/res/res/layout/app_perms_summary.xml b/core/res/res/layout/app_perms_summary.xml index 009eb8f11994..716074317987 100755 --- a/core/res/res/layout/app_perms_summary.xml +++ b/core/res/res/layout/app_perms_summary.xml @@ -18,8 +18,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical"> <TextView @@ -36,7 +36,7 @@ <LinearLayout android:id="@+id/dangerous_perms_list" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:paddingLeft="16dip" android:paddingRight="12dip" android:layout_height="wrap_content" /> @@ -45,20 +45,20 @@ <LinearLayout android:id="@+id/show_more" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" android:layout_marginTop="12dip" android:layout_marginBottom="16dip"> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dip" android:layout_marginBottom="12dip" @@ -77,13 +77,13 @@ android:layout_alignTop="@id/show_more_icon" android:layout_gravity="center_vertical" android:paddingLeft="6dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> @@ -95,7 +95,7 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout/auto_complete_list.xml b/core/res/res/layout/auto_complete_list.xml index addda111a5ff..8ad5dbb42ede 100644 --- a/core/res/res/layout/auto_complete_list.xml +++ b/core/res/res/layout/auto_complete_list.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:drawable/edit_text" android:divider="@android:drawable/divider_horizontal_textfield" @@ -25,14 +25,14 @@ <LinearLayout android:id="@+id/container" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingRight="0dip" /> <AutoCompleteTextView android:id="@+id/edit" android:completionThreshold="1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_gravity="center_vertical" diff --git a/core/res/res/layout/battery_low.xml b/core/res/res/layout/battery_low.xml index 116eae7c4711..3b62fb0c78de 100644 --- a/core/res/res/layout/battery_low.xml +++ b/core/res/res/layout/battery_low.xml @@ -25,7 +25,7 @@ > <TextView android:id="@+id/subtitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18dp" android:paddingLeft="19dp" @@ -35,7 +35,7 @@ /> <TextView android:id="@+id/level_percent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18dp" android:textColor="#ffffffff" diff --git a/core/res/res/layout/battery_status.xml b/core/res/res/layout/battery_status.xml index 8b9828cca594..7cfec0546507 100644 --- a/core/res/res/layout/battery_status.xml +++ b/core/res/res/layout/battery_status.xml @@ -32,13 +32,13 @@ <LinearLayout android:id="@+id/meter" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="15dip" /> <ImageView @@ -55,8 +55,8 @@ </LinearLayout> <TextView android:id="@+id/level_percent" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textStyle="bold" android:textSize="48dp" android:textColor="#ffffffff" diff --git a/core/res/res/layout/character_picker.xml b/core/res/res/layout/character_picker.xml index 70867d076b00..2508f72e6a61 100644 --- a/core/res/res/layout/character_picker.xml +++ b/core/res/res/layout/character_picker.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="304dp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:background="@drawable/keyboard_popup_panel_trans_background"> <GridView diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml index d551a26648cc..128adc542891 100644 --- a/core/res/res/layout/contact_header.xml +++ b/core/res/res/layout/contact_header.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/banner" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:background="@drawable/title_bar_medium" android:paddingRight="5dip"> @@ -37,7 +37,7 @@ android:layout_gravity="center_vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -56,7 +56,7 @@ </LinearLayout> <TextView android:id="@+id/status" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:singleLine="true" @@ -65,7 +65,7 @@ /> <TextView android:id="@+id/status_date" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/core/res/res/layout/contact_header_name.xml b/core/res/res/layout/contact_header_name.xml index 4a532529f040..24db2f28825b 100644 --- a/core/res/res/layout/contact_header_name.xml +++ b/core/res/res/layout/contact_header_name.xml @@ -17,7 +17,7 @@ <!-- In the default locale, the "Name" field is a single TextView --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/name" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" diff --git a/core/res/res/layout/dialog_custom_title.xml b/core/res/res/layout/dialog_custom_title.xml index 68578f51d78d..e52fba67e7a0 100644 --- a/core/res/res/layout/dialog_custom_title.xml +++ b/core/res/res/layout/dialog_custom_title.xml @@ -22,19 +22,19 @@ This is an custom layout for a dialog. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout android:id="@android:id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="24dip" android:layout_weight="0" style="?android:attr/windowTitleBackgroundStyle"> </FrameLayout> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingTop="6dip" android:paddingBottom="10dip" android:paddingLeft="10dip" diff --git a/core/res/res/layout/dialog_title.xml b/core/res/res/layout/dialog_title.xml index 8cfc716f6e84..949f86efbda6 100644 --- a/core/res/res/layout/dialog_title.xml +++ b/core/res/res/layout/dialog_title.xml @@ -25,7 +25,7 @@ enabled. android:orientation="vertical" android:fitsSystemWindows="true"> <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="53dip" android:paddingTop="9dip" @@ -33,13 +33,13 @@ enabled. android:paddingLeft="10dip" android:paddingRight="10dip" /> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> </LinearLayout> diff --git a/core/res/res/layout/dialog_title_icons.xml b/core/res/res/layout/dialog_title_icons.xml index 7c3f2745816c..0ca67066f967 100644 --- a/core/res/res/layout/dialog_title_icons.xml +++ b/core/res/res/layout/dialog_title_icons.xml @@ -24,7 +24,7 @@ enabled. android:fitsSystemWindows="true"> <LinearLayout android:id="@+id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" @@ -57,13 +57,13 @@ enabled. </LinearLayout> <FrameLayout - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> </LinearLayout> diff --git a/core/res/res/layout/expandable_list_content.xml b/core/res/res/layout/expandable_list_content.xml index 05d74a662eec..4ed905ccc6e9 100644 --- a/core/res/res/layout/expandable_list_content.xml +++ b/core/res/res/layout/expandable_list_content.xml @@ -19,6 +19,6 @@ --> <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> diff --git a/core/res/res/layout/global_actions_item.xml b/core/res/res/layout/global_actions_item.xml index 63bb0f457d3f..68fe96053faa 100644 --- a/core/res/res/layout/global_actions_item.xml +++ b/core/res/res/layout/global_actions_item.xml @@ -15,7 +15,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingLeft="11dip" @@ -25,7 +25,7 @@ <ImageView android:id="@+id/icon" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentTop="true" android:layout_alignParentBottom="true" android:layout_marginRight="9dip" @@ -33,7 +33,7 @@ <TextView android:id="@+id/status" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="26dip" android:layout_toRightOf="@id/icon" @@ -45,7 +45,7 @@ <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_toRightOf="@id/icon" diff --git a/core/res/res/layout/google_web_content_helper_layout.xml b/core/res/res/layout/google_web_content_helper_layout.xml index 546c4586bcc2..f16ffc9e8863 100644 --- a/core/res/res/layout/google_web_content_helper_layout.xml +++ b/core/res/res/layout/google_web_content_helper_layout.xml @@ -43,8 +43,8 @@ <WebView android:id="@+id/web" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:visibility="invisible" /> diff --git a/core/res/res/layout/grant_credentials_permission.xml b/core/res/res/layout/grant_credentials_permission.xml index 84b66230358f..4133ea94335b 100644 --- a/core/res/res/layout/grant_credentials_permission.xml +++ b/core/res/res/layout/grant_credentials_permission.xml @@ -20,13 +20,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- The header --> <TextView android:id="@+id/header_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/white" @@ -43,7 +43,7 @@ <!-- The list of packages that correspond to the requesting UID and the account/authtokenType that is being requested --> <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:fillViewport="true" android:layout_weight="1" @@ -51,8 +51,8 @@ android:foreground="@drawable/title_bar_shadow"> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingTop="14dip" android:orientation="vertical"> @@ -70,13 +70,13 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <RelativeLayout android:paddingLeft="16dip" android:paddingRight="12dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView @@ -137,7 +137,7 @@ <!-- The buttons to allow or deny --> <LinearLayout android:id="@+id/buttons" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="52dip" android:background="@drawable/bottom_bar" android:paddingTop="4dip" diff --git a/core/res/res/layout/icon_menu_item_layout.xml b/core/res/res/layout/icon_menu_item_layout.xml index c6d94960f2b0..a73dccc2d75c 100644 --- a/core/res/res/layout/icon_menu_item_layout.xml +++ b/core/res/res/layout/icon_menu_item_layout.xml @@ -16,8 +16,8 @@ <com.android.internal.view.menu.IconMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/title" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingBottom="1dip" android:paddingLeft="3dip" android:paddingRight="3dip" diff --git a/core/res/res/layout/input_method.xml b/core/res/res/layout/input_method.xml index 1a701e9cc09a..f80d62876c26 100644 --- a/core/res/res/layout/input_method.xml +++ b/core/res/res/layout/input_method.xml @@ -20,27 +20,27 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parentPanel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout android:id="@+id/fullscreenArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <FrameLayout android:id="@android:id/extractArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" android:visibility="gone"> </FrameLayout> <FrameLayout android:id="@android:id/candidatesArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="invisible"> </FrameLayout> @@ -48,7 +48,7 @@ </LinearLayout> <FrameLayout android:id="@android:id/inputArea" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone"> </FrameLayout> diff --git a/core/res/res/layout/input_method_extract_view.xml b/core/res/res/layout/input_method_extract_view.xml index 1244c1daa1b7..689ba7bf524f 100644 --- a/core/res/res/layout/input_method_extract_view.xml +++ b/core/res/res/layout/input_method_extract_view.xml @@ -25,7 +25,7 @@ <android.inputmethodservice.ExtractEditText android:id="@+id/inputExtractEditText" android:layout_width="0px" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:scrollbars="vertical" android:gravity="top" @@ -38,7 +38,7 @@ <FrameLayout android:id="@+id/inputExtractAccessories" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:paddingLeft="10dip" android:paddingRight="10dip" android:background="@android:drawable/keyboard_accessory_bg_landscape" diff --git a/core/res/res/layout/js_prompt.xml b/core/res/res/layout/js_prompt.xml index 86974ba860df..d80fbc8e854e 100644 --- a/core/res/res/layout/js_prompt.xml +++ b/core/res/res/layout/js_prompt.xml @@ -16,18 +16,18 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" > <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <EditText android:id="@+id/value" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textStyle="bold" android:inputType="text" diff --git a/core/res/res/layout/keyboard_popup_keyboard.xml b/core/res/res/layout/keyboard_popup_keyboard.xml index 1092cc098ded..5eb273245aba 100644 --- a/core/res/res/layout/keyboard_popup_keyboard.xml +++ b/core/res/res/layout/keyboard_popup_keyboard.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:background="@android:drawable/keyboard_popup_panel_background" @@ -29,7 +29,7 @@ android:id="@android:id/keyboardView" android:background="@android:color/transparent" android:layout_alignParentBottom="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:keyPreviewLayout="@layout/keyboard_key_preview" android:popupLayout="@layout/keyboard_popup_keyboard" diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml index 6e00d11a167c..8a46546dee58 100644 --- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml +++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml @@ -17,24 +17,24 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:background="@android:color/background_dark" > <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" android:layout_above="@+id/emergencyCall"> <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <TextView android:id="@+id/topHeader" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_alignParentTop="true" android:layout_marginLeft="4dip" @@ -47,14 +47,14 @@ <!-- spacer below header --> <View android:id="@+id/spacerTop" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_below="@id/topHeader" android:background="@drawable/divider_horizontal_dark"/> <TextView android:id="@+id/instructions" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/spacerTop" android:layout_marginTop="8dip" @@ -65,7 +65,7 @@ <EditText android:id="@+id/login" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/instructions" android:layout_marginTop="8dip" @@ -77,7 +77,7 @@ <EditText android:id="@+id/password" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/login" android:layout_marginTop="15dip" @@ -106,7 +106,7 @@ <!-- spacer above emergency call --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginBottom="4dip" diff --git a/core/res/res/layout/keyguard_screen_lock.xml b/core/res/res/layout/keyguard_screen_lock.xml index b5fbace14861..6e4fa7df1f5b 100644 --- a/core/res/res/layout/keyguard_screen_lock.xml +++ b/core/res/res/layout/keyguard_screen_lock.xml @@ -24,13 +24,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:gravity="bottom" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginBottom="15dip" @@ -43,25 +43,25 @@ <!-- when sim is present --> <TextView android:id="@+id/headerSimOk1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <TextView android:id="@+id/headerSimOk2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <!-- when sim is missing / locked --> <TextView android:id="@+id/headerSimBad1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@android:string/lockscreen_missing_sim_message" android:textAppearance="?android:attr/textAppearanceLarge"/> <TextView android:id="@+id/headerSimBad2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="7dip" android:layout_marginBottom="7dip" @@ -71,27 +71,27 @@ <!-- spacer after carrier info / sim messages --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:background="@android:drawable/divider_horizontal_dark"/> <!-- time and date --> <TextView android:id="@+id/time" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="34sp"/> <TextView android:id="@+id/date" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:textSize="18sp"/> <!-- spacer after time and date --> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginBottom="8dip" android:background="@android:drawable/divider_horizontal_dark" @@ -100,7 +100,7 @@ <!-- battery info --> <LinearLayout android:id="@+id/batteryInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -124,7 +124,7 @@ <!-- spacer after battery info --> <View android:id="@+id/batteryInfoSpacer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -135,7 +135,7 @@ <LinearLayout android:id="@+id/nextAlarmInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -159,7 +159,7 @@ <!-- spacer after alarm info --> <View android:id="@+id/nextAlarmSpacer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -169,7 +169,7 @@ (shown when SIM card is present) --> <LinearLayout android:id="@+id/screenLockedInfo" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -195,7 +195,7 @@ <!-- message about how to unlock (shown when SIM card is present) --> <TextView android:id="@+id/lockInstructions" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="5dip" android:gravity="center" diff --git a/core/res/res/layout/keyguard_screen_rotary_unlock.xml b/core/res/res/layout/keyguard_screen_rotary_unlock.xml index 59b69cdddfee..8a7553cf98b8 100644 --- a/core/res/res/layout/keyguard_screen_rotary_unlock.xml +++ b/core/res/res/layout/keyguard_screen_rotary_unlock.xml @@ -22,14 +22,14 @@ depending on the state of the device. It is the same for landscape and portrait.--> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:id="@+id/root" > <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" > @@ -67,7 +67,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="10dip" android:layout_below="@id/date" @@ -114,7 +114,7 @@ robust for different screen sizes. On hvga, the widget should be flush with the bottom.--> <com.android.internal.widget.RotarySelector android:id="@+id/rotary" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_alignParentTop="true" diff --git a/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml b/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml index c503455fecbd..898aea60090d 100644 --- a/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_rotary_unlock_land.xml @@ -22,14 +22,14 @@ depending on the state of the device.--> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rotaryunlock="http://schemas.android.com/apk/res/com.android.rotaryunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:id="@+id/root" > <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" > @@ -37,7 +37,7 @@ <RelativeLayout android:orientation="vertical" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:gravity="center_horizontal" > @@ -76,7 +76,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="10dip" android:layout_below="@id/date" @@ -136,7 +136,7 @@ <com.android.internal.widget.RotarySelector android:id="@+id/rotary" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:orientation="vertical" /> diff --git a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml index 4c583d84eeb2..2fa7aaafd145 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml @@ -18,8 +18,8 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@android:color/background_dark" > @@ -27,7 +27,7 @@ <LinearLayout android:id="@+id/pinDisplayGroup" android:orientation="horizontal" android:layout_centerInParent="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true" android:gravity="center_vertical" @@ -41,7 +41,7 @@ <EditText android:id="@+id/pinDisplay" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:maxLines="1" android:background="@null" android:textSize="32sp" @@ -51,7 +51,7 @@ <ImageButton android:id="@+id/backspace" android:src="@android:drawable/ic_input_delete" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginTop="2dip" android:layout_marginRight="2dip" android:layout_marginBottom="2dip" @@ -73,7 +73,7 @@ <LinearLayout android:orientation="horizontal" android:layout_alignParentBottom="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dip" android:layout_marginLeft="8dip" diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml index 2a23ada6660b..dad994fdc729 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml @@ -17,20 +17,20 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:background="@android:color/background_dark" android:gravity="center_horizontal"> <LinearLayout android:id="@+id/topDisplayGroup" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <!-- header text ('Enter Pin Code') --> <TextView android:id="@+id/headerText" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:lines="2" @@ -38,7 +38,7 @@ <!-- password entry --> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginRight="6dip" @@ -70,14 +70,14 @@ <!-- Keypad section --> <LinearLayout android:id="@+id/keyPad" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/topDisplayGroup" android:layout_marginTop="10dip" android:orientation="vertical"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -85,7 +85,7 @@ <Button android:id="@+id/one" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -95,7 +95,7 @@ <Button android:id="@+id/two" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -105,7 +105,7 @@ <Button android:id="@+id/three" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -115,7 +115,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -123,7 +123,7 @@ <Button android:id="@+id/four" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -133,7 +133,7 @@ <Button android:id="@+id/five" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -143,7 +143,7 @@ <Button android:id="@+id/six" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -153,7 +153,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -161,7 +161,7 @@ <Button android:id="@+id/seven" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -171,7 +171,7 @@ <Button android:id="@+id/eight" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -181,7 +181,7 @@ <Button android:id="@+id/nine" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -191,7 +191,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -199,7 +199,7 @@ <Button android:id="@+id/ok" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -210,7 +210,7 @@ <Button android:id="@+id/zero" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -220,7 +220,7 @@ <Button android:id="@+id/cancel" android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" @@ -236,7 +236,7 @@ <!-- spacer below keypad --> <View android:id="@+id/spacerBottom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="6dip" android:layout_above="@id/emergencyCall" @@ -245,7 +245,7 @@ <!-- The emergency button should take the rest of the space and be centered vertically --> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:gravity="center" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 7e365fc9072a..f9566d8e8023 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -23,8 +23,8 @@ and portrait.--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" android:gravity="center_horizontal" android:id="@+id/root"> @@ -81,7 +81,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -141,7 +141,7 @@ <com.android.internal.widget.SlidingTab android:id="@+id/tab_selector" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginBottom="80dip" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index 33afe932d697..996555448f8e 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -22,8 +22,8 @@ depending on the state of the device.--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:background="#70000000" android:id="@+id/root"> @@ -31,7 +31,7 @@ <!-- left side --> <RelativeLayout android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginLeft="24dip" android:gravity="left"> @@ -82,7 +82,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -144,7 +144,7 @@ android:id="@+id/tab_selector" android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginRight="80dip" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index f8f326af7833..58f36ed67f0b 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -24,8 +24,8 @@ <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="#70000000" > @@ -33,7 +33,7 @@ <LinearLayout android:orientation="vertical" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginLeft="24dip" android:gravity="left" @@ -81,7 +81,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -136,20 +136,20 @@ <!-- fill space between header and button below --> <View android:layout_weight="1.0" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" /> <!-- footer --> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dip" > <!-- option 1: a single emergency call button --> <RelativeLayout android:id="@+id/footerNormal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="left" > @@ -166,18 +166,18 @@ <!-- option 2: an emergency call button, and a 'forgot pattern?' button --> <LinearLayout android:id="@+id/footerForgotPattern" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="left" > <Button android:id="@+id/forgotPattern" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/Widget.Button.Transparent" android:visibility="invisible" /> <Button android:id="@+id/emergencyCallTogether" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/lockscreen_emergency_call" style="@style/Widget.Button.Transparent" diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index d7c4aae96ca1..ac6cf194e793 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -23,14 +23,14 @@ <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center_horizontal" android:background="#70000000" > <RelativeLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <TextView @@ -70,7 +70,7 @@ <TextView android:id="@+id/am_pm" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="bottom" android:singleLine="true" android:ellipsize="none" @@ -98,7 +98,7 @@ <View android:id="@+id/divider" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="8dip" android:layout_marginBottom="8dip" @@ -109,7 +109,7 @@ status. --> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="0dip" android:layout_marginLeft="12dip" @@ -145,7 +145,7 @@ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:layout_marginTop="2dip" @@ -153,14 +153,14 @@ <!-- footer --> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <!-- option 1: a single emergency call button --> <RelativeLayout android:id="@+id/footerNormal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <Button android:id="@+id/emergencyCallAlone" android:layout_width="wrap_content" @@ -177,13 +177,13 @@ <!-- option 2: an emergency call button, and a 'forgot pattern?' button --> <LinearLayout android:id="@+id/footerForgotPattern" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" > <Button android:id="@+id/emergencyCallTogether" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" @@ -196,7 +196,7 @@ /> <Button android:id="@+id/forgotPattern" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1.0" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" diff --git a/core/res/res/layout/list_content.xml b/core/res/res/layout/list_content.xml index a7f3e2d79c9e..6f9f1e0f0f6f 100644 --- a/core/res/res/layout/list_content.xml +++ b/core/res/res/layout/list_content.xml @@ -18,7 +18,7 @@ */ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> diff --git a/core/res/res/layout/list_gestures_overlay.xml b/core/res/res/layout/list_gestures_overlay.xml index 54d72c8504e7..5ebf0924892c 100644 --- a/core/res/res/layout/list_gestures_overlay.xml +++ b/core/res/res/layout/list_gestures_overlay.xml @@ -15,5 +15,5 @@ --> <android.gesture.GestureOverlayView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> diff --git a/core/res/res/layout/list_menu_item_layout.xml b/core/res/res/layout/list_menu_item_layout.xml index df4958f9897b..39c88722ce47 100644 --- a/core/res/res/layout/list_menu_item_layout.xml +++ b/core/res/res/layout/list_menu_item_layout.xml @@ -15,7 +15,7 @@ --> <com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight"> <!-- Icon will be inserted here. --> @@ -32,7 +32,7 @@ <TextView android:id="@+id/title" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" diff --git a/core/res/res/layout/media_controller.xml b/core/res/res/layout/media_controller.xml index 32db60ac8299..f4a701e6e074 100644 --- a/core/res/res/layout/media_controller.xml +++ b/core/res/res/layout/media_controller.xml @@ -15,17 +15,17 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="#CC666666" android:orientation="vertical"> - <ImageView android:layout_width="fill_parent" + <ImageView android:layout_width="match_parent" android:layout_height="1px" android:background="@android:drawable/divider_horizontal_dark" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:paddingTop="4dip" @@ -40,7 +40,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> diff --git a/core/res/res/layout/number_picker.xml b/core/res/res/layout/number_picker.xml index 6380d25d9459..44dca33a6fab 100644 --- a/core/res/res/layout/number_picker.xml +++ b/core/res/res/layout/number_picker.xml @@ -20,12 +20,12 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> <com.android.common.widget.NumberPickerButton android:id="@+id/increment" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/timepicker_up_btn" /> <EditText android:id="@+id/timepicker_input" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:singleLine="true" @@ -35,7 +35,7 @@ android:background="@drawable/timepicker_input" /> <com.android.common.widget.NumberPickerButton android:id="@+id/decrement" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/timepicker_down_btn" /> diff --git a/core/res/res/layout/permissions_account_and_authtokentype.xml b/core/res/res/layout/permissions_account_and_authtokentype.xml index 4494a2c51728..833572603033 100644 --- a/core/res/res/layout/permissions_account_and_authtokentype.xml +++ b/core/res/res/layout/permissions_account_and_authtokentype.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView diff --git a/core/res/res/layout/permissions_package_list_item.xml b/core/res/res/layout/permissions_package_list_item.xml index 1bffe51d26ed..3c9570eb94ca 100644 --- a/core/res/res/layout/permissions_package_list_item.xml +++ b/core/res/res/layout/permissions_package_list_item.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView diff --git a/core/res/res/layout/power_dialog.xml b/core/res/res/layout/power_dialog.xml index 7c59ab494851..60298d2e0f4b 100644 --- a/core/res/res/layout/power_dialog.xml +++ b/core/res/res/layout/power_dialog.xml @@ -18,30 +18,30 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <Button android:id="@+id/keyguard" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <Button android:id="@+id/off" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/power_off" /> <Button android:id="@+id/silent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <Button android:id="@+id/radio_power" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout/preference.xml b/core/res/res/layout/preference.xml index 00745b4d6abe..e1fa230cf0c9 100644 --- a/core/res/res/layout/preference.xml +++ b/core/res/res/layout/preference.xml @@ -18,7 +18,7 @@ Preference is able to place a specific widget for its particular type in the "widget_frame" layout. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" @@ -54,7 +54,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_child.xml b/core/res/res/layout/preference_child.xml index 5f8ddd4e79a7..8975ed60349e 100644 --- a/core/res/res/layout/preference_child.xml +++ b/core/res/res/layout/preference_child.xml @@ -16,7 +16,7 @@ <!-- Layout for a visually child-like Preference in a PreferenceActivity. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" @@ -53,7 +53,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_dialog_edittext.xml b/core/res/res/layout/preference_dialog_edittext.xml index 7d1faacdba87..5cc1ea266a73 100644 --- a/core/res/res/layout/preference_dialog_edittext.xml +++ b/core/res/res/layout/preference_dialog_edittext.xml @@ -24,7 +24,7 @@ <TextView android:id="@+android:id/message" style="?android:attr/textAppearanceSmall" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="?android:attr/textColorSecondary" /> diff --git a/core/res/res/layout/preference_information.xml b/core/res/res/layout/preference_information.xml index 8f05a8eadf28..a5cf31a81fe7 100644 --- a/core/res/res/layout/preference_information.xml +++ b/core/res/res/layout/preference_information.xml @@ -18,7 +18,7 @@ Preference is able to place a specific widget for its particular type in the "widget_frame" layout. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" @@ -54,7 +54,7 @@ <!-- Preference should place its actual preference widget here. --> <LinearLayout android:id="@+android:id/widget_frame" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical" /> diff --git a/core/res/res/layout/preference_list_content.xml b/core/res/res/layout/preference_list_content.xml index 31113e17fa1d..8f86981bec53 100644 --- a/core/res/res/layout/preference_list_content.xml +++ b/core/res/res/layout/preference_list_content.xml @@ -18,8 +18,8 @@ */ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" android:scrollbarAlwaysDrawVerticalTrack="true" /> diff --git a/core/res/res/layout/progress_dialog.xml b/core/res/res/layout/progress_dialog.xml index 8f66451e4b3e..298173a1233c 100644 --- a/core/res/res/layout/progress_dialog.xml +++ b/core/res/res/layout/progress_dialog.xml @@ -19,13 +19,13 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <LinearLayout android:id="@+id/body" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:baselineAligned="false" android:paddingLeft="8dip" android:paddingTop="10dip" @@ -40,7 +40,7 @@ android:layout_marginRight="12dip" /> <TextView android:id="@+id/message" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/core/res/res/layout/recent_apps_dialog.xml b/core/res/res/layout/recent_apps_dialog.xml index c4ee95d0a82a..4e416e13a9d8 100644 --- a/core/res/res/layout/recent_apps_dialog.xml +++ b/core/res/res/layout/recent_apps_dialog.xml @@ -19,7 +19,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="3dip" android:orientation="vertical"> diff --git a/core/res/res/layout/resolve_list_item.xml b/core/res/res/layout/resolve_list_item.xml index 4c5c456a2026..6ed43de8fd98 100644 --- a/core/res/res/layout/resolve_list_item.xml +++ b/core/res/res/layout/resolve_list_item.xml @@ -22,7 +22,7 @@ android:orientation="horizontal" android:minHeight="?android:attr/listPreferredItemHeight" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:paddingLeft="10dip" android:paddingRight="15dip"> diff --git a/core/res/res/layout/screen.xml b/core/res/res/layout/screen.xml index ded97e2a6f1b..dfa973198047 100644 --- a/core/res/res/layout/screen.xml +++ b/core/res/res/layout/screen.xml @@ -22,13 +22,13 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <!-- Title bar --> <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" > <ImageView android:id="@android:id/left_icon" @@ -66,7 +66,7 @@ This is the basic layout for a screen, with all of its features enabled. </LinearLayout> <ProgressBar android:id="@+id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="2dip" android:layout_toLeftOf="@android:id/right_container" @@ -77,8 +77,8 @@ This is the basic layout for a screen, with all of its features enabled. /> <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@null" android:fadingEdge="horizontal" android:scrollHorizontally="true" @@ -90,7 +90,7 @@ This is the basic layout for a screen, with all of its features enabled. <!-- Content --> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_custom_title.xml b/core/res/res/layout/screen_custom_title.xml index 12ed1d05e61c..34c9de0d4f1a 100644 --- a/core/res/res/layout/screen_custom_title.xml +++ b/core/res/res/layout/screen_custom_title.xml @@ -22,12 +22,12 @@ This is an custom layout for a screen. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout android:id="@android:id/title_container" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" style="?android:attr/windowTitleBackgroundStyle"> </FrameLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_progress.xml b/core/res/res/layout/screen_progress.xml index 477cadb6015f..6e694c160e1f 100644 --- a/core/res/res/layout/screen_progress.xml +++ b/core/res/res/layout/screen_progress.xml @@ -23,12 +23,12 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" > <ProgressBar android:id="@+android:id/progress_circular" @@ -43,7 +43,7 @@ This is the basic layout for a screen, with all of its features enabled. /> <ProgressBar android:id="@+android:id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="2dip" android:layout_alignParentLeft="true" @@ -54,8 +54,8 @@ This is the basic layout for a screen, with all of its features enabled. /> <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_alignParentLeft="true" android:layout_toLeftOf="@android:id/progress_circular" android:background="@null" @@ -65,7 +65,7 @@ This is the basic layout for a screen, with all of its features enabled. /> </RelativeLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_title.xml b/core/res/res/layout/screen_title.xml index 5fcd2ddf507f..39ea1318aad0 100644 --- a/core/res/res/layout/screen_title.xml +++ b/core/res/res/layout/screen_title.xml @@ -23,7 +23,7 @@ enabled. android:orientation="vertical" android:fitsSystemWindows="true"> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize" style="?android:attr/windowTitleBackgroundStyle"> <TextView android:id="@android:id/title" @@ -31,11 +31,11 @@ enabled. android:background="@null" android:fadingEdge="horizontal" android:gravity="center_vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </FrameLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/screen_title_icons.xml b/core/res/res/layout/screen_title_icons.xml index 54159090b41f..62a0228b15c7 100644 --- a/core/res/res/layout/screen_title_icons.xml +++ b/core/res/res/layout/screen_title_icons.xml @@ -21,11 +21,11 @@ This is the basic layout for a screen, with all of its features enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <RelativeLayout android:id="@android:id/title_container" style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/windowTitleSize"> <!-- The title background has 9px left padding. --> <ImageView android:id="@android:id/left_icon" @@ -51,7 +51,7 @@ This is the basic layout for a screen, with all of its features enabled. the left of the title text left edge. --> <ProgressBar android:id="@+id/progress_horizontal" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="-3dip" android:layout_toLeftOf="@android:id/progress_circular" @@ -60,8 +60,8 @@ This is the basic layout for a screen, with all of its features enabled. android:visibility="gone" android:max="10000" /> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal" android:layout_toLeftOf="@id/progress_circular" android:layout_toRightOf="@android:id/left_icon" @@ -69,7 +69,7 @@ This is the basic layout for a screen, with all of its features enabled. <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:background="@null" android:fadingEdge="horizontal" @@ -89,7 +89,7 @@ This is the basic layout for a screen, with all of its features enabled. </LinearLayout> </RelativeLayout> <FrameLayout android:id="@android:id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml index 964af9ba7d3f..12285fde6cee 100644 --- a/core/res/res/layout/search_bar.xml +++ b/core/res/res/layout/search_bar.xml @@ -21,7 +21,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" class="android.app.SearchDialog$SearchBar" android:id="@+id/search_bar" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:focusable="true" @@ -30,7 +30,7 @@ <!-- Outer layout defines the entire search bar at the top of the screen --> <LinearLayout android:id="@+id/search_plate" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="12dip" @@ -52,17 +52,14 @@ <!-- Inner layout contains the app icon, button(s) and EditText --> <LinearLayout android:id="@+id/search_edit_frame" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - - <ImageView - android:id="@+id/search_app_icon" - android:layout_height="36dip" - android:layout_width="36dip" + + <include android:id="@+id/search_source_selector" + layout="@layout/search_source_selector" android:layout_marginRight="7dip" - android:layout_gravity="center_vertical" - /> + android:layout_gravity="center_vertical" /> <view class="android.app.SearchDialog$SearchAutoComplete" android:id="@+id/search_src_text" @@ -76,8 +73,8 @@ android:singleLine="true" android:ellipsize="end" android:inputType="text|textAutoComplete" - android:dropDownWidth="fill_parent" - android:dropDownHeight="fill_parent" + android:dropDownWidth="match_parent" + android:dropDownHeight="match_parent" android:dropDownAnchor="@id/search_plate" android:dropDownVerticalOffset="-9dip" android:popupBackground="@android:drawable/search_dropdown_background" @@ -88,13 +85,13 @@ android:id="@+id/search_go_btn" android:background="@drawable/btn_search_dialog" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" /> <ImageButton android:id="@+id/search_voice_btn" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginLeft="8dip" android:background="@drawable/btn_search_dialog_voice" android:src="@android:drawable/ic_btn_speak_now" diff --git a/core/res/res/layout/search_dropdown_item_1line.xml b/core/res/res/layout/search_dropdown_item_1line.xml index bf3dd483b98f..eed8b7d9b633 100644 --- a/core/res/res/layout/search_dropdown_item_1line.xml +++ b/core/res/res/layout/search_dropdown_item_1line.xml @@ -22,5 +22,5 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultTitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/searchResultListItemHeight" />
\ No newline at end of file diff --git a/core/res/res/layout/search_dropdown_item_icons_2line.xml b/core/res/res/layout/search_dropdown_item_icons_2line.xml index 2710b3bffcb6..d71b4f79432b 100644 --- a/core/res/res/layout/search_dropdown_item_icons_2line.xml +++ b/core/res/res/layout/search_dropdown_item_icons_2line.xml @@ -21,7 +21,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="4dip" android:paddingRight="2dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/searchResultListItemHeight" > <!-- Icons come first in the layout, since their placement doesn't depend on @@ -50,7 +50,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultSubtitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="29dip" android:paddingBottom="4dip" android:gravity="top" @@ -66,7 +66,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceSearchResultTitle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toRightOf="@android:id/icon1" diff --git a/core/res/res/layout/search_source_selector.xml b/core/res/res/layout/search_source_selector.xml new file mode 100644 index 000000000000..c69dfc0e2159 --- /dev/null +++ b/core/res/res/layout/search_source_selector.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="48dip" + android:layout_height="match_parent" + android:foreground="@drawable/search_source_selector_indicator" + android:foregroundGravity="bottom|right" + > + + <ImageButton + android:id="@+id/search_source_selector_icon" + android:background="@drawable/search_source_selector_background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerInside" + android:focusable="true" + android:clickable="true" + /> + +</FrameLayout> diff --git a/core/res/res/layout/seekbar_dialog.xml b/core/res/res/layout/seekbar_dialog.xml index f61f43525277..84352a574c39 100644 --- a/core/res/res/layout/seekbar_dialog.xml +++ b/core/res/res/layout/seekbar_dialog.xml @@ -15,8 +15,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:gravity="center_horizontal"> @@ -26,7 +26,7 @@ android:paddingTop="20dip" /> <SeekBar android:id="@+id/seekbar" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="20dip" /> diff --git a/core/res/res/layout/select_dialog.xml b/core/res/res/layout/select_dialog.xml index 249b5275986b..c665f7a7ed97 100644 --- a/core/res/res/layout/select_dialog.xml +++ b/core/res/res/layout/select_dialog.xml @@ -26,8 +26,8 @@ <view class="com.android.internal.app.AlertController$RecycleListView" xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+android:id/select_dialog_listview" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_marginTop="5px" android:cacheColorHint="@null" android:divider="@android:drawable/divider_horizontal_bright" diff --git a/core/res/res/layout/select_dialog_item.xml b/core/res/res/layout/select_dialog_item.xml index 60a74a42de4c..30fe02ef39c9 100644 --- a/core/res/res/layout/select_dialog_item.xml +++ b/core/res/res/layout/select_dialog_item.xml @@ -25,7 +25,7 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/select_dialog_multichoice.xml b/core/res/res/layout/select_dialog_multichoice.xml index 55fc39b6b3aa..5785d3b54fa4 100644 --- a/core/res/res/layout/select_dialog_multichoice.xml +++ b/core/res/res/layout/select_dialog_multichoice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/select_dialog_singlechoice.xml b/core/res/res/layout/select_dialog_singlechoice.xml index 220af644018e..3560fee02054 100644 --- a/core/res/res/layout/select_dialog_singlechoice.xml +++ b/core/res/res/layout/select_dialog_singlechoice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/simple_dropdown_hint.xml b/core/res/res/layout/simple_dropdown_hint.xml index 44be46d23a37..df9d720be8e2 100644 --- a/core/res/res/layout/simple_dropdown_hint.xml +++ b/core/res/res/layout/simple_dropdown_hint.xml @@ -25,5 +25,5 @@ android:layout_marginTop="3dip" android:layout_marginRight="3dip" android:layout_marginBottom="3dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/simple_dropdown_item_1line.xml b/core/res/res/layout/simple_dropdown_item_1line.xml index 5745d15b8c49..18e7b88ed718 100644 --- a/core/res/res/layout/simple_dropdown_item_1line.xml +++ b/core/res/res/layout/simple_dropdown_item_1line.xml @@ -22,6 +22,6 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceLargeInverse" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/simple_dropdown_item_2line.xml b/core/res/res/layout/simple_dropdown_item_2line.xml index a04c84954be2..903adb097261 100644 --- a/core/res/res/layout/simple_dropdown_item_2line.xml +++ b/core/res/res/layout/simple_dropdown_item_2line.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:gravity="center_vertical" @@ -39,7 +39,7 @@ style="?android:attr/dropDownItemStyle" android:textAppearance="?android:attr/textAppearanceLargeInverse" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <TextView @@ -48,7 +48,7 @@ android:textAppearance="?android:attr/textAppearanceSmallInverse" android:textColor="#323232" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" /> diff --git a/core/res/res/layout/simple_expandable_list_item_1.xml b/core/res/res/layout/simple_expandable_list_item_1.xml index 052b35377326..dc3e58e7f3a4 100644 --- a/core/res/res/layout/simple_expandable_list_item_1.xml +++ b/core/res/res/layout/simple_expandable_list_item_1.xml @@ -16,7 +16,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft" android:textAppearance="?android:attr/textAppearanceLarge" diff --git a/core/res/res/layout/simple_expandable_list_item_2.xml b/core/res/res/layout/simple_expandable_list_item_2.xml index 741f1db3769b..b48b444e66d8 100644 --- a/core/res/res/layout/simple_expandable_list_item_2.xml +++ b/core/res/res/layout/simple_expandable_list_item_2.xml @@ -15,7 +15,7 @@ --> <TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingTop="2dip" android:paddingBottom="2dip" @@ -24,14 +24,14 @@ > <TextView android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dip" android:textAppearance="?android:attr/textAppearanceLarge" /> <TextView android:id="@android:id/text2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" diff --git a/core/res/res/layout/simple_list_item_1.xml b/core/res/res/layout/simple_list_item_1.xml index fe617acf2438..c9c77a5f9c11 100644 --- a/core/res/res/layout/simple_list_item_1.xml +++ b/core/res/res/layout/simple_list_item_1.xml @@ -16,7 +16,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_2.xml b/core/res/res/layout/simple_list_item_2.xml index b5e23856c1b1..5eab54eb7e06 100644 --- a/core/res/res/layout/simple_list_item_2.xml +++ b/core/res/res/layout/simple_list_item_2.xml @@ -17,14 +17,14 @@ <TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" android:paddingTop="2dip" android:paddingBottom="2dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:mode="twoLine" > <TextView android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="6dip" android:layout_marginTop="6dip" @@ -32,7 +32,7 @@ /> <TextView android:id="@android:id/text2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" diff --git a/core/res/res/layout/simple_list_item_checked.xml b/core/res/res/layout/simple_list_item_checked.xml index 95612f63f314..5f99044e58fd 100644 --- a/core/res/res/layout/simple_list_item_checked.xml +++ b/core/res/res/layout/simple_list_item_checked.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_multiple_choice.xml b/core/res/res/layout/simple_list_item_multiple_choice.xml index 102e5fc808e5..05c66f31510a 100644 --- a/core/res/res/layout/simple_list_item_multiple_choice.xml +++ b/core/res/res/layout/simple_list_item_multiple_choice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_list_item_single_choice.xml b/core/res/res/layout/simple_list_item_single_choice.xml index 326de1ddd5ad..27afd1d6f4b5 100644 --- a/core/res/res/layout/simple_list_item_single_choice.xml +++ b/core/res/res/layout/simple_list_item_single_choice.xml @@ -16,7 +16,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" diff --git a/core/res/res/layout/simple_spinner_dropdown_item.xml b/core/res/res/layout/simple_spinner_dropdown_item.xml index 7006b09e2193..5fd7a09aa1a6 100644 --- a/core/res/res/layout/simple_spinner_dropdown_item.xml +++ b/core/res/res/layout/simple_spinner_dropdown_item.xml @@ -21,6 +21,6 @@ android:id="@android:id/text1" style="?android:attr/spinnerDropDownItemStyle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/simple_spinner_item.xml b/core/res/res/layout/simple_spinner_item.xml index 4dd739fd5165..77929eee8f9b 100644 --- a/core/res/res/layout/simple_spinner_item.xml +++ b/core/res/res/layout/simple_spinner_item.xml @@ -21,6 +21,6 @@ android:id="@android:id/text1" style="?android:attr/spinnerItemStyle" android:singleLine="true" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="marquee" /> diff --git a/core/res/res/layout/status_bar.xml b/core/res/res/layout/status_bar.xml index 0bc0dac42644..e8d88661ccb1 100644 --- a/core/res/res/layout/status_bar.xml +++ b/core/res/res/layout/status_bar.xml @@ -27,14 +27,14 @@ > <LinearLayout android:id="@+id/icons" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="horizontal"> <com.android.server.status.IconMerger android:id="@+id/notificationIcons" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentLeft="true" android:paddingLeft="6dip" android:gravity="center_vertical" @@ -42,7 +42,7 @@ <LinearLayout android:id="@+id/statusIcons" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_alignParentRight="true" android:paddingRight="6dip" android:gravity="center_vertical" @@ -50,14 +50,14 @@ </LinearLayout> <LinearLayout android:id="@+id/ticker" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:paddingLeft="6dip" android:animationCache="false" android:orientation="horizontal" > <ImageSwitcher android:id="@+id/tickerIcon" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginRight="8dip" > <com.android.server.status.AnimatedImageView @@ -76,12 +76,12 @@ android:paddingTop="2dip" android:paddingRight="10dip"> <TextView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:textColor="#ff000000" /> <TextView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:textColor="#ff000000" /> @@ -90,7 +90,7 @@ <com.android.server.status.DateView android:id="@+id/date" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:singleLine="true" android:textSize="16sp" android:textStyle="bold" diff --git a/core/res/res/layout/status_bar_expanded.xml b/core/res/res/layout/status_bar_expanded.xml index fd9d26e6eb16..a0cd11dc6396 100644 --- a/core/res/res/layout/status_bar_expanded.xml +++ b/core/res/res/layout/status_bar_expanded.xml @@ -25,7 +25,7 @@ android:descendantFocusability="afterDescendants"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="3dp" @@ -77,26 +77,26 @@ </LinearLayout> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <ScrollView android:id="@+id/scroll" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:fadingEdge="none" > <com.android.server.status.NotificationLinearLayout android:id="@+id/notificationLinearLayout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" > <TextView android:id="@+id/noNotificationsTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -105,7 +105,7 @@ /> <TextView android:id="@+id/ongoingTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -113,13 +113,13 @@ android:text="@string/status_bar_ongoing_events_title" /> <LinearLayout android:id="@+id/ongoingItems" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" /> <TextView android:id="@+id/latestTitle" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/title_bar_portrait" android:paddingLeft="5dp" @@ -127,7 +127,7 @@ android:text="@string/status_bar_latest_events_title" /> <LinearLayout android:id="@+id/latestItems" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" /> @@ -135,7 +135,7 @@ </ScrollView> <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/title_bar_shadow" android:scaleType="fitXY" diff --git a/core/res/res/layout/status_bar_icon.xml b/core/res/res/layout/status_bar_icon.xml index 1516036b27aa..05367923c397 100644 --- a/core/res/res/layout/status_bar_icon.xml +++ b/core/res/res/layout/status_bar_icon.xml @@ -26,8 +26,8 @@ > <com.android.server.status.AnimatedImageView android:id="@+id/image" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <TextView android:id="@+id/number" diff --git a/core/res/res/layout/status_bar_latest_event.xml b/core/res/res/layout/status_bar_latest_event.xml index d524bb6e4b1b..59cc90db3367 100644 --- a/core/res/res/layout/status_bar_latest_event.xml +++ b/core/res/res/layout/status_bar_latest_event.xml @@ -1,11 +1,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="65sp" android:orientation="vertical" > <com.android.server.status.LatestItemView android:id="@+id/content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="64sp" android:background="@drawable/status_bar_item_background" android:focusable="true" @@ -15,7 +15,7 @@ </com.android.server.status.LatestItemView> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1sp" android:background="@drawable/divider_horizontal_bright" /> diff --git a/core/res/res/layout/status_bar_latest_event_content.xml b/core/res/res/layout/status_bar_latest_event_content.xml index eeb9d9d317ff..2f7036f9747a 100644 --- a/core/res/res/layout/status_bar_latest_event_content.xml +++ b/core/res/res/layout/status_bar_latest_event_content.xml @@ -1,13 +1,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:paddingTop="7dp" android:paddingLeft="5dp" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="3dp" @@ -18,7 +18,7 @@ android:scaleType="fitCenter" android:src="@drawable/arrow_down_float"/> <TextView android:id="@+id/title" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:singleLine="true" @@ -30,7 +30,7 @@ android:textColor="#ff000000" /> </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > diff --git a/core/res/res/layout/status_bar_tracking.xml b/core/res/res/layout/status_bar_tracking.xml index aa3b733bdabd..c0a7a977545f 100644 --- a/core/res/res/layout/status_bar_tracking.xml +++ b/core/res/res/layout/status_bar_tracking.xml @@ -26,18 +26,18 @@ > <com.android.server.status.TrackingPatternView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" /> <com.android.server.status.CloseDragHandle android:id="@+id/close" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <ImageView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" android:scaleType="fitXY" diff --git a/core/res/res/layout/tab_content.xml b/core/res/res/layout/tab_content.xml index 8f67af0bd2c0..0ee87cebbfc2 100644 --- a/core/res/res/layout/tab_content.xml +++ b/core/res/res/layout/tab_content.xml @@ -19,13 +19,13 @@ --> <TabHost xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/tabhost" - android:layout_width="fill_parent" android:layout_height="fill_parent"> + android:layout_width="match_parent" android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" android:layout_height="fill_parent"> - <TabWidget android:id="@android:id/tabs" android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent"> + <TabWidget android:id="@android:id/tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" /> <FrameLayout android:id="@android:id/tabcontent" - android:layout_width="fill_parent" android:layout_height="0dip" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"/> </LinearLayout> </TabHost> diff --git a/core/res/res/layout/test_list_item.xml b/core/res/res/layout/test_list_item.xml index f4e0d3cb8802..ede32e88c664 100644 --- a/core/res/res/layout/test_list_item.xml +++ b/core/res/res/layout/test_list_item.xml @@ -19,6 +19,6 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:paddingTop="2dip" android:paddingBottom="3dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/textview_hint.xml b/core/res/res/layout/textview_hint.xml index d69a2f6e04d5..4978be54769c 100644 --- a/core/res/res/layout/textview_hint.xml +++ b/core/res/res/layout/textview_hint.xml @@ -15,8 +15,8 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@drawable/popup_inline_error" android:textAppearance="?android:attr/textAppearanceSmallInverse" /> diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml index 1d3be143a0f3..12b67f18787a 100644 --- a/core/res/res/layout/transient_notification.xml +++ b/core/res/res/layout/transient_notification.xml @@ -19,8 +19,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:background="@drawable/toast_frame"> diff --git a/core/res/res/layout/two_line_list_item.xml b/core/res/res/layout/two_line_list_item.xml index 2a2e759e84c0..24ba47a100c4 100644 --- a/core/res/res/layout/two_line_list_item.xml +++ b/core/res/res/layout/two_line_list_item.xml @@ -18,19 +18,19 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <TextView android:id="@android:id/text1" android:textSize="16sp" android:textStyle="bold" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <TextView android:id="@android:id/text2" android:textSize="16sp" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 67fac9f435f4..016900d841b3 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"K souboru nelze získat přístup."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Požadovaný soubor nebyl nalezen."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Je zpracováváno příliš mnoho požadavků. Opakujte akci později."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Chyba přihlášení k účtu <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synchronizace"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synchronizace"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Příliš mnoho smazaných položek služby <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Sleduje vaši fyzickou polohu"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Síťová komunikace"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Umožňuje aplikacím získat přístup k různým funkcím sítě."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Vaše účty"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Přístup k dostupným účtům."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Řízení hardwaru"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Přímý přístup k hardwaru telefonu."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Telefonní hovory"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Umožňuje aplikaci povolit ladění jiné aplikace. Škodlivé aplikace mohou pomocí tohoto nastavení ukončit jiné aplikace."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"změna vašeho nastavení uživatelského rozhraní"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Umožňuje aplikaci změnit aktuální konfiguraci, např. národní prostředí či obecnou velikost písma."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"restartování ostatních aplikací"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Umožňuje aplikaci vynutit restartování jiných aplikací."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"vynucení zavření aplikace"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Umožňuje aplikaci vynutit zavření a přesunutí libovolné činnosti v popředí na pozadí. Běžné aplikace by toto nastavení neměly nikdy využívat."</string> <string name="permlab_dump" msgid="1681799862438954752">"načtení interního stavu systému"</string> @@ -319,7 +322,7 @@ <string name="permlab_callPrivileged" msgid="4198349211108497879">"přímé volání na libovolná telefonní čísla"</string> <string name="permdesc_callPrivileged" msgid="244405067160028452">"Umožňuje aplikaci bez vašeho zásahu vytočit jakékoli telefonní číslo, včetně čísel tísňového volání. Škodlivé aplikace mohou provádět zbytečná a nezákonná volání na tísňové linky."</string> <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"přímo spustit nastavení telefonu CDMA"</string> - <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Umožňuje aplikaci zahájit zřizování CDMA. Škodlivé aplikace mohou zřizování CDMA zahájit samovolně."</string> + <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Umožňuje aplikaci zahájit poskytování CDMA. Škodlivé aplikace mohou poskytování CDMA zahájit samovolně."</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"ovládání oznámení o aktualizaci polohy"</string> <string name="permdesc_locationUpdates" msgid="2300018303720930256">"Umožňuje povolit či zakázat aktualizace polohy prostřednictvím bezdrátového připojení. Aplikace toto nastavení obvykle nepoužívají."</string> <string name="permlab_checkinProperties" msgid="7855259461268734914">"přístup k vlastnostem Checkin"</string> @@ -356,7 +359,7 @@ <string name="permdesc_useCredentials" msgid="7416570544619546974">"Umožňuje aplikaci požadovat ověřovací tokeny."</string> <string name="permlab_accessNetworkState" msgid="6865575199464405769">"zobrazení stavu sítě"</string> <string name="permdesc_accessNetworkState" msgid="558721128707712766">"Umožňuje aplikaci zobrazit stav všech sítí."</string> - <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"plný přístup k Internetu"</string> + <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"plný přístup k internetu"</string> <string name="permdesc_createNetworkSockets" msgid="4593339106921772192">"Umožňuje aplikaci vytvořit síťové sokety."</string> <string name="permlab_writeApnSettings" msgid="7823599210086622545">"zápis nastavení názvu přístupového bodu (APN)"</string> <string name="permdesc_writeApnSettings" msgid="7443433457842966680">"Umožňuje aplikaci změnit nastavení APN, jako je například proxy či port APN."</string> @@ -390,8 +393,12 @@ <string name="permdesc_readDictionary" msgid="1082972603576360690">"Umožní aplikaci číst soukromá slova, jména a fráze, která uživatel mohl uložit do svého slovníku."</string> <string name="permlab_writeDictionary" msgid="6703109511836343341">"zápis do slovníku definovaného uživatelem"</string> <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Umožní aplikaci zapisovat nová slova do uživatelského slovníku."</string> - <string name="permlab_sdcardWrite" msgid="8079403759001777291">"změna/smazání obsah karty SD"</string> + <string name="permlab_sdcardWrite" msgid="8079403759001777291">"změna/smazání obsahu karty SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Umožní aplikaci zápis na kartu SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Domů"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -405,7 +412,7 @@ <string-array name="emailAddressTypes"> <item msgid="8073994352956129127">"Domů"</item> <item msgid="7084237356602625604">"Práce"</item> - <item msgid="1112044410659011023">"Ostatní"</item> + <item msgid="1112044410659011023">"(další)"</item> <item msgid="2374913952870110618">"Vlastní"</item> </string-array> <string-array name="postalAddressTypes"> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Vlastní"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Domů"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobil"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Práce"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Pracovní fax"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Domácí fax"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Jiné"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Zpětné volání"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Auto"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Firma (hlavní)"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Hlavní"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Jiný fax"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radiotelefon"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"Telefon pro sluchově postižené (TTY/TDD)"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Pracovní mobil"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pracovní pager"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Asistent"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Narozeniny"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Výročí"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Událost"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Vlastní"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Domů"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Práce"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Jiné"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Vlastní"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Domů"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Práce"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Jiné"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Vlastní"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Domů"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Práce"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Jiné"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Vlastní"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Práce"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Jiné"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Vlastní"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"pomocí <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> pomocí <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Zadejte kód PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Nesprávný kód PIN"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Chcete-li telefon odemknout, stiskněte Menu a poté 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Zkuste to prosím znovu"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Nabíjení (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Nabito."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Připojte dobíjecí zařízení."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Není vložena SIM karta."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"V telefonu není žádná karta SIM."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Přihlásit se"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Neplatné uživatelské jméno nebo heslo."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Probíhá kontrola..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Odemknout"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Zapnout zvuk"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Vypnout zvuk"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Vymazat"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Nabíjení..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Prosím připojte dobíjecí zařízení"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Baterie je vybitá:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"Zbývá <xliff:g id="NUMBER">%d%%</xliff:g> nebo méně."</string> <string name="battery_low_why" msgid="7279169609518386372">"Využití baterie"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Test továrního nastavení se nezdařil"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Test FACTORY_TEST lze provést pouze u balíčků nainstalovaných ve složce /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Chcete opustit tuto stránku?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Vyberte OK, chcete-li pokračovat, nebo Zrušit, chcete-li na stránce zůstat."</string> <string name="save_password_label" msgid="6860261758665825069">"Potvrdit"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Tip: Dvojitým klepnutím můžete zobrazení přiblížit nebo oddálit."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"čtení historie a záložek Prohlížeče"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Umožňuje aplikaci číst všechny navštívené adresy URL a záložky Prohlížeče."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"zápis do historie a záložek Prohlížeče"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Ukončit aplikaci"</string> <string name="report" msgid="4060218260984795706">"Nahlásit"</string> <string name="wait" msgid="7147118217226317732">"Počkat"</string> - <string name="debug" msgid="9103374629678531849">"Ladit"</string> <string name="sendText" msgid="5132506121645618310">"Vyberte činnost s textem"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Hlasitost vyzvánění"</string> <string name="volume_music" msgid="5421651157138628171">"Hlasitost médií"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Opravdu chcete kartu SD naformátovat? Všechna data na kartě budou ztracena."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formátovat"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Ladění přes rozhraní USB připojeno"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Vyberte, chcete-li zakázat ladění USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Výběr metody zadávání dat"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AÁBCČDĎEÉĚFGHCHIÍJKLMNŇOÓPQRŘSŠTŤUÚVWXYÝZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789AÁBCČDĎEÉĚFGHCHIÍJKLMNŇOÓPQRŘSŠTŤUÚVWXYÝZŽ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidáti"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Vytvořit kontakt"\n"pro <xliff:g id="NUMBER">%s</xliff:g>."</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"Zaškrtnuto"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"Nezaškrtnuto"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Povolit"</string> <string name="deny" msgid="2081879885755434506">"Odepřít"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Požadováno oprávnění"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Požadováno oprávnění"\n"pro účet <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Metoda zadávání dat"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchronizace"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Usnadnění"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Změnit tapetu"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Protokol PPTP (Point-to-Point Tunneling Protocol)"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protokol L2TP (Layer 2 Tunneling Protocol)"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Síť VPN L2TP/IPSec s předsdíleným klíčem"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Síť VPN L2TP/IPSec s certifikátem"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 7b377091ff38..61ee2e77026f 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -33,7 +33,7 @@ <string name="serviceEnabledFor" msgid="6856228140453471041">"Tjenesten blev aktiveret for:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Tjenesten er deaktiveret."</string> <string name="serviceRegistered" msgid="6275019082598102493">"Registreringen er afsluttet."</string> - <string name="serviceErased" msgid="1288584695297200972">"Sletning afsluttet."</string> + <string name="serviceErased" msgid="1288584695297200972">"Sletningen er fuldført."</string> <string name="passwordIncorrect" msgid="7612208839450128715">"Forkert adgangskode."</string> <string name="mmiComplete" msgid="8232527495411698359">"MMI-nummer afsluttet."</string> <string name="badPin" msgid="5085454289896032547">"Den gamle PIN-kode, du indtastede, er ikke korrekt."</string> @@ -49,11 +49,11 @@ <string name="BaMmi" msgid="455193067926770581">"Opkaldsspærring"</string> <string name="PwdMmi" msgid="7043715687905254199">"Ændring af adgangskode"</string> <string name="PinMmi" msgid="3113117780361190304">"ændring af PIN-kode"</string> - <string name="CnipMmi" msgid="3110534680557857162">"Opkaldsnummer til stede"</string> - <string name="CnirMmi" msgid="3062102121430548731">"Opkaldsnummer begrænset"</string> + <string name="CnipMmi" msgid="3110534680557857162">"Opkaldsnummeret er til stede"</string> + <string name="CnirMmi" msgid="3062102121430548731">"Opkaldsnummeret er begrænset"</string> <string name="ThreeWCMmi" msgid="9051047170321190368">"Trevejsopkald"</string> <string name="RuacMmi" msgid="7827887459138308886">"Afvisning af uønskede, irriterende opkald"</string> - <string name="CndMmi" msgid="3116446237081575808">"Opkaldsnummer levering"</string> + <string name="CndMmi" msgid="3116446237081575808">"Levering af opkaldsnummer"</string> <string name="DndMmi" msgid="1265478932418334331">"Forstyr ikke"</string> <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"Standarder for opkalds-id til begrænset. Næste opkald: Begrænset"</string> <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"Standarder for opkalds-id til begrænset. Næste opkald: Ikke begrænset"</string> @@ -62,14 +62,14 @@ <string name="serviceNotProvisioned" msgid="8614830180508686666">"Tjenesten leveres ikke!"</string> <string name="CLIRPermanent" msgid="5460892159398802465">"Indstillingen for opkalds-id kan ikke ændres."</string> <string name="RestrictedChangedTitle" msgid="5592189398956187498">"Begrænset adgang ændret"</string> - <string name="RestrictedOnData" msgid="8653794784690065540">"Datatjeneste er blokeret."</string> - <string name="RestrictedOnEmergency" msgid="6581163779072833665">"Nødtjeneste er blokeret."</string> - <string name="RestrictedOnNormal" msgid="2045364908281990708">"Stemme-/SMS-tjeneste er blokeret."</string> - <string name="RestrictedOnAll" msgid="4923139582141626159">"Alle stemme-/SMS-tjenester er blokerede."</string> + <string name="RestrictedOnData" msgid="8653794784690065540">"Datatjenesten er blokeret."</string> + <string name="RestrictedOnEmergency" msgid="6581163779072833665">"Nødtjenesten er blokeret."</string> + <string name="RestrictedOnNormal" msgid="2045364908281990708">"Stemme-/sms-tjenesten er blokeret."</string> + <string name="RestrictedOnAll" msgid="4923139582141626159">"Alle stemme-/sms-tjenester er blokerede."</string> <string name="serviceClassVoice" msgid="1258393812335258019">"Stemme"</string> <string name="serviceClassData" msgid="872456782077937893">"Data"</string> <string name="serviceClassFAX" msgid="5566624998840486475">"FAX"</string> - <string name="serviceClassSMS" msgid="2015460373701527489">"SMS"</string> + <string name="serviceClassSMS" msgid="2015460373701527489">"sms"</string> <string name="serviceClassDataAsync" msgid="4523454783498551468">"Asynkroniser"</string> <string name="serviceClassDataSync" msgid="7530000519646054776">"Synkroniser"</string> <string name="serviceClassPacket" msgid="6991006557993423453">"Pakke"</string> @@ -77,8 +77,8 @@ <string name="roamingText0" msgid="7170335472198694945">"Roamingindikator til"</string> <string name="roamingText1" msgid="5314861519752538922">"Roamingindikator fra"</string> <string name="roamingText2" msgid="8969929049081268115">"Roamingindikator blinker"</string> - <string name="roamingText3" msgid="5148255027043943317">"Ude af kvarteret"</string> - <string name="roamingText4" msgid="8808456682550796530">"Ude af bygningen"</string> + <string name="roamingText3" msgid="5148255027043943317">"Ikke i kvarteret"</string> + <string name="roamingText4" msgid="8808456682550796530">"Ikke i bygningen"</string> <string name="roamingText5" msgid="7604063252850354350">"Roaming – Foretrukket system"</string> <string name="roamingText6" msgid="2059440825782871513">"Roaming – Tilgængeligt system"</string> <string name="roamingText7" msgid="7112078724097233605">"Roaming – Alliance Partner"</string> @@ -88,12 +88,12 @@ <string name="roamingText11" msgid="4154476854426920970">"Roamingbanner til"</string> <string name="roamingText12" msgid="1189071119992726320">"Roamingbanner fra"</string> <string name="roamingTextSearching" msgid="8360141885972279963">"Søger efter tjeneste"</string> - <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke videresendt"</string> + <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke viderestillet"</string> <string name="cfTemplateForwarded" msgid="1302922117498590521">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> efter <xliff:g id="TIME_DELAY">{2}</xliff:g> sekunder"</string> - <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke videresendt"</string> - <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke videresendt"</string> - <string name="fcComplete" msgid="3118848230966886575">"Funktionskode komplet."</string> + <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke viderestillet"</string> + <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke viderestillet"</string> + <string name="fcComplete" msgid="3118848230966886575">"Funktionskoden er komplet."</string> <string name="fcError" msgid="3327560126588500777">"Forbindelsesproblemer eller ugyldig funktionskode."</string> <string name="httpErrorOk" msgid="1191919378083472204">"OK"</string> <string name="httpError" msgid="2567300624552921790">"Websiden indeholder en fejl."</string> @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Der kunne ikke oprettes adgang til filen."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Den anmodede fil blev ikke fundet."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Der behandles for mange anmodninger. Prøv igen senere."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Loginfejl for <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synkroniser"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synkroniser"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"For mange <xliff:g id="CONTENT_TYPE">%s</xliff:g> sletninger"</string> @@ -125,33 +124,31 @@ <string name="screen_lock" msgid="799094655496098153">"Skærmlås"</string> <string name="power_off" msgid="4266614107412865048">"Sluk"</string> <string name="shutdown_progress" msgid="2281079257329981203">"Lukker ned ..."</string> - <string name="shutdown_confirm" msgid="649792175242821353">"Din telefon lukkes ned."</string> + <string name="shutdown_confirm" msgid="649792175242821353">"lydstyrke for opkald"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Der er ingen nye programmer."</string> - <string name="global_actions" msgid="2406416831541615258">"Telefonvalgmuligheder"</string> + <string name="global_actions" msgid="2406416831541615258">"Indstillinger for telefon"</string> <string name="global_action_lock" msgid="2844945191792119712">"Skærmlås"</string> <string name="global_action_power_off" msgid="4471879440839879722">"Sluk"</string> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Lydløs"</string> - <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Lyden er FRA"</string> + <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Lyden er slået FRA"</string> <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Lyden er TIL"</string> <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Flytilstand"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Flytilstand er TIL"</string> - <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flytilstand er FRA"</string> + <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flytilstand er slået FRA"</string> <string name="safeMode" msgid="2788228061547930246">"Sikker tilstand"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-system"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Tjenester, der koster dig penge"</string> - <string name="permgroupdesc_costMoney" msgid="8193824940620517189">"Tillader et program at gøre ting, som kan koste penge."</string> + <string name="permgroupdesc_costMoney" msgid="8193824940620517189">"Tillader, at et program kan gøre ting, som kan koste penge."</string> <string name="permgrouplab_messages" msgid="7521249148445456662">"Dine beskeder"</string> - <string name="permgroupdesc_messages" msgid="7045736972019211994">"Læs og skriv dine SMS-, e-mail- og andre beskeder."</string> + <string name="permgroupdesc_messages" msgid="7045736972019211994">"Læs og skriv dine sms-, e-mail- og andre beskeder."</string> <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"Dine personlige oplysninger"</string> <string name="permgroupdesc_personalInfo" msgid="5488050357388806068">"Få direkte adgang til dine kontakter og din kalender, der er gemt på telefonen."</string> <string name="permgrouplab_location" msgid="635149742436692049">"Din placering"</string> <string name="permgroupdesc_location" msgid="2430258821648348660">"Overvåg din fysiske placering"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Netværkskommunikation"</string> - <string name="permgroupdesc_network" msgid="5035763698958415998">"Tillader programmer at få adgang til forskellige netværksfunktioner."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgroupdesc_network" msgid="5035763698958415998">"Tillader, at programmerne får adgang til forskellige netværksfunktioner."</string> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Dine konti"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Få adgang til de tilgængelige konti."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Hardwarekontroller"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Direkte adgang til hardware på håndsættet."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Telefonopkald"</string> @@ -163,123 +160,129 @@ <string name="permgrouplab_storage" msgid="1971118770546336966">"Lagring"</string> <string name="permgroupdesc_storage" msgid="9203302214915355774">"Få adgang til SD-kortet."</string> <string name="permlab_statusBar" msgid="7417192629601890791">"deaktiver eller rediger statuslinje"</string> - <string name="permdesc_statusBar" msgid="1365473595331989732">"Tillader et program at deaktivere statuslinjen eller tilføje eller fjerne systemikoner."</string> + <string name="permdesc_statusBar" msgid="1365473595331989732">"Tillader, at et program deaktiverer statuslinjen eller tilføjer eller fjerner systemikoner."</string> <string name="permlab_expandStatusBar" msgid="1148198785937489264">"udvid/skjul statuslinje"</string> - <string name="permdesc_expandStatusBar" msgid="7088604400110768665">"Tillader et program at udvide eller skjule statuslinjen."</string> + <string name="permdesc_expandStatusBar" msgid="7088604400110768665">"Tillader, at et program udvider eller skjuler statuslinjen."</string> <string name="permlab_processOutgoingCalls" msgid="1136262550878335980">"opfang udgående opkald"</string> - <string name="permdesc_processOutgoingCalls" msgid="2228988201852654461">"Tillader et program at behandle udgående opkald og ændre nummeret, der skal ringes til. Ondsindede programmer kan overvåge, omdirigere eller forhindre udgående opkald."</string> - <string name="permlab_receiveSms" msgid="2697628268086208535">"modtag SMS"</string> - <string name="permdesc_receiveSms" msgid="6298292335965966117">"Tillader et program at modtage og behandle SMS-beskeder. Ondsindede programmer kan overvåge dine beskeder eller slette dem uden at vise dem til dig."</string> - <string name="permlab_receiveMms" msgid="8894700916188083287">"modtag MMS"</string> - <string name="permdesc_receiveMms" msgid="4563346832000174373">"Tillader et program at modtage og behandle MMS-beskeder. Ondsindede programmer kan overvåge dine beskeder eller slette dem uden at vise dem til dig."</string> - <string name="permlab_sendSms" msgid="5600830612147671529">"send SMS-beskeder"</string> - <string name="permdesc_sendSms" msgid="1946540351763502120">"Tillader et program at sende SMS-beskeder. Ondsindede programmer kan eventuelt koste dig penge ved at sende beskeder uden din bekræftelse."</string> - <string name="permlab_readSms" msgid="4085333708122372256">"læs SMS eller MMS"</string> - <string name="permdesc_readSms" msgid="3002170087197294591">"Tillader et program at læse SMS-beskeder, der er gemt på din telefon eller dit SIM-kort. Ondsindede programmer kan eventuelt læse dine fortrolige beskeder."</string> - <string name="permlab_writeSms" msgid="6881122575154940744">"rediger SMS eller MMS"</string> - <string name="permdesc_writeSms" msgid="6299398896177548095">"Tillader et program at skrive til SMS-beskeder, der er gemt på din telefon eller dit SIM-kort. Ondsindede programmer kan eventuelt slette dine beskeder."</string> + <string name="permdesc_processOutgoingCalls" msgid="2228988201852654461">"Tillader, at et program behandler udgående opkald og ændrer det nummer, der ringes til. Ondsindede programmer kan overvåge, omdirigere eller forhindre udgående opkald."</string> + <string name="permlab_receiveSms" msgid="2697628268086208535">"modtag sms"</string> + <string name="permdesc_receiveSms" msgid="6298292335965966117">"Tillader, at et program modtager og behandler sms-beskeder. Ondsindede programmer kan overvåge dine beskeder eller slette dem uden at vise dem til dig."</string> + <string name="permlab_receiveMms" msgid="8894700916188083287">"modtag mms"</string> + <string name="permdesc_receiveMms" msgid="4563346832000174373">"Tillader, at et program modtager og behandler mms-beskeder. Ondsindede programmer kan overvåge dine beskeder eller slette dem uden at vise dem til dig."</string> + <string name="permlab_sendSms" msgid="5600830612147671529">"send sms-beskeder"</string> + <string name="permdesc_sendSms" msgid="1946540351763502120">"Tillader, at et program at sender sms-beskeder. Ondsindede programmer kan eventuelt koste dig penge ved at sende beskeder uden din bekræftelse."</string> + <string name="permlab_readSms" msgid="4085333708122372256">"læs sms eller mms"</string> + <string name="permdesc_readSms" msgid="3002170087197294591">"Tillader, at et program læser sms-beskeder, der er gemt på din telefon eller dit SIM-kort. Ondsindede programmer kan eventuelt læse dine fortrolige beskeder."</string> + <string name="permlab_writeSms" msgid="6881122575154940744">"rediger sms eller mms"</string> + <string name="permdesc_writeSms" msgid="6299398896177548095">"Tillader, at et program skriver i sms-beskeder, der er gemt på din telefon eller dit SIM-kort. Ondsindede programmer kan eventuelt slette dine beskeder."</string> <string name="permlab_receiveWapPush" msgid="8258226427716551388">"modtag WAP"</string> - <string name="permdesc_receiveWapPush" msgid="5979623826128082171">"Tillader et program at modtage og behandle WAP-beskeder. Ondsindede programmer kan overvåge dine beskeder eller slette dem uden at vise dem til dig."</string> + <string name="permdesc_receiveWapPush" msgid="5979623826128082171">"Tillader, at et program modtager og behandler WAP-beskeder. Ondsindede programmer kan overvåge dine beskeder eller slette dem uden at vise dem til dig."</string> <string name="permlab_getTasks" msgid="5005277531132573353">"hent kørende programmer"</string> - <string name="permdesc_getTasks" msgid="7048711358713443341">"Tillader et program at hente oplysninger om nuværende og for nyligt kørende opgaver. Tillader eventuelt ondsindede programmer at finde private oplysninger om andre programmer."</string> + <string name="permdesc_getTasks" msgid="7048711358713443341">"Tillader, at et program henter oplysninger om nuværende og for nyligt kørende opgaver. Tillader, at eventuelt ondsindede programmer finder private oplysninger om andre programmer."</string> <string name="permlab_reorderTasks" msgid="5669588525059921549">"omorganiser kørende programmer"</string> - <string name="permdesc_reorderTasks" msgid="126252774270522835">"Tillader et program at flytte opgaver til forgrunden og baggrunden. Ondsindede programmer kan tvinge dem selv til forgrunden uden din kontrol."</string> + <string name="permdesc_reorderTasks" msgid="126252774270522835">"Tillader, at et program flytter opgaver til forgrunden og baggrunden. Ondsindede programmer kan tvinge dem selv til forgrunden uden din kontrol."</string> <string name="permlab_setDebugApp" msgid="4339730312925176742">"aktiver programfejlretning"</string> - <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Tillader et program at slå fejlretning af andet program til. Ondsindede programmer kan bruge dette til at standse andre programmer."</string> - <string name="permlab_changeConfiguration" msgid="8214475779521218295">"skift dine UI-indstillinger"</string> - <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Tillader et program at ændre den nuværende konfiguration, som f.eks. den lokale eller overordnede skrifttypestørrelse."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"genstart andre programmer"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Tillader et program at tvangsgenstarte andre programmer."</string> + <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Tillader, at et program slår fejlretning af andet program til. Ondsindede programmer kan bruge dette til at standse andre programmer."</string> + <string name="permlab_changeConfiguration" msgid="8214475779521218295">"skift indstillinger for brugergrænsefladen"</string> + <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Tillader, at et program ændrer den nuværende konfiguration, f.eks. den lokale eller overordnede skrifttypestørrelse."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"tving programmet til at lukke"</string> - <string name="permdesc_forceBack" msgid="6534109744159919013">"Tillader et program at tvinge alle programmer, der er i forgrunden, til at lukke og gå tilbage. Bør aldrig være nødvendigt til normale programmer."</string> + <string name="permdesc_forceBack" msgid="6534109744159919013">"Tillader, at et program tvinger alle programmer, der er i forgrunden, til at lukke og køre i baggrunden. Bør aldrig være nødvendigt til normale programmer."</string> <string name="permlab_dump" msgid="1681799862438954752">"hent intern systemtilstand"</string> - <string name="permdesc_dump" msgid="2198776174276275220">"Tillader et program at hente systemets interne tilstand. Ondsindede programmer kan hente en række private og sikre oplysninger, som de normalt aldrig bør have brug for."</string> + <string name="permdesc_dump" msgid="2198776174276275220">"Tillader, at et program henter systemets interne tilstand. Ondsindede programmer kan hente en række private og sikre oplysninger, som de normalt aldrig bør have brug for."</string> <string name="permlab_shutdown" msgid="7185747824038909016">"delvis lukning"</string> <string name="permdesc_shutdown" msgid="7046500838746291775">"Sætter aktivitetsadministratoren i lukningstilstand. Lukker ikke helt ned."</string> <string name="permlab_stopAppSwitches" msgid="4138608610717425573">"undgå programskift"</string> <string name="permdesc_stopAppSwitches" msgid="3857886086919033794">"Forhindrer brugeren i at skifte til et andet program."</string> <string name="permlab_runSetActivityWatcher" msgid="7811586187574696296">"overvåg og kontroller start af alle programmer"</string> - <string name="permdesc_runSetActivityWatcher" msgid="3228701938345388092">"Tillader et program at overvåge og kontrollere, hvordan systemet starter aktiviteter. Ondsindede programmer kan fuldstændig kompromittere systemet. Denne tilladelse er kun nødvendig til udvikling, aldrig til normal telefonbrug."</string> + <string name="permdesc_runSetActivityWatcher" msgid="3228701938345388092">"Tillader, at et program overvåger og kontrollerer, hvordan systemet starter aktiviteter. Ondsindede programmer kan fuldstændig kompromittere systemet. Denne tilladelse er kun nødvendig til udvikling, aldrig til normal telefonbrug."</string> <string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"send udsendelse om fjernet pakke"</string> - <string name="permdesc_broadcastPackageRemoved" msgid="3453286591439891260">"Tillader et program at udsende en meddelelse om, at en programpakke er fjernet. Ondsindede programmer kan bruge dette til at afslutte et andet kørende program."</string> - <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"send SMS-modtaget udsendelse"</string> - <string name="permdesc_broadcastSmsReceived" msgid="9122419277306740155">"Tillader et program at udsende en meddelelse om, at der er modtaget en SMS-besked. Ondsindede programmer kan eventuelt bruge dette til at forfalske indgående SMS-beskeder."</string> + <string name="permdesc_broadcastPackageRemoved" msgid="3453286591439891260">"Tillader, at et program udsender en meddelelse om, at en programpakke er fjernet. Ondsindede programmer kan bruge dette til at afslutte et andet kørende program."</string> + <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"send sms-modtaget udsendelse"</string> + <string name="permdesc_broadcastSmsReceived" msgid="9122419277306740155">"Tillader, at et program udsender en meddelelse om, at der er modtaget en sms-besked. Ondsindede programmer kan eventuelt bruge dette til at forfalske indgående sms-beskeder."</string> <string name="permlab_broadcastWapPush" msgid="3145347413028582371">"send WAP-PUSH-modtaget udsendelse"</string> - <string name="permdesc_broadcastWapPush" msgid="3955303669461378091">"Tillader et program at udsende en meddelelse om, at der er modtaget en WAP PUSH-besked. Ondsindede programmer kan eventuelt bruge dette til at forfalske modtagelse af MMS-besked eller i det skjulte erstatte indholdet på alle websider med ondsindede varianter."</string> + <string name="permdesc_broadcastWapPush" msgid="3955303669461378091">"Tillader, at et program udsender en meddelelse om, at der er modtaget en WAP PUSH-besked. Ondsindede programmer kan eventuelt bruge dette til at forfalske modtagelse af mms-besked eller i det skjulte erstatte indholdet på alle websider med ondsindede varianter."</string> <string name="permlab_setProcessLimit" msgid="2451873664363662666">"begræns antallet af kørende processer"</string> - <string name="permdesc_setProcessLimit" msgid="7824786028557379539">"Tillader et program at kontrollere det maksimale antal processer, der kan køre. Er aldrig nødvendigt til normale programmer."</string> + <string name="permdesc_setProcessLimit" msgid="7824786028557379539">"Tillader, at et program kontrollerer det maksimale antal processer, der kan køre. Er aldrig nødvendigt til normale programmer."</string> <string name="permlab_setAlwaysFinish" msgid="5342837862439543783">"få alle baggrundsprogrammer til at lukke"</string> - <string name="permdesc_setAlwaysFinish" msgid="8773936403987091620">"Tillader et program at kontrollere, om aktiviteter altid afsluttes, så snart de går i baggrunden. Aldrig nødvendigt til normale programmer."</string> + <string name="permdesc_setAlwaysFinish" msgid="8773936403987091620">"Tillader, at et program kontrollerer, om aktiviteter altid afsluttes, så snart de går i baggrunden. Aldrig nødvendigt til normale programmer."</string> <string name="permlab_batteryStats" msgid="7863923071360031652">"rediger batteristatistikker"</string> <string name="permdesc_batteryStats" msgid="5847319823772230560">"Tillader ændring af indsamlede batteristatistikker. Ikke til brug for normale programmer."</string> <string name="permlab_backup" msgid="470013022865453920">"kontroller sikkerhedskopiering af system, og gendan"</string> - <string name="permdesc_backup" msgid="4837493065154256525">"Tillader et program at kontrollere systemets sikkerhedskopierings- og gendannelsesmekanisme. Ikke til brug til normale programmer."</string> - <string name="permlab_backup_data" msgid="4057625941707926463">"Sikkerhedskopier og gendan programmets data"</string> - <string name="permdesc_backup_data" msgid="8274426305151227766">"Tillader et program at kontrollere systemets sikkerhedskopierings- og gendannelsesmekanisme."</string> + <string name="permdesc_backup" msgid="4837493065154256525">"Tillader, at et program kontrollerer systemets sikkerhedskopierings- og gendannelsesfunktion. Ikke til brug til normale programmer."</string> + <string name="permlab_backup_data" msgid="4057625941707926463">"sikkerhedskopier og gendan programmets data"</string> + <string name="permdesc_backup_data" msgid="8274426305151227766">"Tillader, at et program deltager i systemets sikkerhedskopierings- og gendannelsesfunktion."</string> <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"vis uautoriserede vinduer"</string> <string name="permdesc_internalSystemWindow" msgid="5895082268284998469">"Tillader oprettelse af vinduer, der er beregnet til at blive brugt af den interne systembrugergrænseflade. Ikke til brug for normale programmer."</string> <string name="permlab_systemAlertWindow" msgid="3372321942941168324">"vis underretninger på systemniveau"</string> - <string name="permdesc_systemAlertWindow" msgid="5109622689323490558">"Tillader et program at vise systemunderretningsvinduer. Ondsindede programmer kan overtage hele telefonens skærm."</string> + <string name="permdesc_systemAlertWindow" msgid="5109622689323490558">"Tillader, at et program viser vinduer med systemunderretninger. Ondsindede programmer kan overtage hele telefonens skærm."</string> <string name="permlab_setAnimationScale" msgid="2805103241153907174">"rediger global animationshastighed"</string> - <string name="permdesc_setAnimationScale" msgid="7181522138912391988">"Tillader et program at ændre den globale animationshastighed (hurtigere eller langsommere animationer) når som helst."</string> + <string name="permdesc_setAnimationScale" msgid="7181522138912391988">"Tillader, at et program altid kan ændre den globale animationshastighed (hurtigere eller langsommere animationer)."</string> <string name="permlab_manageAppTokens" msgid="17124341698093865">"administrer programtokens"</string> - <string name="permdesc_manageAppTokens" msgid="977127907524195988">"Tillader programmet at oprette og administrere deres egen tokens og gå uden om deres normale Z-rækkefølge. Bør aldrig være nødvendigt til normale programmer."</string> + <string name="permdesc_manageAppTokens" msgid="977127907524195988">"Tillader, at programmet opretter og administrerer sine egen tokens og gå uden om sin normale Z-rækkefølge. Bør aldrig være nødvendigt til normale programmer."</string> <string name="permlab_injectEvents" msgid="1378746584023586600">"tryk på taster og kontrolknapper"</string> - <string name="permdesc_injectEvents" msgid="3946098050410874715">"Tillader et program at levere sine egne inputbegivenheder (tastetryk osv.) til andre programmer. Ondsindede programmer kan bruge dette til at overtage telefonen."</string> + <string name="permdesc_injectEvents" msgid="3946098050410874715">"Tillader, at et program leverer sine egne inputbegivenheder (tastetryk osv.) til andre programmer. Ondsindede programmer kan bruge dette til at overtage telefonen."</string> <string name="permlab_readInputState" msgid="469428900041249234">"registrerer, hvad du indtaster, og hvilke handlinger du foretager dig"</string> - <string name="permdesc_readInputState" msgid="5132879321450325445">"Tillader et program at holde øje med de taster, du trykker på, selv når du interagerer med andre programmer (som f.eks. indtastning af adgangskode). Bør aldrig være nødvendigt til normale programmer."</string> + <string name="permdesc_readInputState" msgid="5132879321450325445">"Tillader, at et program registrerer taster, du trykker på, selv når du interagerer med andre programmer (f.eks. ved indtastning af adgangskode). Bør aldrig være nødvendigt til normale programmer."</string> <string name="permlab_bindInputMethod" msgid="3360064620230515776">"forpligt til en inputmetode"</string> - <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Tillader brugeren at forpligte sig på en inputmetodes grænseflade på øverste niveau. Bør aldrig være nødvendig til normale programmer."</string> + <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Tillader, at brugeren forpligter sig til en inputmetodes grænseflade på øverste niveau. Bør aldrig være nødvendig til normale programmer."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"forpligt til et tapet"</string> - <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Tillader brugeren at forpligte sig på et tapets grænseflade på øverste niveau. Bør aldrig være nødvendig til normale programmer."</string> + <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Tillader, at brugeren forpligter sig til et tapets grænseflade på øverste niveau. Bør aldrig være nødvendig til normale programmer."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"skift skærmretning"</string> - <string name="permdesc_setOrientation" msgid="6335814461615851863">"Tillader et program at ændre rotationen af skærmen når som helst. Bør aldrig være nødvendigt til normale programmer."</string> + <string name="permdesc_setOrientation" msgid="6335814461615851863">"Tillader, at et program ændrer rotationen af skærmen når som helst. Bør aldrig være nødvendigt til normale programmer."</string> <string name="permlab_signalPersistentProcesses" msgid="4255467255488653854">"send Linux-signaler til programmer"</string> - <string name="permdesc_signalPersistentProcesses" msgid="3565530463215015289">"Tillader program at anmode om, at det leverede signal sendes til alle vedholdende processer."</string> + <string name="permdesc_signalPersistentProcesses" msgid="3565530463215015289">"Tillader, at programmet kan anmode om, at det leverede signal sendes til alle vedholdende processer."</string> <string name="permlab_persistentActivity" msgid="8659652042401085862">"lad altid programmet køre"</string> - <string name="permdesc_persistentActivity" msgid="5037199778265006008">"Tillader et program at gøre dele af sig selv vedholdende, så systemet ikke kan bruge det til andre programmer."</string> + <string name="permdesc_persistentActivity" msgid="5037199778265006008">"Tillader, at et program gør dele af sig selv vedholdende, så systemet ikke kan bruge det til andre programmer."</string> <string name="permlab_deletePackages" msgid="3343439331576348805">"slet programmer"</string> - <string name="permdesc_deletePackages" msgid="3634943677518723314">"Tillader et program at slette Android-pakker. Ondsindede programmer kan bruge dette til at slette vigtige programmer."</string> + <string name="permdesc_deletePackages" msgid="3634943677518723314">"Tillader, at et program sletter Android-pakker. Ondsindede programmer kan bruge dette til at slette vigtige programmer."</string> <string name="permlab_clearAppUserData" msgid="2192134353540277878">"slet andre programmers data"</string> - <string name="permdesc_clearAppUserData" msgid="7546345080434325456">"Lader et program rydde brugerdata."</string> + <string name="permdesc_clearAppUserData" msgid="7546345080434325456">"Tillader, at et program rydder brugerdata."</string> <string name="permlab_deleteCacheFiles" msgid="1518556602634276725">"slet andre programmers cacher"</string> - <string name="permdesc_deleteCacheFiles" msgid="2283074077168165971">"Tillader et program at slette cachefiler."</string> - <string name="permlab_getPackageSize" msgid="4799785352306641460">"måler programmets lagerplads"</string> - <string name="permdesc_getPackageSize" msgid="5557253039670753437">"Tillader et program at hente dets kode, data og cachestørrelser"</string> + <string name="permdesc_deleteCacheFiles" msgid="2283074077168165971">"Tillader, at et program sletter cachefiler."</string> + <string name="permlab_getPackageSize" msgid="4799785352306641460">"vis programmets lagerplads"</string> + <string name="permdesc_getPackageSize" msgid="5557253039670753437">"Tillader, at et program henter sin kode, data og cachestørrelser"</string> <string name="permlab_installPackages" msgid="335800214119051089">"installer programmer direkte"</string> - <string name="permdesc_installPackages" msgid="526669220850066132">"Tillader et program at installere nye eller opdaterede Android-pakker. Ondsindede programmer kan bruge dette til at tilføje nye programmer med vilkårlige, effektive tilladelser."</string> + <string name="permdesc_installPackages" msgid="526669220850066132">"Tillader, at et program installerer nye eller opdaterede Android-pakker. Ondsindede programmer kan bruge dette til at tilføje nye programmer med vilkårlige, effektive tilladelser."</string> <string name="permlab_clearAppCache" msgid="4747698311163766540">"slet alle cachedata for programmet"</string> - <string name="permdesc_clearAppCache" msgid="7740465694193671402">"Tillader et program at frigøre plads på telefonen ved at slette filer i programmets cachemappe. Adgang er normalt meget begrænset til systemprocesser."</string> + <string name="permdesc_clearAppCache" msgid="7740465694193671402">"Tillader, at et program frigør plads på telefonen ved at slette filer i programmets cachemappe. Adgang er normalt meget begrænset til systemprocesser."</string> <string name="permlab_readLogs" msgid="4811921703882532070">"læs systemlogfiler"</string> - <string name="permdesc_readLogs" msgid="2257937955580475902">"Tillader et program at læse fra systemets forskellige logfiler. Dermed kan generelle oplysninger om, hvad du laver med telefonen, opdages, men logfilerne skulle ikke indeholde personlige eller private oplysninger."</string> + <string name="permdesc_readLogs" msgid="2257937955580475902">"Tillader, at et program læser fra systemets forskellige logfiler. Dermed kan generelle oplysninger om, hvad du laver med telefonen, registreres, men logfilerne bør ikke indeholde personlige eller private oplysninger."</string> <string name="permlab_diagnostic" msgid="8076743953908000342">"læs/skriv til ressourcer ejet af diag"</string> - <string name="permdesc_diagnostic" msgid="3121238373951637049">"Tillader et program at læse og skrive til alle ressourcer, der ejes af diag-gruppen, som f.eks. flier i /dev. Dette kan muligvis påvirke systemets stabilitet og sikkerhed. Dette bør KUN bruges til hardwarespecifikke diagnosticeringer foretaget af producent eller udbyder."</string> + <string name="permdesc_diagnostic" msgid="3121238373951637049">"Tillader, at et program læser og skriver til alle ressourcer, der ejes af diag-gruppen, som f.eks. flier i /dev. Dette kan muligvis påvirke systemets stabilitet og sikkerhed. Dette bør KUN bruges til hardwarespecifikke diagnosticeringer foretaget af producent eller udbyder."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"aktiver eller deaktiver programkomponenter"</string> - <string name="permdesc_changeComponentState" msgid="4569107043246700630">"Tillader et program at ændre, om en komponent fra et andet program er aktiveret eller ej. Ondsindede programmer kan bruge dette til at deaktivere vigtige telefonfunktioner. Denne tilladelse skal anvendes med forsigtighed, da det kan forårsage ubrugelige, inkonsekvente eller ustabile programkomponenter."</string> - <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"indstil foretrukne programmer"</string> - <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Tillader et program at ændre dine foretrukne programmer. Dette kan tillade, at ondsindede programmer ændrer kørende programmer i det skjulte og narrer dine eksisterende programmer til at indsamle personlige data fra dig."</string> + <string name="permdesc_changeComponentState" msgid="4569107043246700630">"Tillader, at et program ændrer, om en komponent fra et andet program er aktiveret eller ej. Ondsindede programmer kan bruge dette til at deaktivere vigtige telefonfunktioner. Denne tilladelse skal anvendes med forsigtighed, da det kan forårsage ubrugelige, inkonsekvente eller ustabile programkomponenter."</string> + <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"angiv foretrukne programmer"</string> + <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Tillader, at et program ændrer dine foretrukne programmer. Dette kan medføre, at ondsindede programmer ændrer kørende programmer i det skjulte og narrer dine eksisterende programmer til at indsamle personlige oplysninger fra dig."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"rediger globale systemindstillinger"</string> - <string name="permdesc_writeSettings" msgid="838789419871034696">"Tillader et program at ændre systemets indstillingsdata. Ondsindede programmer kan skade systemets konfiguration."</string> + <string name="permdesc_writeSettings" msgid="838789419871034696">"Tillader, at et program ændrer systemets indstillingsdata. Ondsindede programmer kan skade systemets konfiguration."</string> <string name="permlab_writeSecureSettings" msgid="204676251876718288">"rediger sikre systemindstillinger"</string> - <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"Tillader et program at ændre systemernes sikre indstillingsdata. Ikke til brug til almindelige programmer."</string> + <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"Tillader, at et program ændrer systemernes sikre indstillingsdata. Ikke til brug til almindelige programmer."</string> <string name="permlab_writeGservices" msgid="2149426664226152185">"rediger kortet over Google-tjenester"</string> - <string name="permdesc_writeGservices" msgid="6602362746516676175">"Tillader et program at ændre kortet over Google-tjenester. Ikke til brug til normale programmer."</string> + <string name="permdesc_writeGservices" msgid="6602362746516676175">"Tillader, at et program ændrer kortet over Google-tjenester. Ikke til brug til normale programmer."</string> <string name="permlab_receiveBootCompleted" msgid="7776779842866993377">"start automatisk ved opstart"</string> - <string name="permdesc_receiveBootCompleted" msgid="698336728415008796">"Tillader et program at starte selv, når systemet er færdig med at starte. Dette kan gøre start af telefonen langsommere og generelt gøre telefonen langsommere ved altid at lade programmet køre."</string> + <string name="permdesc_receiveBootCompleted" msgid="698336728415008796">"Tillader, at et program starter selv, når systemet er færdig med at starte. Dette kan gøre startem af telefonen langsommere og generelt gøre telefonen langsommere ved altid at lade programmet køre."</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"send klæbende udsendelse"</string> - <string name="permdesc_broadcastSticky" msgid="1920045289234052219">"Tillader et program at sende klæbende udsendelser, der bliver tilbage, efter udsendelsen er slut. Ondsindede programmer kan gøre telefonen langsom eller ustabil ved at få den til at bruge for meget hukommelse."</string> + <string name="permdesc_broadcastSticky" msgid="1920045289234052219">"Tillader, at et program sender klæbende udsendelser, der bliver tilbage, efter udsendelsen er slut. Ondsindede programmer kan gøre telefonen langsom eller ustabil ved at få den til at bruge for meget hukommelse."</string> <string name="permlab_readContacts" msgid="6219652189510218240">"læs kontaktdata"</string> - <string name="permdesc_readContacts" msgid="3371591512896545975">"Tillader et program at læse alle kontaktdata (adresse), der er gemt på din telefon. Ondsindede programmer kan bruge dette til at sende dine data til andre mennesker."</string> + <string name="permdesc_readContacts" msgid="3371591512896545975">"Tillader, at et program læser alle kontaktdata (adresser), der er gemt på din telefon. Ondsindede programmer kan bruge dette til at sende dine data til andre mennesker."</string> <string name="permlab_writeContacts" msgid="644616215860933284">"skriv kontaktdata"</string> - <string name="permdesc_writeContacts" msgid="3924383579108183601">"Tillader et program at ændre telefonens kontaktdata (adresse), der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre kontaktdata."</string> + <string name="permdesc_writeContacts" msgid="3924383579108183601">"Tillader, at et program ændrer kontaktdata (adresser), der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre kontaktdata."</string> <string name="permlab_writeOwnerData" msgid="4892555913849295393">"skriv ejerdata"</string> - <string name="permdesc_writeOwnerData" msgid="2344055317969787124">"Tillader et program at ændre telefonens ejerdata, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre ejerdata."</string> + <string name="permdesc_writeOwnerData" msgid="2344055317969787124">"Tillader, at et program ændrer rtelefonens ejerdata, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre ejerdata."</string> <string name="permlab_readOwnerData" msgid="6668525984731523563">"læs ejerdata"</string> - <string name="permdesc_readOwnerData" msgid="3088486383128434507">"Tillader et program at læse telefonens ejerdata, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at læse ejerdata."</string> + <string name="permdesc_readOwnerData" msgid="3088486383128434507">"Tillader, at et program læser telefonens ejerdata, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at læse ejerdata."</string> <string name="permlab_readCalendar" msgid="3728905909383989370">"læs kalenderdata"</string> - <string name="permdesc_readCalendar" msgid="5533029139652095734">"Tillader et program at læse alle kalenderbegivenheder, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at sende dine kalenderbegivenheder til andre mennesker."</string> + <string name="permdesc_readCalendar" msgid="5533029139652095734">"Tillader, at et program læser alle kalenderbegivenheder, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at sende dine kalenderbegivenheder til andre mennesker."</string> <string name="permlab_writeCalendar" msgid="377926474603567214">"skriv kalenderdata"</string> - <string name="permdesc_writeCalendar" msgid="8674240662630003173">"Tillader et program at ændre telefonens kalenderbegivenheder, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre kalenderdata."</string> + <string name="permdesc_writeCalendar" msgid="8674240662630003173">"Tillader, at et program ændrer de kalenderbegivenheder, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre kalenderdata."</string> <string name="permlab_accessMockLocation" msgid="8688334974036823330">"imiterede placeringskilder til test"</string> <string name="permdesc_accessMockLocation" msgid="7648286063459727252">"Opret imiterede placeringskilder til testning. Ondsindede programmer kan bruge dette til at tilsidesætte den returnerede placering og/eller status fra rigtige placeringskilder som f.eks. GPS eller netværksudbydere."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"få adgang til ekstra kommandoer for placeringsudbyder"</string> @@ -291,109 +294,113 @@ <string name="permlab_accessCoarseLocation" msgid="4642255009181975828">"grov (netværksbaseret) placering"</string> <string name="permdesc_accessCoarseLocation" msgid="8235655958070862293">"Få adgang til grove placeringskilder som f.eks. den mobile netværksdatabase for at finde en omtrentlig placering for telefonen, hvor det er muligt. Ondsindede programmer kan bruge dette til at finde ud af, hvor du omtrent er."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"få adgang til SurfaceFlinger"</string> - <string name="permdesc_accessSurfaceFlinger" msgid="6805241830020733025">"Tillader et program at bruge SurfaceFlinger-funktioner på lavt niveau."</string> + <string name="permdesc_accessSurfaceFlinger" msgid="6805241830020733025">"Tillader, at et program bruger SurfaceFlinger-funktioner på lavt niveau."</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"læs rammebuffer"</string> - <string name="permdesc_readFrameBuffer" msgid="7530020370469942528">"Tillader et program at læse indholdet fra rammebufferen."</string> + <string name="permdesc_readFrameBuffer" msgid="7530020370469942528">"Tillader, at et program læser indholdet fra rammebufferen."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"skift dine lydindstillinger"</string> - <string name="permdesc_modifyAudioSettings" msgid="5793461287365991922">"Tillader et program at ændre globale lydindstillinger som f.eks. lydstyrke og kanalisering."</string> + <string name="permdesc_modifyAudioSettings" msgid="5793461287365991922">"Tillader, at et program ændrer globale lydindstillinger som f.eks. lydstyrke og kanalisering."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"optag lyd"</string> - <string name="permdesc_recordAudio" msgid="6493228261176552356">"Tillader et program at få adgang til lydregistreringsstien."</string> + <string name="permdesc_recordAudio" msgid="6493228261176552356">"Tillader, at et program får adgang til lydregistreringsstien."</string> <string name="permlab_camera" msgid="8059288807274039014">"tag billeder"</string> - <string name="permdesc_camera" msgid="9013476258810982546">"Tillader programmet at tage billeder med kameraet. Dette tillader programmet til hver en tid at indsamle de billeder, kameraet ser."</string> + <string name="permdesc_camera" msgid="9013476258810982546">"Tillader, at programmet tager billeder med kameraet. Dette giver programmet mulighed for altid at indsamle de billeder, kameraet ser."</string> <string name="permlab_brick" msgid="8337817093326370537">"deaktiver telefonen permanent"</string> - <string name="permdesc_brick" msgid="5569526552607599221">"Tillader programmet at deaktivere hele telefonen permanent. Dette er meget farligt."</string> + <string name="permdesc_brick" msgid="5569526552607599221">"Tillader, at programmet deaktiverer hele telefonen permanent. Dette er meget farligt."</string> <string name="permlab_reboot" msgid="2898560872462638242">"tving telefon til at genstarte"</string> - <string name="permdesc_reboot" msgid="7914933292815491782">"Tillader programmet at tvinge telefonen til at genstarte."</string> + <string name="permdesc_reboot" msgid="7914933292815491782">"Tillader, at programmet tvinger telefonen til at genstarte."</string> <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"monter eller demonter filsystemer"</string> - <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Tillader programmet at montere eller demontere filsystemer til flytbar lagring."</string> + <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Tillader, at programmet monterer eller demonterer filsystemer til flytbar lagring."</string> <string name="permlab_mount_format_filesystems" msgid="5523285143576718981">"formater ekstern lagring"</string> - <string name="permdesc_mount_format_filesystems" msgid="574060044906047386">"Tillader et program at formatere flytbar lagring."</string> + <string name="permdesc_mount_format_filesystems" msgid="574060044906047386">"Tillader, at et program formaterer flytbart lager."</string> <string name="permlab_vibrate" msgid="7768356019980849603">"kontroller vibrator"</string> <string name="permdesc_vibrate" msgid="2886677177257789187">"Lader programmet kontrollere vibratoren."</string> <string name="permlab_flashlight" msgid="2155920810121984215">"kontroller lommelygte"</string> - <string name="permdesc_flashlight" msgid="6433045942283802309">"Tillader programmet at kontrollere lommelygten."</string> + <string name="permdesc_flashlight" msgid="6433045942283802309">"Tillader, at programmet kontrollerer lommelygten."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"test hardware"</string> - <string name="permdesc_hardware_test" msgid="3668894686500081699">"Tillader et program at kontrollere forskellige perifere enheder med det formål at teste hardwaren."</string> + <string name="permdesc_hardware_test" msgid="3668894686500081699">"Tillader, at et program kontrollerer forskellige perifere enheder for at teste hardwaren."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ring direkte op til telefonnumre"</string> - <string name="permdesc_callPhone" msgid="3369867353692722456">"Tillader programmet at ringe til telefonnumre uden din indgriben. Ondsindede programmer kan forårsage uventede opkald på din telefonregning. Vær opmærksom på, at det ikke tillader programmet at ringe til nødnumre."</string> + <string name="permdesc_callPhone" msgid="3369867353692722456">"Tillader, at programmet ringer til telefonnumre uden din indgriben. Ondsindede programmer kan forårsage uventede opkald på din telefonregning. Vær opmærksom på, at programmet ikke kan ringe til nødnumre."</string> <string name="permlab_callPrivileged" msgid="4198349211108497879">"ring direkte op til alle telefonnumre"</string> - <string name="permdesc_callPrivileged" msgid="244405067160028452">"Tillader programmet at ringe til alle telefonnumre inklusive nødnumre uden din indgriben. Ondsindede programmer kan eventuelt foretage unødvendige og ulovlige opkald til nødtjenester."</string> + <string name="permdesc_callPrivileged" msgid="244405067160028452">"Tillader, at programmet ringer til alle telefonnumre inklusive nødnumre uden din indgriben. Ondsindede programmer kan eventuelt foretage unødvendige og ulovlige opkald til nødtjenester."</string> <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"start CDMA-telefonopsætning direkte"</string> - <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Tillader, at programmet starter CDMA-levering. Onsindede programmer kan starte unødvendig CDMA-levering"</string> + <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Tillader, at programmet starter CDMA-levering. Ondsindede programmer kan starte unødvendig CDMA-levering"</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"kontroller meddelelser om placeringsopdatering"</string> <string name="permdesc_locationUpdates" msgid="2300018303720930256">"Tillader aktivering/deaktivering af placeringsdata fra radioen. Ikke til brug til normale programmer."</string> <string name="permlab_checkinProperties" msgid="7855259461268734914">"egenskaber for adgangskontrol"</string> <string name="permdesc_checkinProperties" msgid="7150307006141883832">"Tillader læse/skrive-adgang til egenskaber, der er uploadet af kontroltjenesten. Ikke til brug til normale programmer."</string> <string name="permlab_bindGadget" msgid="776905339015863471">"vælg widgets"</string> - <string name="permdesc_bindGadget" msgid="2098697834497452046">"Tillader programmet at fortælle systemet, hvilke widgets der kan bruges af hvilke programmer. Med denne tilladelse kan programmer give adgang til personlige data til andre programmer. Ikke til brug til normale programmer."</string> + <string name="permdesc_bindGadget" msgid="2098697834497452046">"Tillader, at programmet fortæller systemet, hvilke widgets der kan bruges af hvilke programmer. Med denne tilladelse kan programmer give adgang til personlige oplysninger til andre programmer. Ikke til brug til normale programmer."</string> <string name="permlab_modifyPhoneState" msgid="8423923777659292228">"rediger telefontilstand"</string> - <string name="permdesc_modifyPhoneState" msgid="3302284561346956587">"Tillader programmet at kontrollere enhedens telefonfunktioner. Et program med denne tilladelse kan skifte netværk, slå telefonens radio til og fra og lignende uden nogensinde at underrette dig."</string> + <string name="permdesc_modifyPhoneState" msgid="3302284561346956587">"Tillader, at programmet kontrollerer enhedens telefonfunktioner. Et program med denne tilladelse kan skifte netværk, slå telefonens radio til og fra og lignende uden nogensinde at informere dig."</string> <string name="permlab_readPhoneState" msgid="2326172951448691631">"læs telefontilstand og identitet"</string> - <string name="permdesc_readPhoneState" msgid="188877305147626781">"Tillader programmet at få adgang til enhedens telefonfunktioner. Et program med denne tilladelse kan afgøre denne telefons telefon- og serienummer, om et opkald er aktivt, nummeret som opkaldet er forbundet til osv."</string> + <string name="permdesc_readPhoneState" msgid="188877305147626781">"Tillader, at programmet får adgang til enhedens telefonfunktioner. Et program kan med denne tilladelse registrere denne telefons telefon- og serienummer, om et opkald er aktivt, nummeret som det opkald er forbundet til osv."</string> <string name="permlab_wakeLock" msgid="573480187941496130">"afhold telefonen fra at gå i dvale"</string> - <string name="permdesc_wakeLock" msgid="7584036471227467099">"Tillader et program at forhindre telefonen i at gå i dvale."</string> - <string name="permlab_devicePower" msgid="4928622470980943206">"Tænd eller sluk for telefonen"</string> - <string name="permdesc_devicePower" msgid="4577331933252444818">"Tillader programmet at slå telefonen til eller fra."</string> + <string name="permdesc_wakeLock" msgid="7584036471227467099">"Tillader, at et program forhindrer telefonen i at gå i dvale."</string> + <string name="permlab_devicePower" msgid="4928622470980943206">"tænd eller sluk for telefonen"</string> + <string name="permdesc_devicePower" msgid="4577331933252444818">"Tillader, at programmet slukker og tænder telefonen."</string> <string name="permlab_factoryTest" msgid="3715225492696416187">"kør i fabriksindstillet testtilstand"</string> <string name="permdesc_factoryTest" msgid="8136644990319244802">"Kør som en producenttest på lavt niveau. Giver fuld adgang til telefonens hardware. Kun tilgængeligt når en telefon kører i producenttesttilstand."</string> <string name="permlab_setWallpaper" msgid="6627192333373465143">"angiv tapet"</string> - <string name="permdesc_setWallpaper" msgid="6417041752170585837">"Tillader programmet at opsætte systemets tapet."</string> + <string name="permdesc_setWallpaper" msgid="6417041752170585837">"Tillader, at programmet opsætter systemets tapet."</string> <string name="permlab_setWallpaperHints" msgid="3600721069353106851">"opsæt tip til tapetstørrelse"</string> - <string name="permdesc_setWallpaperHints" msgid="6019479164008079626">"Tillader programmet at opsætte størrelsestip for systemets tapet."</string> + <string name="permdesc_setWallpaperHints" msgid="6019479164008079626">"Tillader, at programmet opsætter størrelsestip for systemets tapet."</string> <string name="permlab_masterClear" msgid="2315750423139697397">"nulstil system til fabriksstandarder"</string> - <string name="permdesc_masterClear" msgid="5033465107545174514">"Tillader et program fuldstændig at nulstille systemet til fabriksindstillingerne, slette alle data, konfigurationen og installerede programmer."</string> - <string name="permlab_setTimeZone" msgid="2945079801013077340">"indstil tidszone"</string> - <string name="permdesc_setTimeZone" msgid="1902540227418179364">"Tillader et program at ændre telefonens tidszone."</string> + <string name="permdesc_masterClear" msgid="5033465107545174514">"Tillader, at et program nulstiller systemet fuldstændig til fabriksindstillingerne, sletter alle data, konfigurationer og installerede programmer."</string> + <string name="permlab_setTimeZone" msgid="2945079801013077340">"angiv tidszone"</string> + <string name="permdesc_setTimeZone" msgid="1902540227418179364">"Tillader, at et program ændrer telefonens tidszone."</string> <string name="permlab_accountManagerService" msgid="4829262349691386986">"fungerer som kontoadministrationstjeneste"</string> - <string name="permdesc_accountManagerService" msgid="6056903274106394752">"Tillader et program at foretage opkald til kontogodkendere"</string> - <string name="permlab_getAccounts" msgid="4549918644233460103">"opdag kendte konti"</string> - <string name="permdesc_getAccounts" msgid="6839262446413155394">"Tillader et program at hente listen over konti, der er kendt af telefonen."</string> + <string name="permdesc_accountManagerService" msgid="6056903274106394752">"Tillader, at et program foretager opkald til kontogodkendere"</string> + <string name="permlab_getAccounts" msgid="4549918644233460103">"registrer kendte konti"</string> + <string name="permdesc_getAccounts" msgid="6839262446413155394">"Tillader, at et program henter listen over konti, der er kendt af telefonen."</string> <string name="permlab_authenticateAccounts" msgid="3940505577982882450">"fungerer som en kontogodkender"</string> - <string name="permdesc_authenticateAccounts" msgid="4006839406474208874">"Tillader et program at bruge kontoadministratorens kontogodkendelsesegenskaber, bl.a. oprettelse af konti samt hentning og indstilling af deres adgangskoder."</string> - <string name="permlab_manageAccounts" msgid="4440380488312204365">"administrer kontilisten"</string> - <string name="permdesc_manageAccounts" msgid="8804114016661104517">"Tillader et program at foretage handlinger, som f.eks. at tilføje og fjerne konti samt slette deres adgangskode."</string> + <string name="permdesc_authenticateAccounts" msgid="4006839406474208874">"Tillader, at et program bruger kontoadministratorens kontogodkendelsesegenskaber, bl.a. oprettelse af konti samt hentning og indstilling af deres adgangskoder."</string> + <string name="permlab_manageAccounts" msgid="4440380488312204365">"administrer kontolisten"</string> + <string name="permdesc_manageAccounts" msgid="8804114016661104517">"Tillader, at et program foretager handlinger, f.eks. at tilføje og fjerne konti samt slette sin adgangskode."</string> <string name="permlab_useCredentials" msgid="6401886092818819856">"brug en kontos godkendelsesoplysninger"</string> - <string name="permdesc_useCredentials" msgid="7416570544619546974">"Tillader et program at anmode om godkendelsestokens"</string> + <string name="permdesc_useCredentials" msgid="7416570544619546974">"Tillader, at et program anmoder om godkendelsestokens"</string> <string name="permlab_accessNetworkState" msgid="6865575199464405769">"vis netværkstilstand"</string> - <string name="permdesc_accessNetworkState" msgid="558721128707712766">"Tillader et program at vise tilstanden for alle netværk."</string> + <string name="permdesc_accessNetworkState" msgid="558721128707712766">"Tillader, at et program viser tilstanden for alle netværk."</string> <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"Fuld internetadgang"</string> - <string name="permdesc_createNetworkSockets" msgid="4593339106921772192">"Tillader et program at oprette netværks-sockets."</string> + <string name="permdesc_createNetworkSockets" msgid="4593339106921772192">"Tillader, at et program opretter netværks-sockets."</string> <string name="permlab_writeApnSettings" msgid="7823599210086622545">"skriv indstillinger for adgangspunktnavn"</string> - <string name="permdesc_writeApnSettings" msgid="7443433457842966680">"Tillader et program at ændre APN-indstillingerne, som f.eks. enhver APNs Proxy og Port."</string> + <string name="permdesc_writeApnSettings" msgid="7443433457842966680">"Tillader, at et program ændrer APN-indstillingerne, f.eks. enhver APNs Proxy og Port."</string> <string name="permlab_changeNetworkState" msgid="958884291454327309">"skift netværksforbindelse"</string> - <string name="permdesc_changeNetworkState" msgid="6278115726355634395">"Tillader et program at ændre netværksforbindelsens tilstand."</string> + <string name="permdesc_changeNetworkState" msgid="6278115726355634395">"Tillader, at et program ændrer netværksforbindelsens tilstand."</string> <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"skift brugerindstilling for baggrundsdata"</string> - <string name="permdesc_changeBackgroundDataSetting" msgid="1001482853266638864">"Tillader et program at ændre brugerindstillingerne for baggrundsdata."</string> + <string name="permdesc_changeBackgroundDataSetting" msgid="1001482853266638864">"Tillader, at et program ændrer brugerindstillingerne for baggrundsdata."</string> <string name="permlab_accessWifiState" msgid="8100926650211034400">"vis Wi-Fi-tilstand"</string> - <string name="permdesc_accessWifiState" msgid="485796529139236346">"Tillader et program at vise oplysninger om Wi-Fi-tilstanden."</string> + <string name="permdesc_accessWifiState" msgid="485796529139236346">"Tillader, at et program viser oplysninger om Wi-Fi-tilstanden."</string> <string name="permlab_changeWifiState" msgid="7280632711057112137">"skift Wi-Fi-tilstand"</string> - <string name="permdesc_changeWifiState" msgid="2950383153656873267">"Tillader et program at oprette og afbryde forbindelse fra Wi-Fi-adgangspunkter og foretage ændringer til konfigurerede Wi-Fi-netværk."</string> + <string name="permdesc_changeWifiState" msgid="2950383153656873267">"Tillader, at et program opretter og afbryder forbindelsen fra Wi-Fi-adgangspunkter og foretager ændringer i konfigurerede Wi-Fi-netværk."</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"tillad Wi-Fi-multicastmodtagelse"</string> - <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Tillader et program at modtage pakker, der ikke er direkte adresseret til din enhed. Dette kan være nyttigt, hvis du finder tjenester, der er tilbudt i nærheden. Det bruger mere strøm end multicasttilstanden."</string> + <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"Tillader, at et program modtager pakker, der ikke er direkte adresseret til din enhed. Dette kan være nyttigt, hvis du finder tjenester, der tilbydes i nærheden. Det bruger mere strøm end multicasttilstanden."</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"bluetooth-administration"</string> - <string name="permdesc_bluetoothAdmin" msgid="7256289774667054555">"Tillader et program at konfigurere den lokale Bluetooth-telefon samt at opdage og parre med fjerne enheder."</string> + <string name="permdesc_bluetoothAdmin" msgid="7256289774667054555">"Tillader, at et program konfigurerer den lokale Bluetooth-telefon samt opdager og parrer med fjerne enheder."</string> <string name="permlab_bluetooth" msgid="8361038707857018732">"opret Bluetooth-forbindelser"</string> - <string name="permdesc_bluetooth" msgid="762515380679392945">"Tillader et program at vise konfigurationen af den lokale Bluetooth-telefon samt at oprette og acceptere forbindelse med parrede enheder."</string> + <string name="permdesc_bluetooth" msgid="762515380679392945">"Tillader, at et program viser konfigurationen af den lokale Bluetooth-telefon samt opretter og accepterer forbindelse med parrede enheder."</string> <string name="permlab_disableKeyguard" msgid="4977406164311535092">"deaktiver tastaturlås"</string> - <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Tillader et program at deaktivere tastaturlåsen og al associeret adgangskodesikkerhed. Et legitimt eksempel på dette er, at telefonen deaktiverer tastaturlåsen, når der modtages et indgående telefonopkald, og genaktiverer tastaturlåsen, når opkaldet er afsluttet."</string> - <string name="permlab_readSyncSettings" msgid="6201810008230503052">"læs synkroniseringsindstillinger"</string> - <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Tillader et program at læse synkroniseringsindstillingerne, som f.eks. om synkronisering er aktiveret for kontakter."</string> - <string name="permlab_writeSyncSettings" msgid="6297138566442486462">"skriv synkroniseringsindstillinger"</string> - <string name="permdesc_writeSyncSettings" msgid="2498201614431360044">"Tillader et program at ændre synkroniseringsindstillingerne, som f.eks. om synkronisering er aktiveret for kontakter."</string> + <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Tillader, at et program deaktiverer tastaturlåsen og al associeret adgangskodesikkerhed. Et legitimt eksempel på dette er, at telefonen deaktiverer tastaturlåsen, når der modtages et indgående telefonopkald, og genaktiverer tastaturlåsen, når opkaldet er afsluttet."</string> + <string name="permlab_readSyncSettings" msgid="6201810008230503052">"læs indstillinger for synkronisering"</string> + <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Tillader, at et program læser synkroniseringsindstillingerne, f.eks. om kontakter skal synkroniseres."</string> + <string name="permlab_writeSyncSettings" msgid="6297138566442486462">"skriv indstillinger for synkronisering"</string> + <string name="permdesc_writeSyncSettings" msgid="2498201614431360044">"Tillader, at et program ændrer indstillingerne for synkronisering, f.eks. kontakter skal synkroniseres."</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"læs synkroniseringsstatistikker"</string> - <string name="permdesc_readSyncStats" msgid="7511448343374465000">"Tillader et program at læse synkroniseringsstatistikkerne, som f.eks. oversigt over forekomne synkroniseringer."</string> + <string name="permdesc_readSyncStats" msgid="7511448343374465000">"Tillader, at et program læser synkroniseringsstatistikker, f.eks. oversigten over forrige synkroniseringer."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"læs abonnerede feeds"</string> - <string name="permdesc_subscribedFeedsRead" msgid="3622200625634207660">"Lader et program få detaljer om de aktuelt synkroniserede feeds."</string> + <string name="permdesc_subscribedFeedsRead" msgid="3622200625634207660">"Tillader, at et program får detaljer om de aktuelt synkroniserede feeds."</string> <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"skriv abonnerede feeds"</string> - <string name="permdesc_subscribedFeedsWrite" msgid="8121607099326533878">"Tillader et program at ændre dine aktuelle synkroniserede feeds. Dette kan muligvis lade et ondsindet program ændre dine synkroniserede feeds."</string> + <string name="permdesc_subscribedFeedsWrite" msgid="8121607099326533878">"Tillader, at et program ændrer dine aktuelle synkroniserede feeds. Dette kan muligvis lade et ondsindet program ændre dine synkroniserede feeds."</string> <string name="permlab_readDictionary" msgid="432535716804748781">"læs brugerdefineret ordbog"</string> - <string name="permdesc_readDictionary" msgid="1082972603576360690">"Tillader et program at læse alle private ord, navne og sætninger, som brugeren eventuelt har gemt i brugerordbogen."</string> - <string name="permlab_writeDictionary" msgid="6703109511836343341">"skriv til den brugerdefinerede mappe"</string> - <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Tillader et program at skrive nye ord i brugermappen."</string> - <string name="permlab_sdcardWrite" msgid="8079403759001777291">"ret/slet indholdet af SD-kort"</string> - <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Tillader et program at skrive til SD-kortet."</string> + <string name="permdesc_readDictionary" msgid="1082972603576360690">"Tillader, at et program læser alle private ord, navne og sætninger, som brugeren eventuelt har gemt i brugerordbogen."</string> + <string name="permlab_writeDictionary" msgid="6703109511836343341">"skriv til den brugerdefinerede ordbog"</string> + <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Tillader, at et program skriver nye ord i brugerordbogen."</string> + <string name="permlab_sdcardWrite" msgid="8079403759001777291">"ret/slet indholdet på SD-kortet"</string> + <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Tillader, at et program skriver til SD-kortet."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> - <item msgid="8901098336658710359">"Start"</item> + <item msgid="8901098336658710359">"Hjem"</item> <item msgid="869923650527136615">"Mobil"</item> <item msgid="7897544654242874543">"Arbejde"</item> <item msgid="1103601433382158155">"Arbejdsfax"</item> @@ -403,19 +410,19 @@ <item msgid="9192514806975898961">"Tilpasset"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"Start"</item> + <item msgid="8073994352956129127">"Hjem"</item> <item msgid="7084237356602625604">"Arbejde"</item> <item msgid="1112044410659011023">"Andre"</item> <item msgid="2374913952870110618">"Tilpasset"</item> </string-array> <string-array name="postalAddressTypes"> - <item msgid="6880257626740047286">"Start"</item> + <item msgid="6880257626740047286">"Hjem"</item> <item msgid="5629153956045109251">"Arbejde"</item> <item msgid="4966604264500343469">"Andre"</item> <item msgid="4932682847595299369">"Tilpasset"</item> </string-array> <string-array name="imAddressTypes"> - <item msgid="1738585194601476694">"Start"</item> + <item msgid="1738585194601476694">"Hjem"</item> <item msgid="1359644565647383708">"Arbejde"</item> <item msgid="7868549401053615677">"Anden"</item> <item msgid="3145118944639869809">"Tilpasset"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Tilpasset"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Hjem"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobil"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Arbejde"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Arbejdsfax"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Hjemmefax"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Personsøger"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Andre"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Tilbagekald"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Bil"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Virksomhed (hovednummer)"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Hoved"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Andre faxbeskeder"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Arbejdsmobiltelefon"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Personsøger"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistent"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"mms"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Fødselsdato"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Årsdag"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Begivenhed"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Tilpasset"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Hjem"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Arbejde"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Andre"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Tilpasset"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Hjem"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Arbejde"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Andre"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Tilpasset"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Hjem"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Arbejde"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Andre"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Tilpasset"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Arbejde"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Andre"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Tilpasset"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Indtast PIN-kode"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Forkert PIN-kode!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Tryk på Menu og dernæst på 0 for at låse op."</string> @@ -547,47 +502,48 @@ <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Skærmen er låst."</string> <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Tryk på Menu for at låse op eller foretage et nødopkald."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Tryk på Menu for at låse op."</string> - <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Tegn mønster til at låse op"</string> + <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Tegn oplåsningsmønster"</string> <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Nødopkald"</string> <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Rigtigt!"</string> <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Beklager! Prøv igen"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Oplader (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Opladt."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Tilslut din oplader."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Der er ikke noget SIM-kort."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Der er ikke noget SIM-kort i telefonen."</string> <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Indsæt et SIM-kort."</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netværket er låst"</string> - <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kort er låst med PUK-koden."</string> + <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kortet er låst med PUK-koden."</string> <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Se brugervejledningen, eller kontakt kundeservice."</string> <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM-kortet er låst."</string> <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"Låser SIM-kortet op ..."</string> - <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="3514742106066877476">"Du har tegnet dit mønster til at låse op forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. "\n\n"Prøv igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> - <string name="lockscreen_failed_attempts_almost_glogin" msgid="3351013842320127827">"Du har tegnet dit mønster til at låse op forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. Efter <xliff:g id="NUMBER_1">%d</xliff:g> forsøg mere vil du blive bedt om at låse din telefon op ved hjælp af dit Google-login"\n\n" Prøv igen om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> + <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="3514742106066877476">"Du har tegnet dit oplåsningsmønster forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. "\n\n"Prøv igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> + <string name="lockscreen_failed_attempts_almost_glogin" msgid="3351013842320127827">"Du har tegnet dit oplåsningsmønster forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. Efter <xliff:g id="NUMBER_1">%d</xliff:g> forsøg mere vil du blive bedt om at låse din telefon op ved hjælp af dit Google-login"\n\n" Prøv igen om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string> - <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Har du glemt mønster?"</string> + <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Har du glemt mønstret?"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Oplåsning af konto"</string> - <string name="lockscreen_glogin_too_many_attempts" msgid="2446246026221678244">"For mange mønsterforsøg!"</string> + <string name="lockscreen_glogin_too_many_attempts" msgid="2446246026221678244">"For mange forsøg på at tegne mønstret korrekt!"</string> <string name="lockscreen_glogin_instructions" msgid="1816635201812207709">"For at låse op skal du logge ind med din Google-konto"</string> <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"Brugernavn (e-mail)"</string> <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Adgangskode"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Log ind"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ugyldigt brugernavn eller ugyldig adgangskode."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrollerer ..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Lås op"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Lyd slået til"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Lyd slået fra"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Ryd"</string> <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Ingen meddelelser"</string> - <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Løbende"</string> + <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"I gang"</string> <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Meddelelser"</string> <string name="battery_status_text_percent_format" msgid="7660311274698797147">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="battery_status_charging" msgid="756617993998772213">"Oplader ..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Forbind oplader"</string> - <string name="battery_low_subtitle" msgid="7388781709819722764">"Batteriet er ved at blive tomt:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_subtitle" msgid="7388781709819722764">"Batteriet er ved at være fladt:"</string> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> eller mindre tilbage."</string> <string name="battery_low_why" msgid="7279169609518386372">"Batteriforbrug"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Fabrikstest mislykkedes"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Handlingen FACTORY_TEST understøttes kun af pakker installeret i /system/app."</string> @@ -597,12 +553,11 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"Javascript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Naviger væk fra denne side?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n" Vælg OK for at fortsætte eller Annuller for at blive på den aktuelle side."</string> <string name="save_password_label" msgid="6860261758665825069">"Bekræft"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Tip: Dobbeltklik for at zoome ind eller ud."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"læs browserens oversigt og bogmærker"</string> - <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Tillader programmet at læse alle de webadresser, browseren har besøgt, og alle browserens bogmærker."</string> + <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Tillader, at programmet læser alle de webadresser, browseren har besøgt, og alle browserens bogmærker."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"skriv browserens oversigt og bogmærker"</string> - <string name="permdesc_writeHistoryBookmarks" msgid="945571990357114950">"Tillader et program at ændre browseroversigten eller bogmærker, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre din browsers data."</string> + <string name="permdesc_writeHistoryBookmarks" msgid="945571990357114950">"Tillader, at et program ændrer browseroversigten eller bogmærker, der er gemt på din telefon. Ondsindede programmer kan bruge dette til at slette eller ændre din browsers data."</string> <string name="save_password_message" msgid="767344687139195790">"Ønsker du, at browseren skal huske denne adgangskode?"</string> <string name="save_password_notnow" msgid="6389675316706699758">"Ikke nu"</string> <string name="save_password_remember" msgid="6491879678996749466">"Husk"</string> @@ -681,7 +636,7 @@ <item quantity="one" msgid="2178576254385739855">"i morgen"</item> <item quantity="other" msgid="2973062968038355991">"om <xliff:g id="COUNT">%d</xliff:g> dage"</item> </plurals> - <string name="preposition_for_date" msgid="9093949757757445117">"til <xliff:g id="DATE">%s</xliff:g>"</string> + <string name="preposition_for_date" msgid="9093949757757445117">"den <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"kl. <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"i <xliff:g id="YEAR">%s</xliff:g>"</string> <string name="day" msgid="8144195776058119424">"dag"</string> @@ -696,12 +651,12 @@ <string name="weeks" msgid="6509623834583944518">"uger"</string> <string name="year" msgid="4001118221013892076">"år"</string> <string name="years" msgid="6881577717993213522">"år"</string> - <string name="every_weekday" msgid="8777593878457748503">"Hver ugedag (man.-fre.)"</string> + <string name="every_weekday" msgid="8777593878457748503">"Hverdage (man.-fre.)"</string> <string name="daily" msgid="5738949095624133403">"Dagligt"</string> <string name="weekly" msgid="983428358394268344">"Ugentlig hver <xliff:g id="DAY">%s</xliff:g>"</string> <string name="monthly" msgid="2667202947170988834">"Månedligt"</string> <string name="yearly" msgid="1519577999407493836">"Årligt"</string> - <string name="VideoView_error_title" msgid="3359437293118172396">"Video kan ikke afspilles"</string> + <string name="VideoView_error_title" msgid="3359437293118172396">"Videoen kan ikke afspilles"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="897920883624437033">"Beklager! Denne video er ikke gyldig til streaming på denne enhed."</string> <string name="VideoView_error_text_unknown" msgid="710301040038083944">"Beklager! Denne video kan ikke afspilles."</string> <string name="VideoView_error_button" msgid="2822238215100679592">"OK"</string> @@ -713,8 +668,8 @@ <string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string> <string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string> <string name="selectAll" msgid="6876518925844129331">"Vælg alle"</string> - <string name="selectText" msgid="3889149123626888637">"Vælg tekst"</string> - <string name="stopSelectingText" msgid="4157931463872320996">"Stands med at vælge tekst"</string> + <string name="selectText" msgid="3889149123626888637">"Marker tekst"</string> + <string name="stopSelectingText" msgid="4157931463872320996">"Hold op med at markere tekst"</string> <string name="cut" msgid="3092569408438626261">"Klip"</string> <string name="cutAll" msgid="2436383270024931639">"Klip alle"</string> <string name="copy" msgid="2681946229533511987">"Kopier"</string> @@ -733,7 +688,7 @@ <string name="dialog_alert_title" msgid="2049658708609043103">"Bemærk"</string> <string name="capital_on" msgid="1544682755514494298">"TIL"</string> <string name="capital_off" msgid="6815870386972805832">"FRA"</string> - <string name="whichApplication" msgid="4533185947064773386">"Afslut handling ved hjælp af"</string> + <string name="whichApplication" msgid="4533185947064773386">"Fuldfør handling ved hjælp af"</string> <string name="alwaysUse" msgid="4583018368000610438">"Brug som standard til denne handling."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Ryd standard i Startindstillinger > Programmer > Administrer programmer."</string> <string name="chooseActivity" msgid="1009246475582238425">"Vælg en handling"</string> @@ -749,16 +704,15 @@ <string name="force_close" msgid="3653416315450806396">"Tving til at lukke"</string> <string name="report" msgid="4060218260984795706">"Rapporter"</string> <string name="wait" msgid="7147118217226317732">"Vent"</string> - <string name="debug" msgid="9103374629678531849">"Fejlretning"</string> <string name="sendText" msgid="5132506121645618310">"Vælg en handling for teksten"</string> - <string name="volume_ringtone" msgid="6885421406845734650">"Opkaldslydstyrke"</string> - <string name="volume_music" msgid="5421651157138628171">"Medielydstyrke"</string> - <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Spiller gennem Bluetooth"</string> - <string name="volume_music_hint_silent_ringtone_selected" msgid="6158339745293431194">"Lydløs ringetone valgt"</string> - <string name="volume_call" msgid="3941680041282788711">"Opkaldslydstyrke"</string> - <string name="volume_bluetooth_call" msgid="2002891926351151534">"Bluetooth-lydstyrke under opkald"</string> - <string name="volume_alarm" msgid="1985191616042689100">"Alarmlydstyrke"</string> - <string name="volume_notification" msgid="2422265656744276715">"Meddelelseslydstyrke"</string> + <string name="volume_ringtone" msgid="6885421406845734650">"Lydstyrke for opkald"</string> + <string name="volume_music" msgid="5421651157138628171">"Lydstyrke for medier"</string> + <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Afspilning via Bluetooth"</string> + <string name="volume_music_hint_silent_ringtone_selected" msgid="6158339745293431194">"Lydløs ringetone er valgt"</string> + <string name="volume_call" msgid="3941680041282788711">"Lydstyrke for opkald"</string> + <string name="volume_bluetooth_call" msgid="2002891926351151534">"Lydstyrke for Bluetooth under opkald"</string> + <string name="volume_alarm" msgid="1985191616042689100">"Lydstyrke for alarm"</string> + <string name="volume_notification" msgid="2422265656744276715">"Lydstyrke for meddelelser"</string> <string name="volume_unknown" msgid="1400219669770445902">"Lydstyrke"</string> <string name="ringtone_default" msgid="3789758980357696936">"Standardringetone"</string> <string name="ringtone_default_with_actual" msgid="8129563480895990372">"Standardringetone (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> @@ -775,48 +729,46 @@ </plurals> <string name="select_character" msgid="3365550120617701745">"Indsæt tegn"</string> <string name="sms_control_default_app_name" msgid="7630529934366549163">"Ukendt program"</string> - <string name="sms_control_title" msgid="7296612781128917719">"Sender SMS-beskeder"</string> - <string name="sms_control_message" msgid="1289331457999236205">"Der sendes et stort antal SMS-beskeder. Vælg \"OK\" for at fortsætte eller \"Annuller\" for at stoppe med at sende."</string> + <string name="sms_control_title" msgid="7296612781128917719">"Sender sms-beskeder"</string> + <string name="sms_control_message" msgid="1289331457999236205">"Der sendes et stort antal sms-beskeder. Vælg \"OK\" for at fortsætte eller \"Annuller\" for at stoppe afsendelsen."</string> <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> <string name="sms_control_no" msgid="1715320703137199869">"Annuller"</string> - <string name="date_time_set" msgid="5777075614321087758">"Indstil"</string> + <string name="date_time_set" msgid="5777075614321087758">"Angiv"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> <string name="no_permissions" msgid="7283357728219338112">"Der kræves ingen tilladelser"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Skjul"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Vis alle"</b></string> <string name="googlewebcontenthelper_loading" msgid="4722128368651947186">"Indlæser ..."</string> - <string name="usb_storage_title" msgid="5901459041398751495">"USB forbundet"</string> + <string name="usb_storage_title" msgid="5901459041398751495">"USB er tilsluttet"</string> <string name="usb_storage_message" msgid="2759542180575016871">"Du har forbundet din telefon til din computer via USB. Vælg \"Monter\", hvis du ønsker at kopiere filer mellem din computer og din telefons SD-kort."</string> <string name="usb_storage_button_mount" msgid="8063426289195405456">"Monter"</string> <string name="usb_storage_button_unmount" msgid="6092146330053864766">"Indsæt ikke"</string> <string name="usb_storage_error_message" msgid="2534784751603345363">"Der opstod et problem med at bruge dit SD-kort til USB-lagring."</string> - <string name="usb_storage_notification_title" msgid="8175892554757216525">"USB forbundet"</string> + <string name="usb_storage_notification_title" msgid="8175892554757216525">"USB er tilsluttet"</string> <string name="usb_storage_notification_message" msgid="7380082404288219341">"Vælg for at kopiere filer til/fra din computer."</string> <string name="usb_storage_stop_notification_title" msgid="2336058396663516017">"Slå USB-lagringen fra"</string> <string name="usb_storage_stop_notification_message" msgid="2591813490269841539">"Vælg for at slå USB-lagring fra."</string> <string name="usb_storage_stop_title" msgid="6014127947456185321">"Slå USB-lagring fra"</string> - <string name="usb_storage_stop_message" msgid="2390958966725232848">"Inden du slår USB-lagringen fra, skal du sørge for, at du demonterer USB-værten. Vælg \"Slå fra\" for at slå USB-lagringen fra."</string> + <string name="usb_storage_stop_message" msgid="2390958966725232848">"Inden du slår USB-lagringen fra, skal du sørge for, at USB-værten er demonteret. Vælg \"Slå fra\" for at slå USB-lagringen fra."</string> <string name="usb_storage_stop_button_mount" msgid="1181858854166273345">"Slå fra"</string> <string name="usb_storage_stop_button_unmount" msgid="3774611918660582898">"Annuller"</string> <string name="usb_storage_stop_error_message" msgid="3746037090369246731">"Der opstod et problem med at slå USB-lagringen fra. Sørg for, at du har demonteret USB-værten, og prøv så igen."</string> <string name="extmedia_format_title" msgid="8663247929551095854">"Formater SD-kort"</string> <string name="extmedia_format_message" msgid="3621369962433523619">"Er du sikker på, du ønsker at formatere SD-kortet? Alle data på kortet mistes."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formater"</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-fejlretning forbundet"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-fejlretning er tilsluttet"</string> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Vælg for at deaktivere USB-fejlretning."</string> + <string name="select_input_method" msgid="6865512749462072765">"Vælg indtastningsmetode"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidater"</u></string> - <string name="ext_media_checking_notification_title" msgid="5457603418970994050">"Forbereder SD-kort"</string> + <string name="ext_media_checking_notification_title" msgid="5457603418970994050">"Forbereder SD-kortet"</string> <string name="ext_media_checking_notification_message" msgid="8287319882926737053">"Kontrollerer for fejl."</string> - <string name="ext_media_nofs_notification_title" msgid="780477838241212997">"Blankt SD-kort"</string> + <string name="ext_media_nofs_notification_title" msgid="780477838241212997">"Tomt SD-kort"</string> <string name="ext_media_nofs_notification_message" msgid="3817704088027829380">"SD-kortet er tomt eller har et ikke understøttet filsystem."</string> <string name="ext_media_unmountable_notification_title" msgid="6410723906019100189">"Beskadiget SD-kort"</string> - <string name="ext_media_unmountable_notification_message" msgid="6902531775948238989">"SD-kort beskadiget. Du bliver muligvis nødt til at omformatere det."</string> - <string name="ext_media_badremoval_notification_title" msgid="6872152882604407837">"SD-kort blev uventet fjernet"</string> + <string name="ext_media_unmountable_notification_message" msgid="6902531775948238989">"SD-kortet er beskadiget. Du bliver muligvis nødt til at formatere det igen."</string> + <string name="ext_media_badremoval_notification_title" msgid="6872152882604407837">"SD-kortet blev fjernet uventet"</string> <string name="ext_media_badremoval_notification_message" msgid="7260183293747448241">"Demonter SD-kortet inden fjernelse for at undgå tab af data."</string> <string name="ext_media_safe_unmount_notification_title" msgid="6729801130790616200">"SD-kortet kan fjernes sikkert"</string> <string name="ext_media_safe_unmount_notification_message" msgid="568841278138377604">"Du kan nu fjerne SD-kortet."</string> @@ -826,33 +778,40 @@ <string name="permlab_pkgUsageStats" msgid="8787352074326748892">"opdater brugerstatistikker for komponenter"</string> <string name="permdesc_pkgUsageStats" msgid="891553695716752835">"Tillader ændring af indsamlede brugerstatistikker for komponenter. Ikke til brug til normale programmer."</string> <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Tryk to gange for zoomkontrol"</string> - <string name="gadget_host_error_inflating" msgid="2613287218853846830">"Der opstod en fejl under forøgelsen af widgeten"</string> + <string name="gadget_host_error_inflating" msgid="2613287218853846830">"Der opstod en fejl under forøgelsen af widgetten"</string> <string name="ime_action_go" msgid="8320845651737369027">"Gå"</string> <string name="ime_action_search" msgid="658110271822807811">"Søg"</string> <string name="ime_action_send" msgid="2316166556349314424">"Send"</string> <string name="ime_action_next" msgid="3138843904009813834">"Næste"</string> - <string name="ime_action_done" msgid="8971516117910934605">"Færdig"</string> + <string name="ime_action_done" msgid="8971516117910934605">"Udfør"</string> <string name="ime_action_default" msgid="2840921885558045721">"Udfør"</string> <string name="dial_number_using" msgid="5789176425167573586">"Ring til nummer"\n"ved hjælp af <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="create_contact_using" msgid="4947405226788104538">"Opret kontakt"\n"ved hjælp af <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"kontrolleret"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"ikke kontrolleret"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Tillad"</string> <string name="deny" msgid="2081879885755434506">"Afvis"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Der er anmodet om tilladelse"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Der er anmodet om tilladelse"\n"til kontoen <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Inputmetode"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synkroniser"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Tilgængelighed"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapet"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Skift tapet"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Point-to-Point Tunneling Protocol"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Layer 2 Tunneling Protocol"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"L2TP/IPSec VPN baseret på forhåndsdelt nøglekodning"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Certifikatbaseret L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index af68303caa29..9ad161441ea4 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Auf die Datei konnte nicht zugegriffen werden."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Die angeforderte Datei wurde nicht gefunden."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Es werden zurzeit zu viele Anfragen verarbeitet. Versuchen Sie es später erneut."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Fehler bei Anmeldung für <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synchronisieren"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synchronisieren"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Zu viele <xliff:g id="CONTENT_TYPE">%s</xliff:g> gelöscht."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Ihren physischen Standort überwachen"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Netzwerkkommunikation"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Ermöglicht Anwendungen den Zugriff auf verschiedene Netzwerkfunktionen."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Ihre Konten"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Zugriff auf verfügbare Konten"</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Hardware-Steuerelemente"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Direkter Zugriff auf Hardware über Headset"</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Anrufe"</string> @@ -180,7 +177,7 @@ <string name="permdesc_writeSms" msgid="6299398896177548095">"Ermöglicht einer Anwendung, auf Ihrem Telefon oder Ihrer SIM-Karte gespeicherte Kurznachrichten zu bearbeiten. Schädliche Anwendungen löschen möglicherweise Ihre Nachrichten."</string> <string name="permlab_receiveWapPush" msgid="8258226427716551388">"WAP-Nachrichten empfangen"</string> <string name="permdesc_receiveWapPush" msgid="5979623826128082171">"Ermöglicht der Anwendung, WAP-Mitteilungen zu empfangen und zu verarbeiten. Schädliche Anwendungen können Ihre Nachrichten möglicherweise überwachen oder löschen, bevor sie angezeigt werden."</string> - <string name="permlab_getTasks" msgid="5005277531132573353">"Laufende Anwendungen abrufen"</string> + <string name="permlab_getTasks" msgid="5005277531132573353">"laufende Anwendungen abrufen"</string> <string name="permdesc_getTasks" msgid="7048711358713443341">"Ermöglicht der Anwendung, Informationen zu aktuellen und kürzlich ausführten Aufgaben abzurufen. Schädliche Anwendungen können so eventuell geheime Informationen zu anderen Anwendungen entdecken."</string> <string name="permlab_reorderTasks" msgid="5669588525059921549">"Laufende Anwendungen neu ordnen"</string> <string name="permdesc_reorderTasks" msgid="126252774270522835">"Ermöglicht einer Anwendung, Aufgaben in den Vorder- und Hintergrund zu verschieben. Schädliche Anwendungen können so ohne Ihr Zutun eine Anzeige im Vordergrund erzwingen."</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Ermöglicht einer Anwendung, die Fehlerbeseitigung für eine andere Anwendung zu aktivieren. Schädliche Anwendungen können so andere Anwendungen löschen."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"UI-Einstellungen ändern"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Ermöglicht einer Anwendung, die aktuelle Konfiguration zu ändern, etwa das Gebietsschema oder die Schriftgröße."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"Andere Anwendungen neu starten"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Ermöglicht einer Anwendung, den Neustart anderer Anwendungen zu erzwingen."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"Schließen von Anwendung erzwingen"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Ermöglicht einer Anwendung, alle Aktivitäten, die im Vordergrund ablaufen, zu beenden und in den Hintergrund zu schieben. Sollte nicht für normale Anwendungen benötigt werden."</string> <string name="permlab_dump" msgid="1681799862438954752">"Systeminternen Status abrufen"</string> @@ -256,9 +259,9 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Ermöglicht einer Anwendung, alle Elemente in der Diagnosegruppe zu lesen und zu bearbeiten, etwa Dateien in \"/dev\". Dies könnte eine potenzielle Gefährdung für die Stabilität und Sicherheit des Systems darstellen und sollte NUR für Hardware-spezifische Diagnosen des Herstellers oder Netzbetreibers verwendet werden."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"Anwendungskomponenten aktivieren oder deaktivieren"</string> <string name="permdesc_changeComponentState" msgid="4569107043246700630">"Ermöglicht einer Anwendung, die Komponente einer anderen Anwendung nach Belieben zu aktivieren oder zu deaktivieren. Schädliche Anwendungen können so wichtige Funktionen des Telefons deaktivieren. Bei der Erteilung von Berechtigungen ist daher Vorsicht geboten, da die Anwendungskomponenten unbrauchbar, inkonsistent und unstabil werden können."</string> - <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"Bevorzugte Einstellungen festlegen"</string> + <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"bevorzugte Einstellungen festlegen"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Ermöglicht einer Anwendung, Ihre bevorzugten Einstellungen zu ändern. Schädliche Anwendungen können so laufende Anwendungen ohne Ihr Wissen ändern, damit die vorhandenen Anwendungen private Daten von Ihnen sammeln."</string> - <string name="permlab_writeSettings" msgid="1365523497395143704">"Allgemeine Systemeinstellungen ändern"</string> + <string name="permlab_writeSettings" msgid="1365523497395143704">"allgemeine Systemeinstellungen ändern"</string> <string name="permdesc_writeSettings" msgid="838789419871034696">"Ermöglicht einer Anwendung, die Einstellungsdaten des Systems zu ändern. Schädliche Anwendungen können so die Systemkonfiguration beschädigen."</string> <string name="permlab_writeSecureSettings" msgid="204676251876718288">"Sicherheitseinstellungen für das System ändern"</string> <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"Der Anwendung wird das Ändern der Sicherheitseinstellungsdaten des Systems ermöglicht. Nicht für normale Anwendungen vorgesehen."</string> @@ -356,7 +359,7 @@ <string name="permdesc_useCredentials" msgid="7416570544619546974">"Ermöglicht einer Anwendung, Authentifizierungs-Token anzufordern."</string> <string name="permlab_accessNetworkState" msgid="6865575199464405769">"Netzwerkstatus anzeigen"</string> <string name="permdesc_accessNetworkState" msgid="558721128707712766">"Ermöglicht einer Anwendung, den Status aller Netzwerke anzuzeigen."</string> - <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"Uneingeschränkter Internetzugriff"</string> + <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"uneingeschränkter Internetzugriff"</string> <string name="permdesc_createNetworkSockets" msgid="4593339106921772192">"Ermöglicht einer Anwendung, Netzwerk-Sockets einzurichten."</string> <string name="permlab_writeApnSettings" msgid="7823599210086622545">"Einstellungen für Zugriffspunktname schreiben"</string> <string name="permdesc_writeApnSettings" msgid="7443433457842966680">"Ermöglicht einer Anwendung, die APN-Einstellungen wie Proxy und Port eines Zugriffspunkts zu ändern."</string> @@ -382,16 +385,20 @@ <string name="permdesc_writeSyncSettings" msgid="2498201614431360044">"Ermöglicht einer Anwendung, die Synchronisierungseinstellungen zu ändern, etwa ob die Synchronisierung für Kontakte aktiviert ist oder nicht."</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"Synchronisierungsstatistiken lesen"</string> <string name="permdesc_readSyncStats" msgid="7511448343374465000">"Ermöglicht einer Anwendung, die Synchronisierungsstatistiken zu lesen, etwa den Verlauf der bereits durchgeführten Synchronisierungen."</string> - <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"Abonnierte Feeds lesen"</string> + <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"abonnierte Feeds lesen"</string> <string name="permdesc_subscribedFeedsRead" msgid="3622200625634207660">"Ermöglicht einer Anwendung, Details zu den zurzeit synchronisierten Feeds abzurufen."</string> - <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"Abonnierte Feeds schreiben"</string> + <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"abonnierte Feeds schreiben"</string> <string name="permdesc_subscribedFeedsWrite" msgid="8121607099326533878">"Ermöglicht einer Anwendung, Änderungen an den kürzlich synchronisierten Feeds vorzunehmen. Schädliche Anwendungen könnten so Ihre synchronisierten Feeds ändern."</string> - <string name="permlab_readDictionary" msgid="432535716804748781">"Nutzerdefiniertes Wörterbuch lesen"</string> + <string name="permlab_readDictionary" msgid="432535716804748781">"nutzerdefiniertes Wörterbuch lesen"</string> <string name="permdesc_readDictionary" msgid="1082972603576360690">"Erlaubt einer Anwendung, alle privaten Wörter, Namen und Ausdrücke zu lesen, die ein Nutzer in seinem Wörterbuch gespeichert hat."</string> <string name="permlab_writeDictionary" msgid="6703109511836343341">"in nutzerdefiniertes Wörterbuch schreiben"</string> <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Erlaubt einer Anwendung, neue Wörter in das Wörterbuch des Nutzers zu schreiben."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"SD-Karten-Inhalt ändern/löschen"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Ermöglicht einer Anwendung, auf die SD-Karte zu schreiben"</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Privat"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Benutzerdefiniert"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Privat"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobil"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Arbeit"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Fax (Beruflich)"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax (privat)"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Andere"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Rückruf"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Auto"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Firma (Hauptnummer)"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Hauptnummer"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Weitere Faxnummer"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY/TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Handy (geschäftlich)"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager (beruflich)"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Zweite Nummer"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Geburtstag"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Jahrestag"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Termin"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Benutzerdefiniert"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Privat"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Beruflich"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Andere"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Benutzerdefiniert"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Privat"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Beruflich"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Andere"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Benutzerdefiniert"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Privat"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Beruflich"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Andere"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Benutzerdefiniert"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Beruflich"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Andere"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Benutzerdefiniert"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"über <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> über <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN-Code eingeben"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Falscher PIN-Code!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Drücken Sie zum Entsperren die Menütaste und dann auf \"0\"."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Tut uns leid. Versuchen Sie es noch einmal."</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Wird geladen (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Aufgeladen"</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Bitte Ladegerät anschließen"</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Keine SIM-Karte."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Keine SIM-Karte im Telefon."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Anmelden"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ungültiger Nutzername oder ungültiges Passwort."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Überprüfung..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Entsperren"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Ton ein"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Ton aus"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Löschen"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Wird aufgeladen..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Ladegerät anschließen"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Akku ist fast leer."</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> oder weniger verbleiben."</string> <string name="battery_low_why" msgid="7279169609518386372">"Akkuverbrauch"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Werkstest fehlgeschlagen"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Die Aktion FACTORY_TEST wird nur für unter \"/system/app\" gespeicherte Pakete unterstützt."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Von dieser Seite navigieren?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Wählen Sie \"OK\", um fortzufahren, oder wählen Sie \"Abbrechen\", um auf der aktuellen Seite zu bleiben."</string> <string name="save_password_label" msgid="6860261758665825069">"Bestätigen"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Tipp: Zum Heranzoomen und Vergrößern zweimal tippen"</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"Browserverlauf und Lesezeichen lesen"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Ermöglicht der Anwendung, alle URLs, die mit dem Browser besucht wurden, sowie alle Lesezeichen des Browsers zu lesen."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"Browserverlauf und Lesezeichen schreiben"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Schließen erzwingen"</string> <string name="report" msgid="4060218260984795706">"Bericht"</string> <string name="wait" msgid="7147118217226317732">"Warten"</string> - <string name="debug" msgid="9103374629678531849">"Fehler suchen"</string> <string name="sendText" msgid="5132506121645618310">"Aktion für Text auswählen"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Klingeltonlautstärke"</string> <string name="volume_music" msgid="5421651157138628171">"Medienlautstärke"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Möchten Sie die SD-Karte wirklich formatieren? Alle Daten auf Ihrer Karte gehen dann verloren."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Format"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-Debugging verbunden"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Zum Deaktivieren des USB-Debugging auswählen"</string> + <string name="select_input_method" msgid="6865512749462072765">"Eingabemethode auswählen"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"Kandidaten"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Neuer Kontakt"\n"mit <xliff:g id="NUMBER">%s</xliff:g> erstellen"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"aktiviert"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"nicht aktiviert"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Zulassen"</string> <string name="deny" msgid="2081879885755434506">"Ablehnen"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Berechtigung angefordert"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Berechtigung erforderlich"\n"für Konto <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Eingabemethode"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchronisieren"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Eingabehilfen"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Hintergrund"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Hintergrundbild ändern"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Point-to-Point-Tunneling-Protokoll"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Layer-2-Tunneling-Protokoll"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"L2TP/IPSec-VPN mit vorinstalliertem Schlüssel"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Zertifikat mit vorinstalliertem Schlüssel"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index a4ec8c1979f8..33a3a4155532 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Η πρόσβαση στο αρχείο δεν ήταν δυνατή."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Το αρχείο που ζητήθηκε δεν βρέθηκε."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Πραγματοποιείται επεξεργασία πάρα πολλών αιτημάτων. Προσπαθήστε ξανά αργότερα."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Σφάλμα σύνδεσης για <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Συγχρονισμός"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Συγχρονισμός"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Πάρα πολλές <xliff:g id="CONTENT_TYPE">%s</xliff:g> διαγραφές."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Παρακολούθηση της φυσικής τοποθεσίας σας"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Επικοινωνία δικτύου"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Επιτρέπει σε εφαρμογές να αποκτήσουν πρόσβαση σε διάφορες λειτουργίες δικτύου."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Οι λογαριασμοί σας"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Πρόσβαση στους διαθέσιμους λογαριασμούς."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Στοιχεία ελέγχου υλικού"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Άμεση πρόσβαση στο υλικό της συσκευής τηλεφώνου."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Τηλεφωνικές κλήσεις"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Επιτρέπει σε μια εφαρμογή να ενεργοποιήσει τον εντοπισμό σφαλμάτων για μια άλλη εφαρμογή. Κακόβουλες εφαρμογές μπορούν να το χρησιμοποιήσουν για να τερματίσουν άλλες εφαρμογές."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"αλλαγή των ρυθμίσεων του UI"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Επιτρέπει σε μια εφαρμογή την αλλαγή της τρέχουσας διαμόρφωσης, όπως οι τοπικές ρυθμίσεις ή το μέγεθος γραμματοσειράς γενικά."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"επανεκκίνηση άλλων εφαρμογών"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Επιτρέπει σε μια εφαρμογή να πραγματοποιήσει αναγκαστική επανεκκίνηση άλλων εφαρμογών."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"αναγκαστικός τερματισμός εφαρμογής"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Επιτρέπει σε μια εφαρμογή να εξαναγκάσει οποιαδήποτε δραστηριότητα που βρίσκεται στο προσκήνιο να κλείσει και να μεταβεί στο φόντο. Δεν είναι απαραίτητο για κανονικές εφαρμογές."</string> <string name="permlab_dump" msgid="1681799862438954752">"ανάκτηση εσωτερικής κατάστασης συστήματος"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Επιτρέπει σε μια εφαρμογή την εγγραφή νέων λέξεων στο λεξικό χρήστη."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"τροποποίηση/διαγραφή περιεχομένων κάρτας SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Επιτρέπει στην εφαρμογή την εγγραφή στην κάρτα SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Οικία"</item> <item msgid="869923650527136615">"Κινητό"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Προσαρμοσμένο"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Οικία"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Κινητό"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Εργασία"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Φαξ εργασίας"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Φαξ οικίας"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Βομβητής"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Άλλο"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Επανάκληση"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Αυτοκίνητο"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Κύρια εταιρική γραμμή"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Κύριος"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Άλλο fax"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Πομπός"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Τέλεξ"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"Τηλέφωνο TTY/TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Κινητό τηλέφωνο εργασίας"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Βομβητής εργασίας"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Βοηθός"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Γενέθλια"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Επέτειος"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Συμβάν"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Προσαρμοσμένο"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Οικία"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Εργασία"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Άλλο"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Κινητό"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Προσαρμοσμένο"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Οικία"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Εργασία"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Άλλο"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Προσαρμοσμένο"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Οικία"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Εργασία"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Άλλο"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Προσαρμοσμένο"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Εργασία"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Άλλο"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Προσαρμοσμένο"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"μέσω <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> μέσω <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Πληκτρολογήστε τον κωδικό αριθμό PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Εσφαλμένος κωδικός αριθμός PIN!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Για ξεκλείδωμα, πατήστε το πλήκτρο Menu και, στη συνέχεια, το πλήκτρο 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Προσπαθήστε αργότερα"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Φόρτιση (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Φορτίστηκε."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Συνδέστε τον φορτιστή."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Δεν υπάρχει κάρτα SIM."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Δεν υπάρχει κάρτα SIM στο τηλέφωνο."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Σύνδεση"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Έλεγχος..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Ξεκλείδωμα"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Ενεργοποίηση ήχου"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Απενεργοποίηση ήχου"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Εκκαθάριση"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Φόρτιση..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Συνδέστε τον φορτιστή"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Η στάθμη της μπαταρίας είναι χαμηλή:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"Απομένει <xliff:g id="NUMBER">%d%%</xliff:g> ή λιγότερο."</string> <string name="battery_low_why" msgid="7279169609518386372">"Χρήση μπαταρίας"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Η εργοστασιακή δοκιμή απέτυχε"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Η ενέργεια FACTORY_TEST υποστηρίζεται μόνο για πακέτα που είναι εγκατεστημένα στον κατάλογο /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Απομάκρυνση από αυτή τη σελίδα;"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Επιλέξτε OK για συνέχεια, ή Ακύρωση για παραμονή στην τρέχουσα σελίδα."</string> <string name="save_password_label" msgid="6860261758665825069">"Επιβεβαίωση"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Συμβουλή: διπλό άγγιγμα για μεγέθυνση και σμίκρυνση."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ανάγνωση ιστορικού και σελιδοδεικτών προγράμματος περιήγησης"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Επιτρέπει στην εφαρμογή την ανάγνωση όλων των διευθύνσεων URL που το πρόγραμμα περιήγησης έχει επισκεφθεί και όλων των σελιδοδεικτών του προγράμματος περιήγησης."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"εγγραφή ιστορικού και σελιδοδεικτών προγράμματος περιήγησης"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Αναγκαστικό κλείσιμο"</string> <string name="report" msgid="4060218260984795706">"Αναφορά"</string> <string name="wait" msgid="7147118217226317732">"Αναμονή"</string> - <string name="debug" msgid="9103374629678531849">"Εντοπισμός σφαλμάτων"</string> <string name="sendText" msgid="5132506121645618310">"Επιλέξτε μια ενέργεια για το κείμενο"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Ένταση ειδοποίησης ήχου"</string> <string name="volume_music" msgid="5421651157138628171">"Ένταση ήχου πολυμέσων"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Είστε βέβαιοι ότι θέλετε να διαμορφώσετε την κάρτα SD; Όλα τα δεδομένα στην κάρτα σας θα χαθούν."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Διαμόρφωση"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Συνδέθηκε ο εντοπισμός σφαλμάτων USB"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Επιλογή για απενεργοποίηση του εντοπισμού σφαλμάτων USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Επιλογή μεθόδου εισόδου"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"υποψήφιοι"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Δημιουργία επαφής"\n"με τη χρήση του <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"επιλεγμένο"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"δεν ελέγχθηκε"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Να επιτρέπεται"</string> <string name="deny" msgid="2081879885755434506">"Άρνηση"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Απαιτείται άδεια"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Ζητήθηκε άδεια"\n"για τον λογαριασμό <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Μέθοδος εισόδου"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Συγχρονισμός"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Προσβασιμότητα"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Ταπετσαρία"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Αλλαγή ταπετσαρίας"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Πρωτόκολλο Point-to-Point Tunneling Protocol (PPTP)"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Πρωτόκολλο Layer 2 Tunneling Protocol (L2TP)"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Κλειδί pre-shared βάσει L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Πιστοποιητικό βάσει L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 025ae60bfea3..806d64e7a558 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -185,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Admite una aplicación que activa la depuración en otra aplicación. Las aplicaciones maliciosas pueden utilizarlo para suprimir otras aplicaciones."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"cambiar tu configuración de la interfaz de usuario"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Admite una aplicación para cambiar la configuración actual, como el tamaño de fuente local o general."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"reiniciar otras aplicaciones"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Admite una aplicación que reinicia otras aplicaciones por la fuerza."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"provocar que la aplicación se acerque"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Admite una aplicación que provoca que cualquier actividad del fondo se acerque y vuelva a alejarse. Se debe evitar utilizarlo en aplicaciones normales."</string> <string name="permlab_dump" msgid="1681799862438954752">"recuperar el estado interno del sistema"</string> @@ -389,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Admite una aplicación que escribe palabras nuevas en el diccionario del usuario."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"modificar/suprimir el contenido de la tarjeta SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Admite que una aplicación escriba en la tarjeta SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Página principal"</item> <item msgid="869923650527136615">"Celular"</item> @@ -520,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Inicia sesión"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nombre de usuario o contraseña incorrecta."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Comprobando..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sonido encendido"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Sonido apagado"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Borrar"</string> @@ -691,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Provocar acercamiento"</string> <string name="report" msgid="4060218260984795706">"Notificar"</string> <string name="wait" msgid="7147118217226317732">"Espera"</string> - <string name="debug" msgid="9103374629678531849">"Depurar"</string> <string name="sendText" msgid="5132506121645618310">"Selecciona una acción para el texto"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Volumen del timbre"</string> <string name="volume_music" msgid="5421651157138628171">"Volumen de los medios"</string> @@ -777,6 +789,12 @@ <string name="create_contact_using" msgid="4947405226788104538">"Crear contacto "\n"con <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"verificado"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"no verificado"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Denegar"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Permiso solicitado"</string> @@ -790,4 +808,10 @@ <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocolo de túnel de nivel 2"</string> <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Clave previamente compartida según L2TP/IPSec VPN"</string> <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Certificado según L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> + <skip /> + <!-- no translation found for reset (2448168080964209908) --> + <skip /> + <!-- no translation found for submit (1602335572089911941) --> + <skip /> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index ebe1bb0f7b8f..4626326086ee 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -101,7 +101,7 @@ <string name="httpErrorUnsupportedAuthScheme" msgid="2781440683514730227">"No se admite el esquema de autenticación del sitio."</string> <string name="httpErrorAuth" msgid="7293960746955020542">"La autenticación no se ha realizado correctamente."</string> <string name="httpErrorProxyAuth" msgid="1788207010559081331">"La autenticación mediante el servidor proxy no se ha realizado correctamente."</string> - <string name="httpErrorConnect" msgid="7623096283505770433">"La conexión al servidor no se ha realizado correctamente."</string> + <string name="httpErrorConnect" msgid="7623096283505770433">"La conexión con el servidor no se ha realizado correctamente."</string> <string name="httpErrorIO" msgid="5047872902739125260">"El servidor no ha podido establecer la comunicación. Vuelve a intentarlo más tarde."</string> <string name="httpErrorTimeout" msgid="4743403703762883954">"Se ha agotado el tiempo de espera de conexión al servidor."</string> <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"La página contiene demasiados redireccionamientos de servidor."</string> @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"No se ha podido acceder al archivo."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"No se ha encontrado el archivo solicitado."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Se están procesando demasiadas solicitudes. Vuelve a intentarlo más tarde."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Error de acceso a la cuenta <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Sincronización"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Sincronización"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Demasiadas eliminaciones de <xliff:g id="CONTENT_TYPE">%s</xliff:g>"</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Controlar su ubicación física"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Comunicación de red"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Permite que las aplicaciones accedan a distintas funciones de red."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Tus cuentas"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Acceder a las cuentas disponibles"</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Controles de hardware"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Acceso directo al hardware del móvil"</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Llamadas de teléfono"</string> @@ -159,7 +156,7 @@ <string name="permgrouplab_systemTools" msgid="4652191644082714048">"Herramientas del sistema"</string> <string name="permgroupdesc_systemTools" msgid="8162102602190734305">"Acceso de nivel inferior y control del sistema"</string> <string name="permgrouplab_developmentTools" msgid="3446164584710596513">"Herramientas de desarrollo"</string> - <string name="permgroupdesc_developmentTools" msgid="9056431193893809814">"Funciones necesarias sólo para desarrolladores de aplicaciones"</string> + <string name="permgroupdesc_developmentTools" msgid="9056431193893809814">"Funciones necesarias solo para desarrolladores de aplicaciones"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Almacenamiento"</string> <string name="permgroupdesc_storage" msgid="9203302214915355774">"Acceder a la tarjeta SD"</string> <string name="permlab_statusBar" msgid="7417192629601890791">"inhabilitar o modificar la barra de estado"</string> @@ -183,13 +180,19 @@ <string name="permlab_getTasks" msgid="5005277531132573353">"recuperar aplicaciones en ejecución"</string> <string name="permdesc_getTasks" msgid="7048711358713443341">"Permite que la aplicación recupere información sobre tareas que se están ejecutando en este momento o que se han ejecutado recientemente. Puede permitir que las aplicaciones malintencionadas vean información privada sobre otras aplicaciones."</string> <string name="permlab_reorderTasks" msgid="5669588525059921549">"reorganizar aplicaciones en ejecución"</string> - <string name="permdesc_reorderTasks" msgid="126252774270522835">"Permite que una aplicación mueva tareas a segundo plano y a primer plano. Las aplicaciones malintencionadas pueden aparecer en primer plano sin su control."</string> + <string name="permdesc_reorderTasks" msgid="126252774270522835">"Permite que una aplicación mueva tareas a segundo plano y a primer plano. Las aplicaciones malintencionadas pueden aparecer en primer plano sin tu control."</string> <string name="permlab_setDebugApp" msgid="4339730312925176742">"habilitar depuración de aplicación"</string> <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Permite que una aplicación active la depuración de otra aplicación. Las aplicaciones malintencionadas pueden utilizar este permiso para desactivar otras aplicaciones."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"cambiar la configuración de la interfaz de usuario"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Permite que una aplicación cambie la configuración actual como, por ejemplo, la configuración local o el tamaño de fuente general."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"reiniciar otras aplicaciones"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Permite que una aplicación reinicie de forma forzosa otras aplicaciones."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"forzar el cierre de la aplicación"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Permite que una aplicación fuerce a cualquier actividad en segundo plano a cerrarse y volver a la pantalla anterior. No debería ser necesario nunca para las aplicaciones normales."</string> <string name="permlab_dump" msgid="1681799862438954752">"recuperar estado interno del sistema"</string> @@ -199,7 +202,7 @@ <string name="permlab_stopAppSwitches" msgid="4138608610717425573">"evitar cambios de aplicación"</string> <string name="permdesc_stopAppSwitches" msgid="3857886086919033794">"Evita que el usuario cambie a otra aplicación."</string> <string name="permlab_runSetActivityWatcher" msgid="7811586187574696296">"supervisar y controlar la ejecución de todas las aplicaciones"</string> - <string name="permdesc_runSetActivityWatcher" msgid="3228701938345388092">"Permite que una aplicación supervise y controle la ejecución de las actividades por parte del sistema. Las aplicaciones malintencionadas pueden vulnerar la seguridad del sistema. Este permiso sólo es necesario para tareas de desarrollo, nunca para el uso habitual del teléfono."</string> + <string name="permdesc_runSetActivityWatcher" msgid="3228701938345388092">"Permite que una aplicación supervise y controle la ejecución de las actividades por parte del sistema. Las aplicaciones malintencionadas pueden vulnerar la seguridad del sistema. Este permiso solo es necesario para tareas de desarrollo, nunca para el uso habitual del teléfono."</string> <string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"enviar emisión eliminada de paquete"</string> <string name="permdesc_broadcastPackageRemoved" msgid="3453286591439891260">"Permite que una aplicación emita una notificación de que se ha eliminado un paquete de aplicación. Las aplicaciones malintencionadas pueden utilizar este permiso para interrumpir la ejecución de cualquier otra aplicación."</string> <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"enviar una emisión recibida mediante SMS"</string> @@ -287,7 +290,7 @@ <string name="permlab_installLocationProvider" msgid="6578101199825193873">"permiso para instalar un proveedor de ubicación"</string> <string name="permdesc_installLocationProvider" msgid="5449175116732002106">"Crear fuentes de origen simuladas para realizar pruebas. Las aplicaciones malintencionadas pueden utilizar este permiso para sobrescribir la ubicación o el estado devueltos por orígenes de ubicación reales, tales como los proveedores de red o GPS, o para controlar y notificar tu ubicación a una fuente externa."</string> <string name="permlab_accessFineLocation" msgid="8116127007541369477">"precisar la ubicación (GPS)"</string> - <string name="permdesc_accessFineLocation" msgid="7411213317434337331">"Permite precisar las fuentes de ubicación como, por ejemplo, el sistema de posicionamiento global, en el teléfono, en los casos en que estén disponibles. Las aplicaciones malintencionadas pueden utilizar este permiso para determinar dónde se encuentra en usuario y pueden consumir batería adicional."</string> + <string name="permdesc_accessFineLocation" msgid="7411213317434337331">"Permite precisar las fuentes de ubicación como, por ejemplo, el sistema de posicionamiento global, en el teléfono, en los casos en que estén disponibles. Las aplicaciones malintencionadas pueden utilizar este permiso para determinar dónde se encuentra el usuario y pueden consumir batería adicional."</string> <string name="permlab_accessCoarseLocation" msgid="4642255009181975828">"ubicación común (basada en red)"</string> <string name="permdesc_accessCoarseLocation" msgid="8235655958070862293">"Acceder a fuentes de ubicación comunes como, por ejemplo, la base de datos de red de un teléfono móvil, para determinar una ubicación telefónica aproximada, en los casos en que esté disponible. Las aplicaciones malintencionadas pueden utilizar este permiso para determinar dónde te encuentras aproximadamente."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"acceder a SurfaceFlinger"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Permite a una aplicación escribir palabras nuevas en el diccionario del usuario."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"modificar/eliminar contenido de la tarjeta SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Permite que una aplicación escriba en la tarjeta SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Casa"</item> <item msgid="869923650527136615">"Móvil"</item> @@ -409,7 +416,7 @@ <item msgid="2374913952870110618">"Personalizar"</item> </string-array> <string-array name="postalAddressTypes"> - <item msgid="6880257626740047286">"Casa"</item> + <item msgid="6880257626740047286">"Página principal"</item> <item msgid="5629153956045109251">"Trabajo"</item> <item msgid="4966604264500343469">"Otra"</item> <item msgid="4932682847595299369">"Personalizar"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Personalizado"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Casa"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Móvil"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Trabajo"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Fax del trabajo"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax de casa"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Buscapersonas"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Otro"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Devolución de llamada"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Coche"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Teléfono principal de la empresa"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"RDSI"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Otro fax"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Télex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Móvil del trabajo"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Buscapersonas del trabajo"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Asistente"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Cumpleaños"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Aniversario"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Evento"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Personalizado"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Casa"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Trabajo"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Otro"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Móvil"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Personalizada"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Casa"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Trabajo"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Otro"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Personalizada"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Casa"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Trabajo"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Otro"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Personalizada"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo!"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Trabajo"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Otra"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Personalizada"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"a través de <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> a través de <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Introduce el código PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"El código PIN es incorrecto."</string> <string name="keyguard_label_text" msgid="861796461028298424">"Para desbloquear el teléfono, pulsa la tecla de menú y, a continuación, pulsa 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Inténtalo de nuevo"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Cargando (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Cargado"</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Conecta el cargador"</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Falta la tarjeta SIM"</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"No se ha insertado ninguna tarjeta SIM en el teléfono."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Acceder"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nombre de usuario o contraseña no válido"</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Comprobando..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Activar sonido"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Desactivar sonido"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g> <xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g> <xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Borrar"</string> @@ -586,19 +543,17 @@ <string name="battery_status_charging" msgid="756617993998772213">"Cargando..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Conecta el cargador"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Se está agotando la batería:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> o menos disponible"</string> <string name="battery_low_why" msgid="7279169609518386372">"Uso de la batería"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Fallo en la prueba de fábrica"</string> - <string name="factorytest_not_system" msgid="4435201656767276723">"La acción FACTORY_TEST sólo es compatible con los paquetes instalados en /system/app."</string> + <string name="factorytest_not_system" msgid="4435201656767276723">"La acción FACTORY_TEST solo es compatible con los paquetes instalados en /system/app."</string> <string name="factorytest_no_action" msgid="872991874799998561">"No se ha encontrado ningún paquete que proporcione la acción FACTORY_TEST."</string> <string name="factorytest_reboot" msgid="6320168203050791643">"Reiniciar"</string> <string name="js_dialog_title" msgid="8143918455087008109">"La página \"<xliff:g id="TITLE">%s</xliff:g>\" dice:"</string> <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"¿Quieres salir de esta página?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Selecciona \"Aceptar\" para continuar o \"Cancelar\" para permanecer en la página actual."</string> <string name="save_password_label" msgid="6860261758665825069">"Confirmar"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Sugerencia: toca dos veces para ampliar o reducir."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"leer información de marcadores y del historial del navegador"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Permite que la aplicación lea todas las URL que ha visitado el navegador y todos sus marcadores."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"escribir en marcadores y en el historial del navegador"</string> @@ -682,7 +637,7 @@ <item quantity="other" msgid="2973062968038355991">"dentro de <xliff:g id="COUNT">%d</xliff:g> días"</item> </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"el <xliff:g id="DATE">%s</xliff:g>"</string> - <string name="preposition_for_time" msgid="5506831244263083793">"a las <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="preposition_for_time" msgid="5506831244263083793">"a la(s) <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"en <xliff:g id="YEAR">%s</xliff:g>"</string> <string name="day" msgid="8144195776058119424">"día"</string> <string name="days" msgid="4774547661021344602">"días"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Forzar cierre"</string> <string name="report" msgid="4060218260984795706">"Informe"</string> <string name="wait" msgid="7147118217226317732">"Esperar"</string> - <string name="debug" msgid="9103374629678531849">"Depurar"</string> <string name="sendText" msgid="5132506121645618310">"Seleccionar la opción para compartir"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Volumen del timbre"</string> <string name="volume_music" msgid="5421651157138628171">"Volumen multimedia"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"¿Estás seguro de que quieres formatear la tarjeta SD? Se perderán todos los datos de la tarjeta."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formato"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Dispositivo de depuración USB conectado"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleccionar para inhabilitar la depuración USB"</string> + <string name="select_input_method" msgid="6865512749462072765">"Seleccionar método de introducción de texto"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Crear un contacto"\n"a partir de <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"seleccionado"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"no seleccionado"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Denegar"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Permiso solicitado"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Permiso solicitado"\n"para la cuenta <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Método de introducción de texto"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Sincronización"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilidad"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fondo de pantalla"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambiar fondo de pantalla"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Protocolo de túnel punto a punto"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocolo de túnel de nivel 2"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Red privada virtual L2TP/IPSec basada en clave compartida previamente"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Red privada virtual L2TP/IPSec basada en certificado"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 5647063b956e..d46820a070b4 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Impossible d\'accéder au fichier."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Le fichier demandé est introuvable."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Trop de requêtes sont en cours de traitement. Veuillez réessayer ultérieurement."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Erreur de connexion au compte <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synchroniser"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synchronisation"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Trop de contenus supprimés (<xliff:g id="CONTENT_TYPE">%s</xliff:g>)."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Suivre votre position géographique"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Communications réseau"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Permet à des applications d\'accéder à différentes fonctionnalités du réseau."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Vos comptes"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Accéder aux comptes disponibles"</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Commandes du matériel"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Permet d\'accéder directement au matériel de l\'appareil."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Appels"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Permet à une application d\'activer le mode de débogage d\'une autre application. Des applications malveillantes peuvent utiliser cette fonctionnalité pour interrompre d\'autres applications de façon inopinée."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"Modification des paramètres de l\'IU"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Permet à une application de modifier la configuration actuelle (par ex. : la taille de la police générale ou des paramètres régionaux)."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"Démarrage d\'autres applications"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Permet à une application de forcer le lancement d\'autres applications."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"Fermeture forcée de l\'application"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Permet à une application de forcer une autre application exécutée au premier plan à se fermer et à passer en arrière-plan. Les applications normales ne devraient jamais avoir recours à cette fonctionnalité."</string> <string name="permlab_dump" msgid="1681799862438954752">"Vérification de l\'état interne du système"</string> @@ -280,16 +283,16 @@ <string name="permdesc_readCalendar" msgid="5533029139652095734">"Permet à une application de lire tous les événements de l\'agenda enregistrés sur votre téléphone. Des applications malveillantes peuvent utiliser cette fonctionnalité pour envoyer les événements de votre agenda à d\'autres personnes."</string> <string name="permlab_writeCalendar" msgid="377926474603567214">"Écriture des données de l\'agenda"</string> <string name="permdesc_writeCalendar" msgid="8674240662630003173">"Permet à une application de modifier les événements de l\'agenda enregistrés sur votre téléphone. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier les données de votre agenda."</string> - <string name="permlab_accessMockLocation" msgid="8688334974036823330">"Création de sources de positionnement fictives à des fins de test"</string> - <string name="permdesc_accessMockLocation" msgid="7648286063459727252">"Permet de créer des sources de positionnement fictives à des fins de test. Des applications malveillantes peuvent utiliser cette fonctionnalité pour remplacer la position géographique et/ou l\'état fournis par des sources réelles comme le GPS ou les fournisseurs d\'accès."</string> + <string name="permlab_accessMockLocation" msgid="8688334974036823330">"Création de sources de localisation fictives à des fins de test"</string> + <string name="permdesc_accessMockLocation" msgid="7648286063459727252">"Permet de créer des sources de localisation fictives à des fins de test. Des applications malveillantes peuvent utiliser cette fonctionnalité pour remplacer la position géographique et/ou l\'état fournis par des sources réelles comme le GPS ou les fournisseurs d\'accès."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"Accès aux commandes de fournisseur de position géographique supplémentaires"</string> - <string name="permdesc_accessLocationExtraCommands" msgid="1948144701382451721">"Permet d\'accéder à des commandes de fournisseur de position géographique supplémentaires. Des applications malveillantes peuvent utiliser cette fonctionnalité pour interférer avec l\'utilisation du GPS ou d\'autres sources de positionnement géographique."</string> + <string name="permdesc_accessLocationExtraCommands" msgid="1948144701382451721">"Permet d\'accéder à des commandes de fournisseur de position géographique supplémentaires. Des applications malveillantes peuvent utiliser cette fonctionnalité pour interférer avec l\'utilisation du GPS ou d\'autres sources de localisation géographique."</string> <string name="permlab_installLocationProvider" msgid="6578101199825193873">"autoriser l\'installation d\'un fournisseur de services de localisation"</string> <string name="permdesc_installLocationProvider" msgid="5449175116732002106">"Créer des sources de données de localisation factices à des fins de test. Les applications malveillantes peuvent exploiter cette fonction pour remplacer la position géographique et/ou l\'état renvoyé par les sources de données de localisation réelles, telles que le GPS ou les fournisseurs réseau, ou pour surveiller et transmettre votre position géographique à une source externe."</string> <string name="permlab_accessFineLocation" msgid="8116127007541369477">"Localisation OK (GPS)"</string> - <string name="permdesc_accessFineLocation" msgid="7411213317434337331">"Permet d\'accéder à des sources de positionnement précises comme le Global Positioning System (GPS) sur le téléphone, lorsque ces services sont disponibles. Des applications malveillantes peuvent utiliser cette fonctionnalité pour déterminer l\'endroit où vous vous trouvez et augmenter la consommation de la batterie de votre téléphone."</string> + <string name="permdesc_accessFineLocation" msgid="7411213317434337331">"Permet d\'accéder à des sources de localisation précises comme le Global Positioning System (GPS) sur le téléphone, lorsque ces services sont disponibles. Des applications malveillantes peuvent utiliser cette fonctionnalité pour déterminer l\'endroit où vous vous trouvez et augmenter la consommation de la batterie de votre téléphone."</string> <string name="permlab_accessCoarseLocation" msgid="4642255009181975828">"Position géo. approximative (selon le réseau)"</string> - <string name="permdesc_accessCoarseLocation" msgid="8235655958070862293">"Accès à des sources de positionnement approximatif (par ex. des bases de données de réseaux mobiles) pour déterminer la position géographique du téléphone, lorsque cette option est disponible. Des applications malveillantes peuvent utiliser cette fonctionnalité pour déterminer approximativement l\'endroit où vous vous trouvez."</string> + <string name="permdesc_accessCoarseLocation" msgid="8235655958070862293">"Accès à des sources de localisation approximative (par ex. des bases de données de réseaux mobiles) pour déterminer la position géographique du téléphone, lorsque cette option est disponible. Des applications malveillantes peuvent utiliser cette fonctionnalité pour déterminer approximativement l\'endroit où vous vous trouvez."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"Accès à SurfaceFlinger"</string> <string name="permdesc_accessSurfaceFlinger" msgid="6805241830020733025">"Permet à certaines applications d\'utiliser les fonctionnalités SurfaceFlinger de bas niveau."</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"Lecture de la mémoire tampon graphique"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Permet à une application d\'enregistrer de nouveaux mots dans le dictionnaire personnel de l\'utilisateur."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"modifier/supprimer le contenu de la carte SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Autorise une application à écrire sur la carte SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Domicile"</item> <item msgid="869923650527136615">"Portable"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Personnalisé"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Domicile"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobile"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Bureau"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Télécopie bureau"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Télécopie domicile"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Téléavertisseur"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Autre"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Rappel"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Voiture"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Société (principal)"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"RNIS"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Autre télécopie"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Télex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY/TTD (malentendants)"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobile (professionnel)"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Téléavertisseur (professionnel)"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistant"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Anniversaire"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Fête"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Événement"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Personnalisé"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Domicile"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Bureau"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Autre"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobile"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Personnalisée"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Domicile"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Bureau"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Autre"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Personnalisée"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Domicile"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Bureau"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Autre"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Personnalisée"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Bureau"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Autre"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Personnalisée"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Saisissez le code PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Le code PIN est incorrect !"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Pour débloquer le clavier, appuyez sur \"Menu\" puis sur 0."</string> @@ -550,11 +505,10 @@ <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Dessinez un schéma pour déverrouiller le téléphone"</string> <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Appel d\'urgence"</string> <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Combinaison correcte !"</string> - <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Désolé. Merci de réessayer."</string> + <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Incorrect. Merci de réessayer."</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Chargement (<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Chargé"</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Branchez votre chargeur."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Aucune carte SIM n\'a été trouvée."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Aucune carte SIM n\'est insérée dans le téléphone."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Se connecter"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nom d\'utilisateur ou mot de passe incorrect."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Vérification..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Débloquer"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Son activé"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Son désactivé"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Effacer"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Chargement..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Branchez le chargeur"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Le niveau de la batterie est bas :"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"Maximum <xliff:g id="NUMBER">%d%%</xliff:g> restants."</string> <string name="battery_low_why" msgid="7279169609518386372">"Utilisation de la batterie"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Échec du test usine"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"L\'action FACTORY_TEST est uniquement prise en charge pour les paquets de données installés dans in/system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Vous souhaitez quitter cette page ?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Sélectionnez OK pour continuer ou Annuler pour rester sur la page actuelle."</string> <string name="save_password_label" msgid="6860261758665825069">"Confirmer"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Conseil : Appuyez deux fois pour effectuer un zoom avant ou arrière."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"lire l\'historique et les favoris du navigateur"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Autorise l\'application à lire toutes les URL auxquelles le navigateur a accédé et tous ses favoris."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"écrire dans l\'historique et les favoris du navigateur"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Forcer la fermeture"</string> <string name="report" msgid="4060218260984795706">"Rapport"</string> <string name="wait" msgid="7147118217226317732">"Attendre"</string> - <string name="debug" msgid="9103374629678531849">"Débogage"</string> <string name="sendText" msgid="5132506121645618310">"Sélectionner une action pour le texte"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Volume de la sonnerie"</string> <string name="volume_music" msgid="5421651157138628171">"Volume"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Voulez-vous vraiment formater la carte SD ? Toutes les données de cette carte seront perdues."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Format"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Débogage USB connecté"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Sélectionnez cette option pour désactiver le débogage USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Sélectionner un mode de saisie"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidats"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Ajouter un contact"\n"en utilisant <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"sélectionné"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"non sélectionné"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Autoriser"</string> <string name="deny" msgid="2081879885755434506">"Refuser"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Autorisation demandée"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Autorisation demandée"\n"pour le compte <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Mode de saisie"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchronisation"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilité"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fond d\'écran"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Changer de fond d\'écran"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Protocole de tunnelisation point-à-point"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocole de tunnelisation de niveau 2"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Clé pré-partagée basée sur L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Certificat basé sur L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index f0647e7b2903..ff6107a38373 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Impossibile accedere al file."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Impossibile trovare il file richiesto."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Troppe richieste in fase di elaborazione. Riprova più tardi."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Errore di accesso per <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Sinc"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Sincronizzazione"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Troppe eliminazioni di <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -134,8 +133,8 @@ <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Audio non attivo"</string> <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Audio attivo"</string> <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Modalità aereo"</string> - <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Modalità aereo attiva"</string> - <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Modalità aereo non attiva"</string> + <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Disattiva modalità aereo"</string> + <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Disattiva modalità aeereo"</string> <string name="safeMode" msgid="2788228061547930246">"Modalità provvisoria"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Servizi che prevedono un costo"</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Monitorare la posizione fisica dell\'utente"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Comunicazione di rete"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Consentono l\'accesso delle applicazioni a varie funzionalità di rete."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"I tuoi account"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Accedere agli account disponibili."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Controlli hardware"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Accedere direttamente all\'hardware del ricevitore."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Telefonate"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Consente a un\'applicazione di attivare il debug per un\'altra applicazione. Le applicazioni dannose possono sfruttare questa possibilità per interrompere altre applicazioni."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"modifica impostazioni UI"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Consente a un\'applicazione di modificare la configurazione corrente, come le dimensioni dei caratteri locali o complessive."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"riavvio altre applicazioni"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Consente a un\'applicazione di riavviare forzatamente altre applicazioni."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"chiusura forzata dell\'applicazione"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Consente a un\'applicazione di forzare la chiusura di attività in primo piano. Non dovrebbe essere mai necessario per le normali applicazioni."</string> <string name="permlab_dump" msgid="1681799862438954752">"recupero stato interno del sistema"</string> @@ -319,7 +322,7 @@ <string name="permlab_callPrivileged" msgid="4198349211108497879">"chiamata diretta di tutti i n. telefono"</string> <string name="permdesc_callPrivileged" msgid="244405067160028452">"Consente all\'applicazione di chiamare qualsiasi numero, compresi quelli di emergenza, automaticamente. Le applicazioni dannose potrebbero effettuare chiamate non necessarie e illegali a servizi di emergenza."</string> <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"avviare direttamente la configurazione del telefono CDMA"</string> - <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Consente all\'applicazione di avviare il servizio di CDMA provisioning. Le applicazioni dannose potrebbero avviare il servizio di CDMA provisioning quando non è necessario"</string> + <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Consente all\'applicazione di avviare il servizio di provisioning CDMA. Le applicazioni dannose potrebbero avviare il servizio di provisioning CDMA quando non è necessario"</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"controllo notifiche aggiornamento posizione"</string> <string name="permdesc_locationUpdates" msgid="2300018303720930256">"Consente l\'attivazione/disattivazione delle notifiche di aggiornamento della posizione dal segnale cellulare. Da non usare per normali applicazioni."</string> <string name="permlab_checkinProperties" msgid="7855259461268734914">"accesso a proprietà di archiviazione"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Consente a un\'applicazione di scrivere nuove parole nel dizionario utente."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"modificare/eliminare i contenuti della scheda SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Consente a un\'applicazione di scrivere sulla scheda SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Casa"</item> <item msgid="869923650527136615">"Cellulare"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Personalizzato"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Casa"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Cellulare"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Ufficio"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Fax ufficio"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax casa"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Cercapersone"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Altro"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Callback"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Automobile"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Azienda, principale"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Principale"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Altro fax"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Segnale radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Cellulare lavoro"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Cercapersone ufficio"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistente"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Compleanno"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Anniversario"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Evento"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Personalizzato"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Casa"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Ufficio"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Altro"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Cellulare"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Personalizzato"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Casa"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Ufficio"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Altro"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Personalizzato"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Casa"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Ufficio"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Altro"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Personalizzato"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Ufficio"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Altro"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Personalizzato"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"tramite <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> tramite <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Inserisci il PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Codice PIN errato."</string> <string name="keyguard_label_text" msgid="861796461028298424">"Per sbloccare, premi Menu, poi 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Riprova"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"In carica (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Carico."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Collegare il caricabatterie."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Nessuna SIM presente."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Nessuna SIM presente nel telefono."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Accedi"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Password o nome utente non valido."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Controllo in corso..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Sblocca"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Audio attivato"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Audio disattivato"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Cancella"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"In carica..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Collegare il caricabatterie"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Batteria quasi scarica:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> rimanente o meno."</string> <string name="battery_low_why" msgid="7279169609518386372">"Utilizzo batteria"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Test di fabbrica non riuscito"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"L\'azione FACTORY_TEST è supportata soltanto per i pacchetti installati in /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Uscire da questa pagina?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Seleziona OK per continuare o Annulla per rimanere nella pagina corrente."</string> <string name="save_password_label" msgid="6860261758665825069">"Conferma"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Suggerimento. Tocca due volte per aumentare/ridurre lo zoom."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"lettura cronologia e segnalibri del browser"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Consente all\'applicazione di leggere tutti gli URL visitati e tutti i segnalibri del browser."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"creazione cronologia e segnalibri del browser"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Termina"</string> <string name="report" msgid="4060218260984795706">"Segnala"</string> <string name="wait" msgid="7147118217226317732">"Attendi"</string> - <string name="debug" msgid="9103374629678531849">"Debug"</string> <string name="sendText" msgid="5132506121645618310">"Selezione un\'opzione di invio"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Volume suoneria"</string> <string name="volume_music" msgid="5421651157138628171">"Volume app. multimediali"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Formattare la scheda SD? Tutti i dati sulla scheda verranno persi."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formatta"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Debug USB collegato"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleziona per disattivare il debug USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Seleziona metodo di inserimento"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidati"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Crea contatto"\n"utilizzando <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"selezionato"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"non selezionato"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Consenti"</string> <string name="deny" msgid="2081879885755434506">"Nega"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Autorizzazione richiesta"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Autorizzazione richiesta"\n"per l\'account <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Metodo inserimento"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Sinc"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesso facilitato"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Sfondo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambia sfondo"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Protocollo di tunneling Point-to-Point"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocollo di tunneling livello 2"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"VPN L2TP/IPSec basata su chiave precondivisa"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"VPN L2TP/IPSec basata su certificato"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 9517af5e4c7f..31c823c20964 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"ファイルにアクセスできませんでした。"</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"要求されたファイルが見つかりませんでした。"</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"処理中のリクエストが多すぎます。しばらくしてからもう一度試してください。"</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"ログインエラー: <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"同期"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"同期"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"<xliff:g id="CONTENT_TYPE">%s</xliff:g>での削除が多すぎます。"</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"現在地を追跡"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"ネットワーク通信"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"ネットワークのさまざまな機能へのアクセスをアプリケーションに許可します。"</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"アカウント"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"利用可能なアカウントにアクセスします。"</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"ハードウェアの制御"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"携帯電話のハードウェアに直接アクセスします。"</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"電話/通話"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"別のアプリケーションをデバッグモードにすることをアプリケーションに許可します。悪意のあるアプリケーションが別のアプリケーションを終了させる恐れがあります。"</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"UI設定の変更"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"地域/言語やフォントのサイズなど、現在の設定の変更をアプリケーションに許可します。"</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"他のアプリケーションの再起動"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"他のアプリケーションの強制的な再起動をアプリケーションに許可します。"</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"アプリケーションの強制終了"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"フォアグラウンドで実行されている操作を強制終了して戻ることをアプリケーションに許可します。通常のアプリケーションではまったく必要ありません。"</string> <string name="permlab_dump" msgid="1681799862438954752">"システムの内部状態の取得"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"アプリケーションがユーザー辞書に新しい語句を書き込むことを許可します。"</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"SDカードのコンテンツを修正/削除する"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"SDカードへの書き込みをアプリケーションに許可します。"</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"自宅"</item> <item msgid="869923650527136615">"携帯"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"カスタム"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"自宅"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"携帯"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"勤務先"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"FAX（勤務先）"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"FAX（自宅）"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"ポケベル"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"その他"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"コールバック"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"クルマ"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"会社代表番号"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"メイン"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"FAX（その他）"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"無線"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"テレックス"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"携帯電話（勤務先）"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"ポケベル（勤務先）"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"アシスタント"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"誕生日"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"記念日"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"予定"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"カスタム"</string> + <string name="emailTypeHome" msgid="449227236140433919">"自宅"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"勤務先"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"その他"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"携帯"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"カスタム"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"自宅"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"勤務先"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"その他"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"カスタム"</string> + <string name="imTypeHome" msgid="6241181032954263892">"自宅"</string> + <string name="imTypeWork" msgid="1371489290242433090">"勤務先"</string> + <string name="imTypeOther" msgid="5377007495735915478">"その他"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"カスタム"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Googleトーク"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"勤務先"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"その他"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"カスタム"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"<xliff:g id="SOURCE">%1$s</xliff:g>経由"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g>、更新元: <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PINコードを入力"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PINコードが正しくありません。"</string> <string name="keyguard_label_text" msgid="861796461028298424">"MENU、0キーでロック解除"</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"やり直してください"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"充電中（<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>）"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"充電完了。"</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"充電してください。"</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"SIMカードが挿入されていません"</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"SIMカードが挿入されていません"</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"ログイン"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"ユーザー名またはパスワードが正しくありません。"</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"確認中..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"ロック解除"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"サウンドON"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"サウンドOFF"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"通知を消去"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"充電中..."</string> <string name="battery_low_title" msgid="7923774589611311406">"充電してください"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"電池が残り少なくなっています:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"残り<xliff:g id="NUMBER">%d%%</xliff:g>未満です。"</string> <string name="battery_low_why" msgid="7279169609518386372">"電池使用量"</string> <string name="factorytest_failed" msgid="5410270329114212041">"出荷時試験が失敗"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"FACTORY_TEST操作は、/system/appにインストールされたパッケージのみが対象です。"</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"このページから移動しますか？"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"移動する場合は[OK]、今のページに残る場合は[キャンセル]を選択してください。"</string> <string name="save_password_label" msgid="6860261758665825069">"確認"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"ヒント: ダブルタップで拡大/縮小できます。"</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ブラウザの履歴とブックマークを読み取る"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"ブラウザでアクセスしたすべてのURLおよびブラウザのすべてのブックマークの読み取りをアプリケーションに許可します。"</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"ブラウザの履歴とブックマークを書き込む"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"強制終了"</string> <string name="report" msgid="4060218260984795706">"レポート"</string> <string name="wait" msgid="7147118217226317732">"待機"</string> - <string name="debug" msgid="9103374629678531849">"デバッグ"</string> <string name="sendText" msgid="5132506121645618310">"アプリケーションを選択"</string> <string name="volume_ringtone" msgid="6885421406845734650">"着信音量"</string> <string name="volume_music" msgid="5421651157138628171">"メディアの音量"</string> @@ -781,7 +735,7 @@ <string name="sms_control_no" msgid="1715320703137199869">"キャンセル"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> <string name="default_permission_group" msgid="2690160991405646128">"端末既定"</string> - <string name="no_permissions" msgid="7283357728219338112">"権限付与の必要はありません"</string> + <string name="no_permissions" msgid="7283357728219338112">"権限の許可は必要ありません"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"隠す"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"すべて表示"</b></string> <string name="googlewebcontenthelper_loading" msgid="4722128368651947186">"読み込み中..."</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"SDカードをフォーマットしてもよろしいですか？カード内のすべてのデータが失われます。"</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"フォーマット"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USBデバッグが接続されました"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"USBデバッグを無効にする場合に選択します。"</string> + <string name="select_input_method" msgid="6865512749462072765">"入力方法の選択"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"候補"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"<xliff:g id="NUMBER">%s</xliff:g>を使って"\n"連絡先を新規登録"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"オン"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"オフ"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"許可"</string> <string name="deny" msgid="2081879885755434506">"拒否"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"リクエスト済み権限"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"次のアカウントにアクセスする権限が"\n"リクエストされました:<xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"入力方法"</string> <string name="sync_binding_label" msgid="3687969138375092423">"同期"</string> - <string name="accessibility_binding_label" msgid="4148120742096474641">"アクセシビリティ"</string> + <string name="accessibility_binding_label" msgid="4148120742096474641">"ユーザー補助"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"壁紙"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"壁紙を変更"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"ポイントツーポイントトンネリングプロトコル"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"レイヤー2トンネリングプロトコル"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"L2TP/IPSec VPNベースの事前共有鍵"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"L2TP/IPSec VPNベースの証明書"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 0ef382497077..8afa494cb814 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"파일에 액세스할 수 없습니다."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"요청한 파일을 찾을 수 없습니다."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"처리 중인 요청이 너무 많습니다. 잠시 후에 다시 시도해 주세요."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"<xliff:g id="ACCOUNT">%1$s</xliff:g>에 로그인 오류 발생"</string> <string name="contentServiceSync" msgid="8353523060269335667">"동기화"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"동기화"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"<xliff:g id="CONTENT_TYPE">%s</xliff:g> 삭제가 너무 많습니다."</string> @@ -123,13 +122,13 @@ <string name="turn_on_radio" msgid="3912793092339962371">"무선 사용"</string> <string name="turn_off_radio" msgid="8198784949987062346">"무선 끄기"</string> <string name="screen_lock" msgid="799094655496098153">"화면 잠금"</string> - <string name="power_off" msgid="4266614107412865048">"끄기"</string> + <string name="power_off" msgid="4266614107412865048">"종료"</string> <string name="shutdown_progress" msgid="2281079257329981203">"종료 중..."</string> <string name="shutdown_confirm" msgid="649792175242821353">"휴대전화가 종료됩니다."</string> <string name="no_recent_tasks" msgid="279702952298056674">"최신 응용프로그램이 아닙니다."</string> <string name="global_actions" msgid="2406416831541615258">"휴대전화 옵션"</string> <string name="global_action_lock" msgid="2844945191792119712">"화면 잠금"</string> - <string name="global_action_power_off" msgid="4471879440839879722">"끄기"</string> + <string name="global_action_power_off" msgid="4471879440839879722">"종료"</string> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"무음 모드"</string> <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"소리 꺼짐"</string> <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"소리 켜짐"</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"실제 위치 모니터링"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"네트워크 통신"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"응용프로그램이 다양한 네트워크 기능에 액세스할 수 있도록 합니다."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"계정"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"사용 가능한 계정에 액세스합니다."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"하드웨어 제어"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"휴대전화의 하드웨어에 직접 액세스합니다."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"전화 통화"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"응용프로그램이 다른 응용프로그램에 대해 디버깅을 사용할 수 있도록 합니다. 이 경우 악성 응용프로그램이 다른 응용프로그램을 중지시킬 수 있습니다."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"UI 설정 변경"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"응용프로그램이 로케일 또는 전체 글꼴 크기와 같은 현재 구성을 변경할 수 있도록 합니다."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"다른 응용프로그램 다시 시작"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"응용프로그램이 다른 응용프로그램을 강제로 다시 시작할 수 있도록 합니다."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"강제로 응용프로그램 닫기"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"응용프로그램이 포그라운드에 있는 활동을 강제로 닫고 되돌아갈 수 있도록 합니다. 일반 응용프로그램에는 필요하지 않습니다."</string> <string name="permlab_dump" msgid="1681799862438954752">"시스템 내부 상태 검색"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"응용프로그램이 사용자 사전에 새 단어를 입력할 수 있도록 합니다."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"SD 카드 콘텐츠 수정/삭제"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"응용프로그램이 SD 카드에 쓸 수 있도록 합니다."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"집"</item> <item msgid="869923650527136615">"모바일"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"맞춤설정"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"집"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"휴대전화"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"직장"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"직장 팩스"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"집(팩스)"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"호출기"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"기타"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"콜백"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"카폰"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"회사 기본전화"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"기본"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"기타 팩스"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"무선통신"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"텔렉스"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"직장 휴대전화"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"직장 호출기"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"비서"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"생일"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"기념일"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"일정"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"맞춤설정"</string> + <string name="emailTypeHome" msgid="449227236140433919">"집"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"직장"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"기타"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"모바일"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"맞춤설정"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"집"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"직장"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"기타"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"맞춤설정"</string> + <string name="imTypeHome" msgid="6241181032954263892">"집"</string> + <string name="imTypeWork" msgid="1371489290242433090">"직장"</string> + <string name="imTypeOther" msgid="5377007495735915478">"기타"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"맞춤설정"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google 토크"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"직장"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"기타"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"맞춤설정"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"<xliff:g id="SOURCE">%1$s</xliff:g>을(를) 통해"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g>(<xliff:g id="SOURCE">%2$s</xliff:g> 사용)"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN 코드 입력"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN 코드가 잘못되었습니다."</string> <string name="keyguard_label_text" msgid="861796461028298424">"잠금해제하려면 메뉴를 누른 다음 0을 누릅니다."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"죄송합니다. 다시 시도하세요."</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"충전 중(<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"충전되었습니다."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"충전기를 연결하세요."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"SIM 카드가 없습니다."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"휴대전화에 SIM 카드가 없습니다."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"로그인"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"사용자 이름 또는 비밀번호가 잘못되었습니다."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"확인 중..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"잠금해제"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"사운드 켜기"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"사운드 끄기"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"지우기"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"충전 중..."</string> <string name="battery_low_title" msgid="7923774589611311406">"충전기를 연결하세요."</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"배터리 전원이 부족합니다."</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"잔여 배터리가 <xliff:g id="NUMBER">%d%%</xliff:g> 이하입니다."</string> <string name="battery_low_why" msgid="7279169609518386372">"배터리 사용"</string> <string name="factorytest_failed" msgid="5410270329114212041">"출고 테스트 불합격"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"FACTORY_TEST 작업은 /system/app 디렉토리에 설치된 패키지에 대해서만 지원됩니다."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"자바스크립트"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"다른 페이지를 탐색하시겠습니까?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"계속하려면 \'확인\'을 선택하고 현재 페이지에 그대로 있으려면 \'취소\'를 선택하세요."</string> <string name="save_password_label" msgid="6860261758665825069">"확인"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"도움말: 축소/확대하려면 두 번 누릅니다."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"브라우저의 기록 및 북마크 읽기"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"응용프로그램이 브라우저로 방문한 모든 URL과 브라우저의 모든 북마크를 읽도록 허용합니다."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"브라우저의 기록 및 북마크 쓰기"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"닫기"</string> <string name="report" msgid="4060218260984795706">"신고"</string> <string name="wait" msgid="7147118217226317732">"대기"</string> - <string name="debug" msgid="9103374629678531849">"디버그"</string> <string name="sendText" msgid="5132506121645618310">"텍스트에 대한 작업 선택"</string> <string name="volume_ringtone" msgid="6885421406845734650">"벨소리 볼륨"</string> <string name="volume_music" msgid="5421651157138628171">"미디어 볼륨"</string> @@ -798,15 +752,13 @@ <string name="usb_storage_stop_message" msgid="2390958966725232848">"USB 저장소를 끄기 전에 반드시 USB 호스트에서 마운트 해제하세요. USB 저장소를 끄려면 \'끄기\'를 선택하세요."</string> <string name="usb_storage_stop_button_mount" msgid="1181858854166273345">"USB 저장소 끄기"</string> <string name="usb_storage_stop_button_unmount" msgid="3774611918660582898">"취소"</string> - <string name="usb_storage_stop_error_message" msgid="3746037090369246731">"USB 저장소를 끄는 동안 문제가 발생했습니다. USB 호스트를 마운트 해제했는지 확인한 다음 다시 시도하세요."</string> + <string name="usb_storage_stop_error_message" msgid="3746037090369246731">"USB 저장소를 끄는 동안 문제가 발생했습니다. USB 호스트와 연결을 해제했는지 확인한 다음 다시 시도하세요."</string> <string name="extmedia_format_title" msgid="8663247929551095854">"SD 카드 포맷"</string> <string name="extmedia_format_message" msgid="3621369962433523619">"SD 카드를 포맷하시겠습니까? 포맷하면 카드의 모든 데이터를 잃게 됩니다."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"포맷"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB 디버깅 연결됨"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"USB 디버깅을 사용하지 않으려면 선택합니다."</string> + <string name="select_input_method" msgid="6865512749462072765">"입력 방법 선택"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"가능한 원인"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"전화번호부에"\n"<xliff:g id="NUMBER">%s</xliff:g> 추가"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"선택함"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"선택 안함"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"허용"</string> <string name="deny" msgid="2081879885755434506">"거부"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"권한 요청"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"<xliff:g id="ACCOUNT">%s</xliff:g> 계정에 대해"\n"권한 요청"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"입력 방법"</string> <string name="sync_binding_label" msgid="3687969138375092423">"동기화"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"접근성"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"배경화면"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"배경화면 변경"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"PPTP(Point-to-Point Tunneling Protocol)"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"L2TP(Layer 2 Tunneling Protocol)"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"사전 공유 키 기반 L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"인증서 기반 L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index aa15ad1e3a35..ed4f5968bcbb 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Kunne ikke åpne filen."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Fant ikke den forespurte filen."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"For mange forespørsler blir behandlet. Prøv igjen senere."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Innloggingsfeil for <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synkronisering"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synkronisering"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"For mange slettinger av <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Overvåking av telefonens fysiske plassering"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Nettverkstilgang"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Gir applikasjoner tilgang til diverse nettverksfunksjoner."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Google-kontoer"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Tilgang til tilgjengelige Google-kontoer."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Maskinvarekontroll"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Direkte tilgang til maskinvaren på telefonen."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Telefonsamtaler"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Lar applikasjonen skru på debugging for en annen applikasjon. Ondsinnede applikasjoner kan bruke dette til å drepe andre applikasjoner."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"endre innstillingene for brukergrensesnitt"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Tillater applikasjonen å endre gjeldende innstillinger, slik som språk eller skriftstørrelse."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"omstarte andre applikasjoner"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Lar applikasjonen tvinge andre applikasjoner til å starte på nytt."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"tvinge applikasjoner til å lukkes"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Lar applikasjonen tvinge enhver aktivitet som er i forgrunnen til å lukkes og gå tilbake. Vanlige applikasjoner bør aldri trenge dette."</string> <string name="permlab_dump" msgid="1681799862438954752">"hente intern systemtilstand"</string> @@ -198,7 +201,7 @@ <string name="permdesc_shutdown" msgid="7046500838746291775">"Lar applikasjonen sette aktivitetshåndtereren i avslutningstilstand. Slår ikke systemet helt av."</string> <string name="permlab_stopAppSwitches" msgid="4138608610717425573">"forhindre applikasjonsbytte"</string> <string name="permdesc_stopAppSwitches" msgid="3857886086919033794">"Lar applikasjonen forhindre brukeren fra å bytte til en annen applikasjon."</string> - <string name="permlab_runSetActivityWatcher" msgid="7811586187574696296">"Blokker popup-vinduer"</string> + <string name="permlab_runSetActivityWatcher" msgid="7811586187574696296">"overvåke og kontrollere all applikasjonsoppstart"</string> <string name="permdesc_runSetActivityWatcher" msgid="3228701938345388092">"Lar applikasjonen overvåke og kontrollere hvordan systemet starter applikasjoner. Ondsinnede applikasjoner kan ta over systemet helt. Denne rettigheten behøves bare for utvikling, aldri for vanlig bruk av telefonen."</string> <string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"kringkaste melding om fjernet pakke"</string> <string name="permdesc_broadcastPackageRemoved" msgid="3453286591439891260">"Lar applikasjonen kringkaste en melding om at en applikasjonspakke er blitt fjernet. Ondsinnede applikasjoner kan bruke dette til å drepe vilkårlige andre kjørende applikasjoner."</string> @@ -213,9 +216,9 @@ <string name="permlab_batteryStats" msgid="7863923071360031652">"endre batteristatistikk"</string> <string name="permdesc_batteryStats" msgid="5847319823772230560">"Lar applikasjonen endre på innsamlet batteristatistikk. Ikke ment for vanlige applikasjoner."</string> <string name="permlab_backup" msgid="470013022865453920">"kontrollere backup og gjenoppretting"</string> - <string name="permdesc_backup" msgid="4837493065154256525">"Gir programmet tillatelse til å kontrollere systemets mekanismer for sikkerhetskopiering gjenoppretting. Ikke beregnet på vanlige programmer."</string> - <string name="permlab_backup_data" msgid="4057625941707926463">"sikkerhetskopier og gjenopprett programmets data"</string> - <string name="permdesc_backup_data" msgid="8274426305151227766">"Gir programmet tillatelse til å ta del i systemets mekanismer for sikkerhetskopiering og gjenoppretting."</string> + <string name="permdesc_backup" msgid="4837493065154256525">"Lar applikasjonen kontrollere systemets backup- og gjenopprettingsmekanisme. Ikke ment for vanlige applikasjoner."</string> + <string name="permlab_backup_data" msgid="4057625941707926463">"foreta backup og gjenoppretting av applikasjonens data"</string> + <string name="permdesc_backup_data" msgid="8274426305151227766">"Lar applikasjonen delta i systemets backup- og gjenopprettingsmekanisme."</string> <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"vis uautoriserte vinduer"</string> <string name="permdesc_internalSystemWindow" msgid="5895082268284998469">"Tillater at det opprettes vinduer ment for bruk av systemets interne brukergrensesnitt. Ikke ment for vanlige applikasjoner."</string> <string name="permlab_systemAlertWindow" msgid="3372321942941168324">"vise advarsler på systemnivå"</string> @@ -261,7 +264,7 @@ <string name="permlab_writeSettings" msgid="1365523497395143704">"endre globale systeminnstillinger"</string> <string name="permdesc_writeSettings" msgid="838789419871034696">"Lar applikasjonen endre systemets innstillingsdata. Ondsinnede applikasjoner kan skade systemets innstillinger."</string> <string name="permlab_writeSecureSettings" msgid="204676251876718288">"endre sikre systeminnstillinger"</string> - <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"Gir programmet tillatelse til å endre systemets data for sikkerhetsinnstilling. Ikke beregnet på vanlige programmer."</string> + <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"Gir programmet tillatelse til å endre systemets data for sikkerhetsinnstilling. Ikke ment for vanlige programmer."</string> <string name="permlab_writeGservices" msgid="2149426664226152185">"redigere Google-tjenestekartet"</string> <string name="permdesc_writeGservices" msgid="6602362746516676175">"Lar applikasjonen redigere Google-tjenestekartet. Ikke ment for bruk av vanlige applikasjoner."</string> <string name="permlab_receiveBootCompleted" msgid="7776779842866993377">"starte automatisk sammen med systemet"</string> @@ -318,8 +321,8 @@ <string name="permdesc_callPhone" msgid="3369867353692722456">"Lar applikasjonen ringe telefonnummer uten inngripen fra brukeren. Ondsinnede applikasjoner kan forårsake uventede oppringinger på telefonregningen. Merk at dette ikke gir applikasjonen lov til å ringe nødnummer."</string> <string name="permlab_callPrivileged" msgid="4198349211108497879">"ringe vilkårlige telefonnummer direkte"</string> <string name="permdesc_callPrivileged" msgid="244405067160028452">"Lar applikasjonen ringe hvilket som helst telefonnummer, inkludert nødnummer, uten inngripen fra brukeren. Ondsinnede applikasjoner kan forårsake unødvendige og ulovlige samtaler til nødtjenester."</string> - <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"start CDMA-telefonoppsett direkte"</string> - <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Gir programmet tillatelse til å starte klargjøring av CDMA. Skadelige programmer kan starte klargjøring av CDMA uten grunn"</string> + <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"begynne CDMA-telefonoppsett direkte"</string> + <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Lar applikasjonen begynne CDMA-oppsett. Ondsinnede applikasjoner kan bruke dette til å starte CDMA-oppsett uten grunn."</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"kontrollere varsling for plasseringsendring"</string> <string name="permdesc_locationUpdates" msgid="2300018303720930256">"Lar applikasjonen slå av/på varsling om plasseringsendringer fra radioen. Ikke ment for vanlige applikasjoner."</string> <string name="permlab_checkinProperties" msgid="7855259461268734914">"få tilgang til egenskaper for innsjekking"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Lar applikasjonen skrive nye ord til den brukerdefinerte ordlisten."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"redigere/slette innhold på minnekort"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Lar applikasjonen skrive til minnekortet."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Hjemmenummer"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Egendefinert"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Hjemme"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobil"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Arbeid"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Faks arbeid"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Faks hjemme"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Personsøker"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Annen"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Tilbakering"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Bil"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Firma hoved"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Hoved"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Faks annen"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Teleks"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"Teksttelefon"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobil arbeid"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Personsøker arbeid"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistent"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Bursdag"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Jubileum"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Akivitet"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Egendefinert"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Hjemme"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Arbeid"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Annen"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Egendefinert"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Hjemme"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Arbeid"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Annen"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Egendefinert"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Hjemme"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Arbeid"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Annen"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Egendefinert"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"OQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Arbeid"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Annen"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Egendefinert"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Skriv inn PIN-kode:"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Gal PIN-kode!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"For å låse opp, trykk på menyknappen og deretter 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Beklager, prøv igjen:"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Lader (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Fullt ladet"</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Koble til en batterilader."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Mangler SIM-kort."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Ikke noe SIM-kort i telefonen."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Logg på"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ugyldig brukernavn eller passord."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrollerer ..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Lås opp"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Lyd på"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Lyd av"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Fjern"</string> @@ -586,19 +543,17 @@ <string name="battery_status_charging" msgid="756617993998772213">"Lader…"</string> <string name="battery_low_title" msgid="7923774589611311406">"Koble til en lader"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Batteriet er nesten tomt:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"mindre enn <xliff:g id="NUMBER">%d%%</xliff:g> igjen."</string> <string name="battery_low_why" msgid="7279169609518386372">"Batteribruk"</string> - <string name="factorytest_failed" msgid="5410270329114212041">"Factory test failed"</string> + <string name="factorytest_failed" msgid="5410270329114212041">"Fabrikktesten feilet"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"The FACTORY_TEST action is only supported for packages installed in /system/app."</string> <string name="factorytest_no_action" msgid="872991874799998561">"No package was found that provides the FACTORY_TEST action."</string> - <string name="factorytest_reboot" msgid="6320168203050791643">"Reboot"</string> + <string name="factorytest_reboot" msgid="6320168203050791643">"Omstart"</string> <string name="js_dialog_title" msgid="8143918455087008109">"Siden \'<xliff:g id="TITLE">%s</xliff:g> sier:"</string> <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Naviger bort fra denne siden?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Velg OK for å fortsette, eller Avbryt for å forbli på denne siden."</string> <string name="save_password_label" msgid="6860261758665825069">"Bekreft"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Dobbelttrykk for å zoome inn og ut."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"lese nettleserens logg og bokmerker"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Lar applikasjonen lese alle adresser nettleseren har besøkt, og alle nettleserens bokmerker."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"skrive til nettleserens logg og bokmerker"</string> @@ -681,7 +636,7 @@ <item quantity="one" msgid="2178576254385739855">"i morgen"</item> <item quantity="other" msgid="2973062968038355991">"om <xliff:g id="COUNT">%d</xliff:g> d"</item> </plurals> - <string name="preposition_for_date" msgid="9093949757757445117">"den <xliff:g id="DATE">%s</xliff:g>"</string> + <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"kl. <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"i <xliff:g id="YEAR">%s</xliff:g>"</string> <string name="day" msgid="8144195776058119424">"dag"</string> @@ -733,24 +688,23 @@ <string name="dialog_alert_title" msgid="2049658708609043103">"Merk"</string> <string name="capital_on" msgid="1544682755514494298">"På"</string> <string name="capital_off" msgid="6815870386972805832">"Av"</string> - <string name="whichApplication" msgid="4533185947064773386">"Complete action using"</string> - <string name="alwaysUse" msgid="4583018368000610438">"Use by default for this action."</string> - <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Clear default in Home Settings > Applications > Manage applications."</string> - <string name="chooseActivity" msgid="1009246475582238425">"Select an action"</string> - <string name="noApplications" msgid="1691104391758345586">"No applications can perform this action."</string> - <string name="aerr_title" msgid="653922989522758100">"Sorry!"</string> - <string name="aerr_application" msgid="4683614104336409186">"The application <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) has stopped unexpectedly. Please try again."</string> - <string name="aerr_process" msgid="1551785535966089511">"The process <xliff:g id="PROCESS">%1$s</xliff:g> has stopped unexpectedly. Please try again."</string> - <string name="anr_title" msgid="3100070910664756057">"Sorry!"</string> - <string name="anr_activity_application" msgid="3538242413112507636">"Activity <xliff:g id="ACTIVITY">%1$s</xliff:g> (in application <xliff:g id="APPLICATION">%2$s</xliff:g>) is not responding."</string> - <string name="anr_activity_process" msgid="5420826626009561014">"Activity <xliff:g id="ACTIVITY">%1$s</xliff:g> (in process <xliff:g id="PROCESS">%2$s</xliff:g>) is not responding."</string> - <string name="anr_application_process" msgid="4185842666452210193">"Application <xliff:g id="APPLICATION">%1$s</xliff:g> (in process <xliff:g id="PROCESS">%2$s</xliff:g>) is not responding."</string> - <string name="anr_process" msgid="1246866008169975783">"Process <xliff:g id="PROCESS">%1$s</xliff:g> is not responding."</string> - <string name="force_close" msgid="3653416315450806396">"Force close"</string> + <string name="whichApplication" msgid="4533185947064773386">"Fullfør med"</string> + <string name="alwaysUse" msgid="4583018368000610438">"Bruk som standardvalg."</string> + <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Fjern standardvalg i Innstillinger > Applikasjoner > Installerte applikasjoner."</string> + <string name="chooseActivity" msgid="1009246475582238425">"Velg en aktivitet"</string> + <string name="noApplications" msgid="1691104391758345586">"Ingen applikasjoner kan gjøre dette."</string> + <string name="aerr_title" msgid="653922989522758100">"Beklager!"</string> + <string name="aerr_application" msgid="4683614104336409186">"Applikasjonen <xliff:g id="APPLICATION">%1$s</xliff:g> (prosess <xliff:g id="PROCESS">%2$s</xliff:g>) stoppet uventet. Prøv igjen."</string> + <string name="aerr_process" msgid="1551785535966089511">"Prosessen <xliff:g id="PROCESS">%1$s</xliff:g> stoppet uventet. Prøv igjen."</string> + <string name="anr_title" msgid="3100070910664756057">"Beklager!"</string> + <string name="anr_activity_application" msgid="3538242413112507636">"Aktiviteten <xliff:g id="ACTIVITY">%1$s</xliff:g> (i applikasjonen <xliff:g id="APPLICATION">%2$s</xliff:g>) svarer ikke."</string> + <string name="anr_activity_process" msgid="5420826626009561014">"Aktiviteten <xliff:g id="ACTIVITY">%1$s</xliff:g> (i prosessen <xliff:g id="PROCESS">%2$s</xliff:g>) svarer ikke."</string> + <string name="anr_application_process" msgid="4185842666452210193">"Applikasjonen <xliff:g id="APPLICATION">%1$s</xliff:g> (i prosessen <xliff:g id="PROCESS">%2$s</xliff:g>) svarer ikke."</string> + <string name="anr_process" msgid="1246866008169975783">"Prosessen <xliff:g id="PROCESS">%1$s</xliff:g> svarer ikke."</string> + <string name="force_close" msgid="3653416315450806396">"Tving avslutning"</string> <string name="report" msgid="4060218260984795706">"Rapportér"</string> - <string name="wait" msgid="7147118217226317732">"Wait"</string> - <string name="debug" msgid="9103374629678531849">"Debug"</string> - <string name="sendText" msgid="5132506121645618310">"Select an action for text"</string> + <string name="wait" msgid="7147118217226317732">"Vent"</string> + <string name="sendText" msgid="5132506121645618310">"Velg mål for tekst"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Ringetonevolum"</string> <string name="volume_music" msgid="5421651157138628171">"Medievolum"</string> <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Spiller over Bluetooth"</string> @@ -801,12 +755,10 @@ <string name="usb_storage_stop_error_message" msgid="3746037090369246731">"Det har oppstått et problem ved deaktiveringen av USB-lagring. Kontroller at du har demontert USB-verten, og prøv igjen."</string> <string name="extmedia_format_title" msgid="8663247929551095854">"Formatere minnekort"</string> <string name="extmedia_format_message" msgid="3621369962433523619">"Er du sikker på at du ønsker å formatere minnekortet? Alle data på kortet vil gå tapt."</string> - <string name="extmedia_format_button_format" msgid="4131064560127478695">"Format"</string> + <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formatér"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-debugging tilkoblet"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Velg for å deaktivere USB-debugging."</string> + <string name="select_input_method" msgid="6865512749462072765">"Velg inndatametode"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZÆØÅ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÆØÅ"</string> <string name="candidates_style" msgid="4333913089637062257">"TAG_FONT"<u>"kandidater"</u>"CLOSE_FONT"</string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Lag kontakt"\n"med nummeret <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"valgt"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"ikke valgt"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Tillat"</string> <string name="deny" msgid="2081879885755434506">"Avslå"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Tillatelse forespurt"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Trenger tillatelse"\n"for konto <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Inndatametode"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synkronisering"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Tilgjengelighet"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Bakgrunnsbilde"</string> - <string name="chooser_wallpaper" msgid="7873476199295190279">"Endre bakgrunnsbilde"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="chooser_wallpaper" msgid="7873476199295190279">"Velg bakgrunnsbilde"</string> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Punkt-til-punkt-tunneleringsprotokoll"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Lag 2-tunneleringsprotokoll"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Passordbasert L2TP/IPSec-VPN"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Sertifikatbasert L2TP/IPSec-VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index c299ef8e9eb8..a6ebcde2b8aa 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Het bestand kan niet worden geopend."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Het opgevraagde bestand is niet gevonden."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Er worden te veel aanvragen verwerkt. Probeer het later opnieuw."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Fout bij aanmelding voor \'<xliff:g id="ACCOUNT">%1$s</xliff:g>\'"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synchroniseren"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synchroniseren"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Te veel verwijderen voor <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Uw fysieke locatie bijhouden"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Netwerkcommunicatie"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Toepassingen toestaan verschillende netwerkfuncties te openen."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Uw accounts"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Toegang tot de beschikbare accounts."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Bedieningselementen hardware"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Rechtstreekse toegang tot hardware op de handset."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Telefoonoproepen"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Hiermee kan een toepassing de foutopsporing voor een andere toepassing inschakelen. Schadelijke toepassingen kunnen dit gebruiken om andere toepassingen af te sluiten."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"uw UI-instellingen wijzigen"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Hiermee kan een toepassing de huidige configuratie, zoals de landinstelling of de algemene lettergrootte, wijzigen."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"andere toepassingen opnieuw starten"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Hiermee kan een toepassing andere toepassingen opnieuw starten."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"toepassing nu sluiten"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Hiermee kan een toepassing elke willekeurige activiteit die op de voorgrond wordt uitgevoerd, sluiten en naar de achtergrond verplaatsen. Nooit vereist voor normale toepassingen."</string> <string name="permlab_dump" msgid="1681799862438954752">"interne systeemstatus ophalen"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Hiermee kan een toepassing nieuwe woorden schrijven naar het gebruikerswoordenboek."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"inhoud op de SD-kaart aanpassen/verwijderen"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Hiermee kan een toepassing schrijven naar de SD-kaart."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Thuis"</item> <item msgid="869923650527136615">"Mobiel"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Aangepast"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Thuis"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobiel"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Werk"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Fax werk"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax thuis"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Overig"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Terugbelnummer"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Auto"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Bedrijf, algemeen"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Algemeen"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Andere fax"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"Teksttelefoon"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobiel werk"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager werk"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistent"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Verjaardag"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Jubileum"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Afspraak"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Aangepast"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Thuis"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Werk"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Overig"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobiel"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Aangepast"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Thuis"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Werk"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Overig"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Aangepast"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Thuis"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Werk"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Overig"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Aangepast"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Werk"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Overig"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Aangepast"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN-code invoeren"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Onjuiste PIN-code!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Druk op \'Menu\' en vervolgens op 0 om te ontgrendelen."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Probeer het opnieuw"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Opladen (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Opgeladen."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Sluit de oplader aan."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Geen SIM-kaart."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Geen SIM-kaart in telefoon."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Aanmelden"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Gebruikersnaam of wachtwoord ongeldig."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Controleren..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Ontgrendelen"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Geluid aan"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Geluid uit"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Wissen"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Opladen..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Sluit de oplader aan"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"De accu raakt op:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> of minder resterend."</string> <string name="battery_low_why" msgid="7279169609518386372">"Accugebruik"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Fabriekstest mislukt"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"De actie FACTORY_TEST wordt alleen ondersteund voor pakketten die zijn geïnstalleerd in /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Wilt u deze pagina verlaten?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Kies OK om door te gaan of Annuleren om op de huidige pagina te blijven."</string> <string name="save_password_label" msgid="6860261758665825069">"Bevestigen"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Tip: tik tweemaal om in of uit te zoomen."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"browsergeschiedenis en bladwijzers lezen"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Hiermee kan een toepassing de URL\'s lezen die u via de browser heeft bezocht, evenals alle bladwijzers van de browser."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"browsergeschiedenis en bladwijzers schrijven"</string> @@ -722,7 +677,7 @@ <string name="paste" msgid="5629880836805036433">"Plakken"</string> <string name="copyUrl" msgid="2538211579596067402">"URL kopiëren"</string> <string name="inputMethod" msgid="1653630062304567879">"Invoermethode"</string> - <string name="addToDictionary" msgid="8793624991686948709">"\' <xliff:g id="WORD">%s</xliff:g>\' toevoegen aan woordenboek"</string> + <string name="addToDictionary" msgid="8793624991686948709">"\'<xliff:g id="WORD">%s</xliff:g>\' toevoegen aan woordenboek"</string> <string name="editTextMenuTitle" msgid="1672989176958581452">"Tekst bewerken"</string> <string name="low_internal_storage_view_title" msgid="1399732408701697546">"Weinig ruimte"</string> <string name="low_internal_storage_view_text" msgid="635106544616378836">"Opslagruimte van telefoon raakt op."</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Nu sluiten"</string> <string name="report" msgid="4060218260984795706">"Rapport"</string> <string name="wait" msgid="7147118217226317732">"Wachten"</string> - <string name="debug" msgid="9103374629678531849">"Foutopsporing"</string> <string name="sendText" msgid="5132506121645618310">"Selecteer een actie voor tekst"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Belvolume"</string> <string name="volume_music" msgid="5421651157138628171">"Mediavolume"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Weet u zeker dat u de SD-kaart wilt formatteren? Alle gegevens op uw kaart gaan dan verloren."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formatteren"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-foutopsporing verbonden"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Selecteer deze optie om USB-foutopsporing uit te schakelen."</string> + <string name="select_input_method" msgid="6865512749462072765">"Invoermethode selecteren"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidaten"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Contact maken"\n"met <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"aangevinkt"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"niet aangevinkt"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Toestaan"</string> <string name="deny" msgid="2081879885755434506">"Weigeren"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Toestemming gevraagd"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Toestemming gevraagd"\n"voor account \'<xliff:g id="ACCOUNT">%s</xliff:g>\'"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Invoermethode"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchroniseren"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Toegankelijkheid"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Achtergrond"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Achtergrond wijzigen"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Point-to-Point Tunneling Protocol (PPTP)"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Layer 2 Tunneling Protocol (L2TP)"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Vooraf gedeelde sleutel op basis van L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Certificaat op basis van L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index f53bd4c5e114..6d0539e0d1e6 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Nie można uzyskać dostępu do pliku."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Nie znaleziono żądanego pliku."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Zbyt wiele żądań jest przetwarzanych. Spróbuj ponownie później."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Błąd logowania na konto <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synchronizacja"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synchronizuj"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Zbyt wiele usuwanych <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Monitorowanie fizycznej lokalizacji"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Połączenia sieciowe"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Pozwól aplikacjom na dostęp do różnych funkcji sieci."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Twoje konta"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Dostęp do udostępnionych kont."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Sterowanie sprzętowe"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Bezpośredni dostęp do elementów sprzętowych telefonu."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Połączenia telefoniczne"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Pozwala aplikacji na włączenie debugowania innej aplikacji. Szkodliwe aplikacje mogą to wykorzystać do wyłączenia innych programów."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"zmienianie ustawień interfejsu użytkownika"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Pozwala aplikacji zmieniać bieżącą konfigurację, na przykład lokalny lub globalny rozmiar czcionki."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"resetowanie innych aplikacji"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Pozwala aplikacji na wymuszenie ponownego uruchomienia innych aplikacji."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"wymuszanie zamknięcia aplikacji"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Pozwala aplikacji na wymuszenie zamknięcia i cofnięcia dowolnej operacji działającej na pierwszym planie. Nigdy nie powinno być potrzebne normalnym aplikacjom."</string> <string name="permlab_dump" msgid="1681799862438954752">"pobieranie informacji o wewnętrznym stanie systemu"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Zezwala aplikacjom na zapisywanie nowych słów w słowniku użytkownika."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"modyfikowanie/usuwanie zawartości karty SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Umożliwia aplikacji zapis na karcie SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Dom"</item> <item msgid="869923650527136615">"Komórka"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Niestandardowy"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Domowy"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Komórka"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Służbowy"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Faks służbowy"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Faks domowy"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Inny"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Połączenie zwrotne"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Samochód"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Firmowy główny"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Główny"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Inny faks"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Teleks"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Służbowa komórka"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager służbowy"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Asystent"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"Wiadomość MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Urodziny"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Rocznica"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Wydarzenie"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Niestandardowy"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Domowy"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Służbowy"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Inny"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Komórka"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Niestandardowy"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Domowy"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Służbowy"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Inny"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Niestandardowy"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Domowy"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Służbowy"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Inny"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Niestandardowy"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Służbowy"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Inny"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Niestandardowy"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"przez <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> za pośrednictwem: <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Wprowadź kod PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Błędny kod PIN!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Aby odblokować, naciśnij Menu, a następnie 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Niestety, spróbuj ponownie"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Ładowanie (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Naładowany."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Podłącz ładowarkę."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Brak karty SIM."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Brak karty SIM w telefonie."</string> @@ -573,9 +527,12 @@ <string name="lockscreen_glogin_instructions" msgid="1816635201812207709">"Aby odblokować, zaloguj się za pomocą konta Google"</string> <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"Nazwa użytkownika (e-mail)"</string> <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Hasło"</string> - <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Zaloguj"</string> + <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Zaloguj się"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Błędna nazwa użytkownika lub hasło."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Trwa sprawdzanie..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Odblokuj"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Włącz dźwięk"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Wyłącz dźwięk"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Wyczyść"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Ładowanie..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Podłącz ładowarkę"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Bateria się rozładowuje:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"Pozostało: <xliff:g id="NUMBER">%d%%</xliff:g> lub mniej."</string> <string name="battery_low_why" msgid="7279169609518386372">"Użycie baterii"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Nieudany test fabryczny"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Czynność FACTORY_TEST jest obsługiwana tylko dla pakietów zainstalowanych w katalogu /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Czy opuścić tę stronę?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Wybierz opcję OK, aby kontynuować, lub opcję Anuluj, aby pozostać na tej stronie."</string> <string name="save_password_label" msgid="6860261758665825069">"Potwierdź"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Wskazówka: dotknij dwukrotnie, aby powiększyć lub pomniejszyć."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"odczyt historii i zakładek przeglądarki"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Umożliwia aplikacji odczyt wszystkich adresów URL odwiedzonych przez przeglądarkę, a także wszystkich zakładek przeglądarki."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"zapis historii i zakładek przeglądarki"</string> @@ -651,7 +606,7 @@ </plurals> <plurals name="abbrev_num_seconds_ago"> <item quantity="one" msgid="1849036840200069118">"sekundę temu"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> sek. temu"</item> + <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> s temu"</item> </plurals> <plurals name="abbrev_num_minutes_ago"> <item quantity="one" msgid="6361490147113871545">"minutę temu"</item> @@ -667,7 +622,7 @@ </plurals> <plurals name="abbrev_in_num_seconds"> <item quantity="one" msgid="5842225370795066299">"za sekundę"</item> - <item quantity="other" msgid="5495880108825805108">"za <xliff:g id="COUNT">%d</xliff:g> sek."</item> + <item quantity="other" msgid="5495880108825805108">"za <xliff:g id="COUNT">%d</xliff:g> s"</item> </plurals> <plurals name="abbrev_in_num_minutes"> <item quantity="one" msgid="562786149928284878">"za minutę"</item> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Wymuś zamknięcie"</string> <string name="report" msgid="4060218260984795706">"Zgłoś"</string> <string name="wait" msgid="7147118217226317732">"Czekaj"</string> - <string name="debug" msgid="9103374629678531849">"Debuguj"</string> <string name="sendText" msgid="5132506121645618310">"Jak wysłać tekst?"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Głośność dzwonka"</string> <string name="volume_music" msgid="5421651157138628171">"Głośność multimediów"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Czy na pewno sformatować kartę SD? Wszystkie dane na karcie zostaną utracone."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formatuj"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Podłączono moduł debugowania USB"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Wybierz, aby wyłączyć debugowanie USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Wybierz metodę wprowadzania"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandydaci"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Utwórz kontakt"\n"dla numeru <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"zaznaczone"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"niezaznaczone"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Zezwól"</string> <string name="deny" msgid="2081879885755434506">"Odmów"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Żądane pozwolenie"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Prośba o pozwolenie"\n"dotyczące konta <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Metoda wprowadzania"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchronizacja"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Ułatwienia dostępu"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Zmień tapetę"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Protokół PPTP"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protokół L2TP"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Sieć VPN L2TP/IPSec z kluczem PSK"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Sieć VPN L2TP/IPSec z certyfikatem"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 891e7cea7524..1872cb463489 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Não foi possível aceder ao ficheiro."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Não foi possível localizar o ficheiro pedido."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Existem demasiados pedidos em processamento. Tente novamente mais tarde."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Erro de início de sessão para <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Sincronização"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Sincronização"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Demasiadas eliminações de <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Monitorizar a sua localização física"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Comunicação de rede"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Permite o acesso de aplicações a várias funcionalidades de rede."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"As suas contas"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Aceda às contas disponíveis."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Controlos de hardware"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Aceda directamente ao hardware no telefone."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Chamadas"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Permite a uma aplicação activar a depuração para outra aplicação. Algumas aplicações maliciosas podem utilizar este item para eliminar outras aplicações."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"alterar definições da IU"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Permite a uma aplicação mudar a configuração actual como, por exemplo, a região ou o tamanho global do tipo de letra."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"reiniciar outras aplicações"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Permite a uma aplicação efectuar o reinício forçado de outras aplicações."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"forçar fecho da aplicação"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Permite a uma aplicação forçar qualquer actividade em primeiro plano a fechar e retroceder. Nunca deve ser necessário para aplicações normais."</string> <string name="permlab_dump" msgid="1681799862438954752">"obter estado interno do sistema"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Permite a uma aplicação escrever novas palavras no dicionário do utilizador."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"modificar/eliminar os conteúdos do cartão SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Permite que uma aplicação escreva no cartão SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Residência"</item> <item msgid="869923650527136615">"Móvel"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Personalizado"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Residência"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Telemóvel"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Emprego"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Fax do emprego"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax da residência"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Outro"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Rechamada"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Automóvel"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Telefone principal da empresa"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"RDIS"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Outro fax"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Rádio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Telemóvel do emprego"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager do trabalho"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistente"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Data de nascimento"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Aniversário"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Evento"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Personalizado"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Residência"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Emprego"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Outro"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Telemóvel"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Personalizado"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Residência"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Emprego"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Outro"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Personalizado"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Residência"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Emprego"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Outro"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Personalizado"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Emprego"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Outro"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Personalizado"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"através do <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> através de <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Introduzir código PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Código PIN incorrecto!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Para desbloquear, prima Menu e, em seguida, 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Lamentamos, tente novamente"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"A carregar (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Carregado."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Ligue o carregador."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Nenhum cartão SIM."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Nenhum cartão SIM no telefone."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Iniciar sessão"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nome de utilizador ou palavra-passe inválidos."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"A verificar..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Som activado"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Som desactivado"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g> <xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g> <xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Limpar"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"A carregar..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Ligue o carregador"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"A bateria está a ficar fraca:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"Restam <xliff:g id="NUMBER">%d%%</xliff:g> ou menos."</string> <string name="battery_low_why" msgid="7279169609518386372">"Utilização da bateria"</string> <string name="factorytest_failed" msgid="5410270329114212041">"O teste de fábrica falhou"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"A acção FACTORY_TEST apenas é suportada para pacotes instalados em /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Navegar para outra página?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Seleccione OK para continuar ou Cancelar para permanecer na página actual."</string> <string name="save_password_label" msgid="6860261758665825069">"Confirmar"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Sugestão: toque duas vezes para aumentar ou diminuir o zoom."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ler histórico e marcadores do browser"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Permite que a aplicação leia todos os URLs visitados pelo browser e todos os marcadores do browser."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"gravar histórico e marcadores do browser"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Forçar fecho"</string> <string name="report" msgid="4060218260984795706">"Relatório"</string> <string name="wait" msgid="7147118217226317732">"Esperar"</string> - <string name="debug" msgid="9103374629678531849">"Depuração"</string> <string name="sendText" msgid="5132506121645618310">"Seleccionar uma acção para texto"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Volume da campainha"</string> <string name="volume_music" msgid="5421651157138628171">"Volume de multimédia"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Tem a certeza de que pretende formatar o cartão SD? Perder-se-ão todos os dados no cartão."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formatar"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuração USB ligada"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleccione para desactivar depuração USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Seleccionar método de entrada"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Criar contacto"\n"utilizando <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"verificado"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"não verificado"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Recusar"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Autorização Solicitada"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Autorização solicitada"\n"para a conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Método de entrada"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Sincronização"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Acessibilidade"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Imagem de fundo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Alterar imagem de fundo"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Protocolo de túnel ponto a ponto (PPTP)"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocolo de túnel de camada 2 (L2TP)"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"VPN L2TP/IPSec baseada em chave pré- partilhada"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"VPN L2TP/IPSec baseada em certificado"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 265fb62cc683..6841fec5b2c8 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Não foi possível acessar o arquivo."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"O arquivo solicitado não foi encontrado."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Há muitas solicitações sendo processadas. Tente novamente mais tarde."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Erro de login para <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Sincronizar"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Sincronizar"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Muitas exclusões de <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Monitora o seu local físico."</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Comunicação da rede"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Permite que os aplicativos acessem diversos recursos de rede."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Suas contas"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Acessar as contas disponíveis."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Controles de hardware"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Acessa o hardware diretamente no aparelho."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Chamadas telefônicas"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Permite que um aplicativo ative a depuração de outro aplicativo. Aplicativos maliciosos podem usar isso para encerrar outros aplicativos."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"alterar as suas configurações de UI"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Permite que um aplicativo altere a configuração atual, como o local ou o tamanho geral da fonte."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"reiniciar outros aplicativos"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Permite que um aplicativo reinicie forçosamente outros aplicativos."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"forçar fechamento do aplicativo"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Permite que um aplicativo force o fechamento de qualquer atividade que esteja em primeiro plano. Aplicativos normais não devem precisar disso em momento algum."</string> <string name="permlab_dump" msgid="1681799862438954752">"recuperar o estado interno do sistema"</string> @@ -392,8 +395,12 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Permite que um aplicativo grave novas palavras no dicionário do usuário."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"modificar/excluir conteúdo do cartão SD"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Permite que um aplicativo grave no cartão SD."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> - <item msgid="8901098336658710359">"Página inicial"</item> + <item msgid="8901098336658710359">"Residencial"</item> <item msgid="869923650527136615">"Celular"</item> <item msgid="7897544654242874543">"Trabalho"</item> <item msgid="1103601433382158155">"Fax do trabalho"</item> @@ -403,19 +410,19 @@ <item msgid="9192514806975898961">"Personalizado"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"Página inicial"</item> + <item msgid="8073994352956129127">"Residencial"</item> <item msgid="7084237356602625604">"Trabalho"</item> <item msgid="1112044410659011023">"Outros"</item> <item msgid="2374913952870110618">"Personalizado"</item> </string-array> <string-array name="postalAddressTypes"> - <item msgid="6880257626740047286">"Página inicial"</item> + <item msgid="6880257626740047286">"Residencial"</item> <item msgid="5629153956045109251">"Trabalho"</item> <item msgid="4966604264500343469">"Outros"</item> <item msgid="4932682847595299369">"Personalizado"</item> </string-array> <string-array name="imAddressTypes"> - <item msgid="1738585194601476694">"Página inicial"</item> + <item msgid="1738585194601476694">"Residencial"</item> <item msgid="1359644565647383708">"Trabalho"</item> <item msgid="7868549401053615677">"Outros"</item> <item msgid="3145118944639869809">"Personalizado"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Personalizado"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Residencial"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Celular"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Comercial"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Fax comercial"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax residencial"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Outros"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Retorno de chamada"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Carro"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Empresa (principal)"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Outro fax"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Rádio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Celular comercial"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager comercial"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistente"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Aniversário"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Data comemorativa"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Evento"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Personalizado"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Residencial"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Comercial"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Outros"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Celular"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Personalizado"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Residencial"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Comercial"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Outros"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Personalizado"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Residencial"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Comercial"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Outros"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Personalizado"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Comercial"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Outros"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Personalizado"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"por meio de <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Digite o código PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Código PIN incorreto!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Para desbloquear, pressione Menu e, em seguida, 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Tente novamente"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Carregando (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Carregado."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Conecte o seu carregador."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Sem cartão SIM."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Não há um cartão SIM no telefone."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Fazer login"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nome de usuário ou senha inválida."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Verificando..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Som ativado"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Som desativado"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Limpar"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Carregando..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Conecte o carregador"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"A bateria está ficando baixa:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> ou menos restante(s)."</string> <string name="battery_low_why" msgid="7279169609518386372">"Uso da bateria"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Falha no teste de fábrica"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"A ação FACTORY_TEST é suportada apenas para pacotes instalados em /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Deseja sair desta página?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Selecione OK para continuar ou Cancelar para permanecer na página atual."</string> <string name="save_password_label" msgid="6860261758665825069">"Confirmar"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Dica: toque duas vezes para aumentar e diminuir o zoom."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ler histórico e favoritos do Navegador"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Permite que o aplicativo leia todos os URLs visitados pelo Navegador e todos os favoritos do Navegador."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"gravar histórico e favoritos do Navegador"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Forçar fechamento"</string> <string name="report" msgid="4060218260984795706">"Informar"</string> <string name="wait" msgid="7147118217226317732">"Aguardar"</string> - <string name="debug" msgid="9103374629678531849">"Depurar"</string> <string name="sendText" msgid="5132506121645618310">"Selecione uma ação para o texto"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Volume da campainha"</string> <string name="volume_music" msgid="5421651157138628171">"Volume da mídia"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Tem certeza de que deseja formatar o cartão SD? Todos os dados no seu cartão serão perdidos."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formatar"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuração USB conectada"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Selecione para desativar a depuração USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Selecionar método de entrada"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Criar contato "\n"usando <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"selecionado"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"não selecionado"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Negar"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Autorização solicitada"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Solicitada a permissão"\n"para a conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Método de entrada"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Sincronizar"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Acessibilidade"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Papel de parede"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Alterar papel de parede"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Protocolo de encapsulamento ponto a ponto"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocolo de encapsulamento de camada 2"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"VPN L2TP/IPSec com base em chave pré-compartilhada"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"VPN L2TP/IPSec com base em certificado"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 373c45e000eb..0fa02dc0e80e 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Не удается получить доступ к файлу."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Не удалось найти указанные файлы."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Обрабатывается слишком много запросов. Повторите попытку позднее."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Ошибка входа (<xliff:g id="ACCOUNT">%1$s</xliff:g>)"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Синхр."</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Синхр."</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Слишком много удалений <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Отслеживание физического местоположения"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Сетевой обмен данными"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Позволяет приложениям получать доступ к различным сетевым функциям."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Ваши аккаунты"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Доступ к имеющимся аккаунтам."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Элементы управления аппаратным обеспечением"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Прямой доступ к аппаратному обеспечению телефона."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Телефонные вызовы"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Позволяет приложению запускать процесс отладки другого приложения. Вредоносные приложения могут использовать эту возможность для остановки других приложений."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"изменять настройки пользовательского интерфейса"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Позволяет приложению изменять текущую конфигурацию, например региональные настройки или размер шрифта."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"перезапускать другие приложения"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Позволяет приложению принудительно перезапускать другие приложения."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"принудительно закрывать приложения"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Позволяет приложению принудительно закрыть или вернуть в исходное состояние процессы, выполняемые в активном режиме. Не требуется для обычных приложений."</string> <string name="permlab_dump" msgid="1681799862438954752">"извлекать данные о внутреннем состоянии системы"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Позволяет приложению записывать новые слова в пользовательский словарь."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"изменять/удалять содержание SD-карты"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Разрешает приложению запись на SD-карту"</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Домашний"</item> <item msgid="869923650527136615">"Мобильный"</item> @@ -400,30 +407,30 @@ <item msgid="1735177144948329370">"Домашний факс"</item> <item msgid="603878674477207394">"Пейджер"</item> <item msgid="1650824275177931637">"Другой"</item> - <item msgid="9192514806975898961">"Особый"</item> + <item msgid="9192514806975898961">"Создать свой ярлык"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"Домашний"</item> + <item msgid="8073994352956129127">"Личный"</item> <item msgid="7084237356602625604">"Рабочий"</item> <item msgid="1112044410659011023">"Другой"</item> - <item msgid="2374913952870110618">"Особый"</item> + <item msgid="2374913952870110618">"Создать свой ярлык"</item> </string-array> <string-array name="postalAddressTypes"> <item msgid="6880257626740047286">"Домашний"</item> <item msgid="5629153956045109251">"Рабочий"</item> <item msgid="4966604264500343469">"Другой"</item> - <item msgid="4932682847595299369">"Особый"</item> + <item msgid="4932682847595299369">"Создать свой ярлык"</item> </string-array> <string-array name="imAddressTypes"> <item msgid="1738585194601476694">"Домашний"</item> <item msgid="1359644565647383708">"Рабочий"</item> <item msgid="7868549401053615677">"Другое"</item> - <item msgid="3145118944639869809">"Особый"</item> + <item msgid="3145118944639869809">"Создать свой ярлык"</item> </string-array> <string-array name="organizationTypes"> <item msgid="7546335612189115615">"Рабочий"</item> - <item msgid="4378074129049520373">"Другой"</item> - <item msgid="3455047468583965104">"Особый"</item> + <item msgid="4378074129049520373">"Другое"</item> + <item msgid="3455047468583965104">"Создать свой ярлык"</item> </string-array> <string-array name="imProtocols"> <item msgid="8595261363518459565">"AIM"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Создать свой ярлык"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Домашний"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Мобильный"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Рабочий"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Рабочий факс"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Домашний факс"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Пейджер"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Другой"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Обр. вызов"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"В авто"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Телефон офиса"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Основной"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Доп. факс"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Радио"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Телекс"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"Телетайп"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Рабочий мобильный"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Рабочий пейджер"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Секретарь"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"День рождения"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Юбилей"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Мероприятие"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Создать свой ярлык"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Личный"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Рабочий"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Другой"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Мобильный"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Создать свой ярлык"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Домашний"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Рабочий"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Другой"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Создать свой ярлык"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Домашний"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Рабочий"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Другой"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Создать свой ярлык"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Работа"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Другое"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Создать свой ярлык"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"с помощью <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> с помощью <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Введите PIN-код"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Неверный PIN-код!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Для разблокировки нажмите \"Меню\", а затем 0."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Повторите попытку"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Идет зарядка (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Заряжена."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Подключите зарядное устройство."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Нет SIM-карты."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"SIM-карта не установлена."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Вход"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Неверное имя пользователя или пароль."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Проверка..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Разблокировать"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Вкл. звук"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Откл. звук"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Очистить"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Идет зарядка..."</string> <string name="battery_low_title" msgid="7923774589611311406">"Подключите зарядное устройство"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Батарея разряжена:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"Осталось <xliff:g id="NUMBER">%d%%</xliff:g> или меньше."</string> <string name="battery_low_why" msgid="7279169609518386372">"Расход заряда батареи"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Не удалось провести стандартный тест"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Действие FACTORY_TEST поддерживается только для пакетов, установленных в /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Перейти с этой страницы?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Нажмите \"ОК\", чтобы продолжить, или \"Отмена\", чтобы остаться на текущей странице."</string> <string name="save_password_label" msgid="6860261758665825069">"Подтвердите"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Совет: нажмите дважды, чтобы увеличить и уменьшить масштаб."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"считывать историю и закладки браузера"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Разрешает приложению считывать все URL, посещенные браузером, и все его закладки."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"записывать историю и закладки браузера"</string> @@ -742,14 +697,13 @@ <string name="aerr_application" msgid="4683614104336409186">"Произошла неожиданная остановка приложения <xliff:g id="APPLICATION">%1$s</xliff:g> (процесс <xliff:g id="PROCESS">%2$s</xliff:g>). Повторите попытку."</string> <string name="aerr_process" msgid="1551785535966089511">"Произошла неожиданная остановка процесса <xliff:g id="PROCESS">%1$s</xliff:g>. Повторите попытку."</string> <string name="anr_title" msgid="3100070910664756057">"Извините!"</string> - <string name="anr_activity_application" msgid="3538242413112507636">"Действие <xliff:g id="ACTIVITY">%1$s</xliff:g> (в приложении <xliff:g id="APPLICATION">%2$s</xliff:g>) не отвечает."</string> - <string name="anr_activity_process" msgid="5420826626009561014">"Действие <xliff:g id="ACTIVITY">%1$s</xliff:g> (в процессе <xliff:g id="PROCESS">%2$s</xliff:g>) не отвечает."</string> + <string name="anr_activity_application" msgid="3538242413112507636">"<xliff:g id="ACTIVITY">%1$s</xliff:g> не отвечает (приложение: <xliff:g id="APPLICATION">%2$s</xliff:g>)."</string> + <string name="anr_activity_process" msgid="5420826626009561014">"Приложение <xliff:g id="ACTIVITY">%1$s</xliff:g> не отвечает (процесс: <xliff:g id="PROCESS">%2$s</xliff:g>)."</string> <string name="anr_application_process" msgid="4185842666452210193">"Приложение <xliff:g id="APPLICATION">%1$s</xliff:g> (в процессе <xliff:g id="PROCESS">%2$s</xliff:g>) не отвечает."</string> <string name="anr_process" msgid="1246866008169975783">"Процесс <xliff:g id="PROCESS">%1$s</xliff:g> не отвечает."</string> - <string name="force_close" msgid="3653416315450806396">"Принудительное закрытие"</string> + <string name="force_close" msgid="3653416315450806396">"Закрыть"</string> <string name="report" msgid="4060218260984795706">"Отчет"</string> - <string name="wait" msgid="7147118217226317732">"Подождите"</string> - <string name="debug" msgid="9103374629678531849">"Выполнить отладку"</string> + <string name="wait" msgid="7147118217226317732">"Подождать"</string> <string name="sendText" msgid="5132506121645618310">"Выберите действие для текста"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Громкость звонка"</string> <string name="volume_music" msgid="5421651157138628171">"Громкость мультимедиа"</string> @@ -802,11 +756,9 @@ <string name="extmedia_format_title" msgid="8663247929551095854">"Форматировать карту SD"</string> <string name="extmedia_format_message" msgid="3621369962433523619">"Отформатировать карту SD? Все данные, находящиеся на карте, будут уничтожены."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Формат"</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"Отладка USB подключена"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_title" msgid="6729044778949189918">"Отладка по USB разрешена"</string> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Нажмите, чтобы отключить отладку USB."</string> + <string name="select_input_method" msgid="6865512749462072765">"Выберите способ ввода"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"варианты"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Создать контакт"\n"с номером <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"отмечено"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"не проверено"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Разрешить"</string> <string name="deny" msgid="2081879885755434506">"Отклонить"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Разрешение запрошено"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Требуется разрешение"\n"для аккаунта <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Способ ввода"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Синхр."</string> - <string name="accessibility_binding_label" msgid="4148120742096474641">"Специальные возможности"</string> + <string name="accessibility_binding_label" msgid="4148120742096474641">"Спец. возможности"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Фоновый рисунок"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Изменить фоновый рисунок"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Протокол PPTP"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Протокол L2TP"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"L2TP/IPSec VPN (на основе предв. общ. ключа)"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"L2TP/IPSec VPN (на основе сертификата)"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index db77ee1a4846..313073f22b28 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Det gick inte att komma åt filen."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"Den begärda filen hittades inte."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"För många begäranden bearbetas. Försök igen senare."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"Inloggningsfel för <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Synkronisera"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Synkronisera"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"För många <xliff:g id="CONTENT_TYPE">%s</xliff:g>-borttagningar."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Övervaka din fysiska plats"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Nätverkskommunikation"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Tillåt att program kommer åt olika nätverksfunktioner."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Dina konton"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Få åtkomst till tillgängliga konton."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Kontroller för maskinvara"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Direkt åtkomst till maskinvara på handenheten."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Telefonsamtal"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Tillåter att ett program aktiverar felsökning för ett annat program. Skadliga program kan använda detta för att avsluta andra program."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"ändra dina gränssnittsinställningar"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Tillåter att ett program ändrar den aktuella konfigurationen, till exempel språk eller övergripande teckenformat."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"starta om andra program"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Tillåter att ett program framtvingar omstart av andra program."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"tvinga program att avsluta"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Tillåter att ett program tvingar en aktivitet som finns i förgrunden att avsluta och gå tillbaka. Behövs inte för vanliga program."</string> <string name="permlab_dump" msgid="1681799862438954752">"hämta systemets interna status"</string> @@ -319,7 +322,7 @@ <string name="permlab_callPrivileged" msgid="4198349211108497879">"ringa telefonnummer direkt"</string> <string name="permdesc_callPrivileged" msgid="244405067160028452">"Tillåter att programmet ringer ett telefonnummer, inklusive nödnummer, utan att du behöver göra något. Skadliga program kan ringa onödiga och olagliga samtal till räddningtjänsten."</string> <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"starta CDMA-telefoninställningar direkt"</string> - <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Tillåter att programmet startar CDMA-anslutning. Skadliga program kan skada CDMA-anslutningar i onödan."</string> + <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Tillåter att programmet startar CDMA-anslutning. Skadliga program kan starta CDMA-anslutningar i onödan."</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"styra meddelanden för platsuppdatering"</string> <string name="permdesc_locationUpdates" msgid="2300018303720930256">"Tillåter aktivering och inaktivering av avisering om platsuppdatering i radion. Används inte av vanliga program."</string> <string name="permlab_checkinProperties" msgid="7855259461268734914">"få åtkomst till incheckningsegenskaper"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Tillåter att ett program skriver in nya ord i användarordlistan."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"ändra/ta bort innehåll på SD-kortet"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Tillåter att ett program skriver till SD-kortet."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Hem"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -435,126 +442,73 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Anpassad"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Hem"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobil"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Arbete"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Arbetsfax"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Hemfax"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Personsökare"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Övrigt"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Återuppringning"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Bil"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Nummer till företag"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Telefonnummer"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Annat faxnummer"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobiltelefon, arbetet"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Personsökare, arbetet"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistent"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Födelsedag"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Högtidsdag"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Händelse"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Anpassad"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Hem"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Arbete"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Övrigt"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Anpassad"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Hem"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Arbete"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Övrigt"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Anpassad"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Hem"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Arbete"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Övrigt"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Anpassad"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Arbete"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Övrigt"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Anpassad"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Ange PIN-kod"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Fel PIN-kod!"</string> - <string name="keyguard_label_text" msgid="861796461028298424">"Tryck på Meny och sedan på 0 om du vill låsa upp."</string> + <string name="keyguard_label_text" msgid="861796461028298424">"Tryck på Menu och sedan på 0 om du vill låsa upp."</string> <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Nödsamtalsnummer"</string> <string name="lockscreen_carrier_default" msgid="8812714795156374435">"(Ingen tjänst)"</string> <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Skärmen har låsts."</string> - <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Tryck på Meny om du vill låsa upp eller ringa nödsamtal."</string> - <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Tryck på Meny om du vill låsa upp."</string> + <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Tryck på Menu om du vill låsa upp eller ringa nödsamtal."</string> + <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Tryck på Menu om du vill låsa upp."</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Rita grafiskt lösenord för att låsa upp"</string> <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Nödsamtal"</string> <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Korrekt!"</string> <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Försök igen"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Laddar (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Laddad."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Anslut din laddare."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Inget SIM-kort."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Inget SIM-kort i telefonen."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Logga in"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ogiltigt användarnamn eller lösenord."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrollerar ..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Lås upp"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Ljud på"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Ljud av"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Ta bort"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Laddar…"</string> <string name="battery_low_title" msgid="7923774589611311406">"Anslut laddaren"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Batteriet håller på att ta slut:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> eller mindre kvar."</string> <string name="battery_low_why" msgid="7279169609518386372">"Batteriförbrukning"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Det gick fel vid fabrikstestet"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Åtgärden FACTORY_TEST stöds endast för paket som har installerats i /system/app."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Vill du lämna den här den här sidan?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Tryck på OK om du vill fortsätta eller på Avbryt om du vill vara kvar på den aktuella sidan."</string> <string name="save_password_label" msgid="6860261758665825069">"Bekräfta"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"Tips! Dubbelklicka om du vill zooma in eller ut."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"läsa webbläsarhistorik och bokmärken"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Tillåter att program läser alla webbadresser som webbläsaren har öppnat och alla webbläsarens bokmärken."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"skriva webbläsarhistorik och bokmärken"</string> @@ -610,7 +565,7 @@ <string name="open_permission_deny" msgid="5661861460947222274">"Du har inte behörighet att öppna den här sidan."</string> <string name="text_copied" msgid="4985729524670131385">"Text har kopierats till urklipp."</string> <string name="more_item_label" msgid="4650918923083320495">"Mer"</string> - <string name="prepend_shortcut_label" msgid="2572214461676015642">"Meny+"</string> + <string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string> <string name="menu_space_shortcut_label" msgid="2410328639272162537">"utrymme"</string> <string name="menu_enter_shortcut_label" msgid="2743362785111309668">"retur"</string> <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"ta bort"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Tvinga fram en stängning"</string> <string name="report" msgid="4060218260984795706">"Rapportera"</string> <string name="wait" msgid="7147118217226317732">"Vänta"</string> - <string name="debug" msgid="9103374629678531849">"Felsökning"</string> <string name="sendText" msgid="5132506121645618310">"Välj en åtgärd för text"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Ringvolym"</string> <string name="volume_music" msgid="5421651157138628171">"Mediavolym"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"Vill du formatera SD-kortet? Alla data på ditt kort kommer att gå förlorade."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Format"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-felsökning ansluten"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"Välj att inaktivera USB-felsökning."</string> + <string name="select_input_method" msgid="6865512749462072765">"Välj indatametod"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidater"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"Skapa kontakt"\n"med <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"markerad"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"inte markerad"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"Tillåt"</string> <string name="deny" msgid="2081879885755434506">"Neka"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"Begärd behörighet"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"Behörighet krävs"\n"för kontot <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Indatametod"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synkronisera"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Tillgänglighet"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Bakgrund"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Ändra bakgrund"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Point-to-Point Tunneling Protocol"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Layer 2 Tunneling Protocol"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"I förväg delad L2TP/IPSec VPN-nyckel"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Certifikatsbaserad L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 503ad7d4e2c3..d7a02bc5d687 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"Dosyaya erişilemedi."</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"İstenen dosya bulunamadı."</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Çok fazla sayıda istek işleniyor. Daha sonra yeniden deneyin."</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"<xliff:g id="ACCOUNT">%1$s</xliff:g> hesabı için oturum açma hatası"</string> <string name="contentServiceSync" msgid="8353523060269335667">"Senk."</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Senk."</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Çok fazla <xliff:g id="CONTENT_TYPE">%s</xliff:g> silme var."</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"Fiziksel konumunuzu izleyin"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Ağ iletişimi"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"Uygulamaların çeşitli ağ özelliklerine erişmesine izin verir."</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"Hesaplarınız"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"Kullanılabilir hesaplara erişin."</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"Donanım denetimleri"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"Telefon donanımına doğrudan erişim."</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"Telefon çağrıları"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"Bir uygulamanın başka bir uygulama için hata ayıklamayı çalıştırmasına izin verir. Kötü amaçlı uygulamalar bu işlevi başka uygulamaları kapatmak için kullanabilir."</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"kullanıcı arayüzü ayarlarınızı değiştirin"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"Uygulamaların güncel yapılandırmayı; örneğin yerel ayarı veya genel yazı tipi boyutunu değiştirmesine izin verir."</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"diğer uygulamaları yeniden başlat"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"Uygulamaların başka uygulamaları zorla yeniden başlatmasına izin verir."</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"uygulamayı kapanmaya zorla"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"Uygulamaların, ön plandaki herhangi bir etkinliği kapanmaya ve arka plana geçmeye zorlamasına izin verir. Normal uygulamalarda hiçbir zaman gerekmemelidir."</string> <string name="permlab_dump" msgid="1681799862438954752">"sistemin dahili durumunu al"</string> @@ -314,9 +317,9 @@ <string name="permdesc_flashlight" msgid="6433045942283802309">"Uygulamaların flaş ışığını denetlemesine izin verir."</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"donanımı test et"</string> <string name="permdesc_hardware_test" msgid="3668894686500081699">"Uygulamanın donanım testi için çeşitli çevre birimlerini denetlemesine izin verir."</string> - <string name="permlab_callPhone" msgid="3925836347681847954">"telefon numaralarını doğrudan ara"</string> - <string name="permdesc_callPhone" msgid="3369867353692722456">"Uygulamanın müdahaleniz olmadan telefon numaralarını aramasına izin verir. Kötü amaçlı uygulamalar, telefon faturanızda beklenmedik görüşmeler çıkmasına neden olabilir. Bu işlev, uygulamanın acil numara aramasına izin vermez."</string> - <string name="permlab_callPrivileged" msgid="4198349211108497879">"herhangi bir telefon numarasını doğrudan ara"</string> + <string name="permlab_callPhone" msgid="3925836347681847954">"telefon numaralarına doğrudan çağrı yap"</string> + <string name="permdesc_callPhone" msgid="3369867353692722456">"Uygulamanın müdahaleniz olmadan telefon numaralarına çağrı yapmasına izin verir. Kötü amaçlı uygulamalar, telefon faturanızda beklenmedik görüşmeler çıkmasına neden olabilir. Bu işlev, uygulamanın acil numaralara çağrı yapmasına izin vermez."</string> + <string name="permlab_callPrivileged" msgid="4198349211108497879">"herhangi bir telefon numarasına doğrudan çağrı yap"</string> <string name="permdesc_callPrivileged" msgid="244405067160028452">"Uygulamanın, siz müdahale etmeden acil numaralar dahil herhangi bir numarayı aramasına izin verir. Kötü amaçlı uygulamalar acil servisleri gereksiz yere ve yasal olmayan şekilde arayabilir."</string> <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"CDMA telefon kurulumunu doğrudan başlat"</string> <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Uygulamaya CDMA hazırlığını başlatma izni verir. Kötü niyetli uygulamalar CDMA hazırlığını gereksiz yere başlatabilir"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"Uygulamaların kullanıcı sözlüğüne yeni kelimeler yazmasına izin verir."</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"SD kart içeriklerini değiştir/sil"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"Bir uygulamaya SD karta yazma izni verir."</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Ev"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Özel"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Ev"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobil"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"İş"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"İş Faksı"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Ev Faksı"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Çağrı cihazı"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Diğer"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Geri Arama"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Araç"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Şirket Merkezi"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Ana"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Diğer Faks"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Telsiz"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Teleks"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"İş Yeri Cep Telefonu"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"İş Yeri Çağrı Cihazı"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Yardımcı"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Doğum günü"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Yıldönümü"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"Etkinlik"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Özel"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Ev"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"İş"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Diğer"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Özel"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Ev"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"İş"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Diğer"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Özel"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Ev"</string> + <string name="imTypeWork" msgid="1371489290242433090">"İş"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Diğer"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Özel"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"İş"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Diğer"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Özel"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"<xliff:g id="SOURCE">%1$s</xliff:g> aracılığıyla"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="SOURCE">%2$s</xliff:g> ile <xliff:g id="DATE">%1$s</xliff:g> tarihinde"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN kodunu gir"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Yanlış PIN kodu!"</string> <string name="keyguard_label_text" msgid="861796461028298424">"Kilidi açmak için önce Menü\'ye, sonra 0\'a basın."</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Üzgünüz, lütfen yeniden deneyin"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"Şarj oluyor (<xliff:g id="PERCENT">%%</xliff:g><xliff:g id="NUMBER">%d</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Şarj oldu."</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Şarj cihazınızı bağlayın."</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"SIM kart yok."</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"Telefonda SIM kart yok."</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Oturum aç"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Geçersiz kullanıcı adı veya şifre."</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrol ediliyor..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Kilit Aç"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sesi aç"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Sesi kapat"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g> <xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g> <xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Temizle"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"Şarj oluyor…"</string> <string name="battery_low_title" msgid="7923774589611311406">"Lütfen şarj cihazını takın"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"Pil tükeniyor:"</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"<xliff:g id="NUMBER">%d%%</xliff:g> veya daha az kaldı."</string> <string name="battery_low_why" msgid="7279169609518386372">"Pil kullanımı"</string> <string name="factorytest_failed" msgid="5410270329114212041">"Fabrika testi yapılamadı"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"FACTORY_TEST işlemi yalnızca /system/app dizinine yüklenmiş paketler için desteklenir."</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Bu sayfadan ayrılıyor musunuz?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Devam etmek için Tamam\'ı, sayfada kalmak için İptal\'i tıklatın."</string> <string name="save_password_label" msgid="6860261758665825069">"Onayla"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"İpucu: Yakınlaştırmak ve uzaklaştırmak için iki kez hafifçe vurun."</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"Tarayıcı geçmişini ve favorileri oku"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Uygulamaya Tarayıcının ziyaret etmiş olduğu tüm URL\'leri ve Tarayıcının tüm favorilerini okuma izni verir."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"Tarayıcı geçmişini ve favorileri yaz"</string> @@ -713,7 +668,7 @@ <string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string> <string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string> <string name="selectAll" msgid="6876518925844129331">"Tümünü seç"</string> - <string name="selectText" msgid="3889149123626888637">"Metni seç"</string> + <string name="selectText" msgid="3889149123626888637">"Metin seç"</string> <string name="stopSelectingText" msgid="4157931463872320996">"Metin seçmeyi durdur"</string> <string name="cut" msgid="3092569408438626261">"Kes"</string> <string name="cutAll" msgid="2436383270024931639">"Tümünü kes"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"Kapanmaya zorla"</string> <string name="report" msgid="4060218260984795706">"Rapor"</string> <string name="wait" msgid="7147118217226317732">"Bekle"</string> - <string name="debug" msgid="9103374629678531849">"Hata ayıkla"</string> <string name="sendText" msgid="5132506121645618310">"Metin için bir işlem seçin"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Zil sesi düzeyi"</string> <string name="volume_music" msgid="5421651157138628171">"Medya ses düzeyi"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"SD kartı biçimlendirmek istediğinizden emin misiniz? Kartınızdaki tüm veriler yok olacak."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Biçimlendir"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB hata ayıklaması bağlandı"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"USB hata ayıklamasını devre dışı bırakmak için tıklayın."</string> + <string name="select_input_method" msgid="6865512749462072765">"Giriş yöntemini seç"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"adaylar"</u></string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"<xliff:g id="NUMBER">%s</xliff:g>"\n" ile kişi oluştur"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"seçildi"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"seçilmedi"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"İzin Ver"</string> <string name="deny" msgid="2081879885755434506">"Reddet"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"İzin İstendi"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"<xliff:g id="ACCOUNT">%s</xliff:g> hesabı için"\n"İzin İstendi"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Giriş yöntemi"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Senkronizasyon"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Erişebilirlik"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Duvar Kağıdı"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Duvar kağıdını değiştir"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"Noktadan Noktaya Tünel Protokolü Kuralları"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"Katman 2 Tünel Protokolü"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"L2TP/IPSec VPN temelli önceden paylaşılmış anahtar"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"L2TP/IPSec VPN temelli sertifika"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 474fffc92c72..3f3549b31373 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -35,32 +35,32 @@ <string name="serviceRegistered" msgid="6275019082598102493">"注册成功。"</string> <string name="serviceErased" msgid="1288584695297200972">"清除成功。"</string> <string name="passwordIncorrect" msgid="7612208839450128715">"密码不正确。"</string> - <string name="mmiComplete" msgid="8232527495411698359">"MMI 完成。"</string> + <string name="mmiComplete" msgid="8232527495411698359">"MMI 码已完成。"</string> <string name="badPin" msgid="5085454289896032547">"您输入的旧 PIN 不正确。"</string> - <string name="badPuk" msgid="5702522162746042460">"您输入的 PUK 不正确。"</string> + <string name="badPuk" msgid="5702522162746042460">"您输入的 PUK 码不正确。"</string> <string name="mismatchPin" msgid="3695902225843339274">"您输入的 PIN 码不一致。"</string> - <string name="invalidPin" msgid="3850018445187475377">"输入一个 4 至 8 位数的 PIN。"</string> - <string name="needPuk" msgid="919668385956251611">"您的 SIM 卡被 PUK 锁定。请输入 PUK 码进行解锁。"</string> - <string name="needPuk2" msgid="4526033371987193070">"输入 PUK2 以解锁 SIM 卡。"</string> - <string name="ClipMmi" msgid="6952821216480289285">"来电者信息"</string> - <string name="ClirMmi" msgid="7784673673446833091">"外拨者信息"</string> - <string name="CfMmi" msgid="5123218989141573515">"呼叫转接"</string> - <string name="CwMmi" msgid="9129678056795016867">"呼叫等待"</string> + <string name="invalidPin" msgid="3850018445187475377">"输入一个 4 至 8 位数的 PIN 码。"</string> + <string name="needPuk" msgid="919668385956251611">"已对 SIM 卡进行 PUK 码锁定。键入 PUK 码将其解锁。"</string> + <string name="needPuk2" msgid="4526033371987193070">"输入 PUK2 码以解锁 SIM 卡。"</string> + <string name="ClipMmi" msgid="6952821216480289285">"来电显示"</string> + <string name="ClirMmi" msgid="7784673673446833091">"本机号码"</string> + <string name="CfMmi" msgid="5123218989141573515">"来电转接"</string> + <string name="CwMmi" msgid="9129678056795016867">"来电等待"</string> <string name="BaMmi" msgid="455193067926770581">"呼叫限制"</string> <string name="PwdMmi" msgid="7043715687905254199">"密码更改"</string> <string name="PinMmi" msgid="3113117780361190304">"PIN 码更改"</string> - <string name="CnipMmi" msgid="3110534680557857162">"来电显示"</string> + <string name="CnipMmi" msgid="3110534680557857162">"显示号码"</string> <string name="CnirMmi" msgid="3062102121430548731">"来电显示受限制"</string> <string name="ThreeWCMmi" msgid="9051047170321190368">"三方通话"</string> <string name="RuacMmi" msgid="7827887459138308886">"拒绝不想接听的骚扰电话"</string> <string name="CndMmi" msgid="3116446237081575808">"主叫号码传送"</string> <string name="DndMmi" msgid="1265478932418334331">"请勿打扰"</string> - <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"来电者信息在默认情况下受限制。在下一次通话中：受限制"</string> - <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"来电者信息在默认情况受限制。在下一次通话中：不受限制"</string> - <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"来电者信息在默认情况下不受限制。在下一次通话中：受限制"</string> - <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"来电者信息在默认情况下不受限制。在下一次通话中：不受限制"</string> + <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"默认不显示本机号码，在下一次通话中也不显示"</string> + <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"默认不显示本机号码，但在下一次通话中显示"</string> + <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"默认显示本机号码，但在下一次通话中不显示"</string> + <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"默认显示本机号码，在下一次通话中也显示"</string> <string name="serviceNotProvisioned" msgid="8614830180508686666">"未提供服务。"</string> - <string name="CLIRPermanent" msgid="5460892159398802465">"无法更改来电者信息设置。"</string> + <string name="CLIRPermanent" msgid="5460892159398802465">"本机号码显示设置无法更改。"</string> <string name="RestrictedChangedTitle" msgid="5592189398956187498">"访问受限情况已发生变化"</string> <string name="RestrictedOnData" msgid="8653794784690065540">"数据服务已禁用。"</string> <string name="RestrictedOnEmergency" msgid="6581163779072833665">"紧急服务已禁用。"</string> @@ -72,7 +72,7 @@ <string name="serviceClassSMS" msgid="2015460373701527489">"短信"</string> <string name="serviceClassDataAsync" msgid="4523454783498551468">"异步"</string> <string name="serviceClassDataSync" msgid="7530000519646054776">"同步"</string> - <string name="serviceClassPacket" msgid="6991006557993423453">"封包"</string> + <string name="serviceClassPacket" msgid="6991006557993423453">"包"</string> <string name="serviceClassPAD" msgid="3235259085648271037">"PAD"</string> <string name="roamingText0" msgid="7170335472198694945">"启用漫游指示符"</string> <string name="roamingText1" msgid="5314861519752538922">"禁用漫游指示符"</string> @@ -90,29 +90,28 @@ <string name="roamingTextSearching" msgid="8360141885972279963">"正在搜索服务"</string> <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：无法转接"</string> <string name="cfTemplateForwarded" msgid="1302922117498590521">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：<xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> - <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：<xliff:g id="TIME_DELAY">{2}</xliff:g> 秒后拨打 <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> - <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：没有转接"</string> - <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：没有转接"</string> + <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：<xliff:g id="TIME_DELAY">{2}</xliff:g> 秒后<xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> + <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：无法转接"</string> + <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：无法转接"</string> <string name="fcComplete" msgid="3118848230966886575">"功能代码已拨完。"</string> <string name="fcError" msgid="3327560126588500777">"出现连接问题或功能代码无效。"</string> <string name="httpErrorOk" msgid="1191919378083472204">"确定"</string> - <string name="httpError" msgid="2567300624552921790">"网页包含错误。"</string> - <string name="httpErrorLookup" msgid="4517085806977851374">"找不到网址。"</string> + <string name="httpError" msgid="2567300624552921790">"此网页包含错误。"</string> + <string name="httpErrorLookup" msgid="4517085806977851374">"找不到该网址。"</string> <string name="httpErrorUnsupportedAuthScheme" msgid="2781440683514730227">"不支持此网站身份验证方案。"</string> <string name="httpErrorAuth" msgid="7293960746955020542">"身份验证失败。"</string> <string name="httpErrorProxyAuth" msgid="1788207010559081331">"通过代理服务器进行身份验证失败。"</string> <string name="httpErrorConnect" msgid="7623096283505770433">"未能连接到服务器。"</string> - <string name="httpErrorIO" msgid="5047872902739125260">"服务器无法通信，请稍后重试。"</string> + <string name="httpErrorIO" msgid="5047872902739125260">"服务器无法通讯，请稍后重试。"</string> <string name="httpErrorTimeout" msgid="4743403703762883954">"与服务器的连接超时。"</string> - <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"网页包含过多服务器重定向。"</string> + <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"该页面包含太多服务器重定向。"</string> <string name="httpErrorUnsupportedScheme" msgid="5257172771607996054">"不支持该协议。"</string> <string name="httpErrorFailedSslHandshake" msgid="3088290300440289771">"无法建立安全连接。"</string> <string name="httpErrorBadUrl" msgid="6088183159988619736">"网址无效，此网页无法打开。"</string> <string name="httpErrorFile" msgid="8250549644091165175">"无法访问该文件。"</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"找不到请求的文件。"</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"正在处理的请求太多，请稍后重试。"</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"<xliff:g id="ACCOUNT">%1$s</xliff:g> 发生登录错误"</string> <string name="contentServiceSync" msgid="8353523060269335667">"同步"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"同步"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"太多<xliff:g id="CONTENT_TYPE">%s</xliff:g>删除项。"</string> @@ -120,113 +119,117 @@ <string name="me" msgid="6545696007631404292">"我"</string> <string name="power_dialog" msgid="1319919075463988638">"手机选项"</string> <string name="silent_mode" msgid="7167703389802618663">"静音模式"</string> - <string name="turn_on_radio" msgid="3912793092339962371">"打开无线电"</string> - <string name="turn_off_radio" msgid="8198784949987062346">"关闭无线电"</string> + <string name="turn_on_radio" msgid="3912793092339962371">"打开收音机"</string> + <string name="turn_off_radio" msgid="8198784949987062346">"关闭收音机"</string> <string name="screen_lock" msgid="799094655496098153">"屏幕锁定"</string> <string name="power_off" msgid="4266614107412865048">"关机"</string> <string name="shutdown_progress" msgid="2281079257329981203">"正在关机..."</string> - <string name="shutdown_confirm" msgid="649792175242821353">"您的手机会关闭。"</string> - <string name="no_recent_tasks" msgid="279702952298056674">"无最近的应用程序。"</string> + <string name="shutdown_confirm" msgid="649792175242821353">"您的手机会关机。"</string> + <string name="no_recent_tasks" msgid="279702952298056674">"没有最近的应用程序。"</string> <string name="global_actions" msgid="2406416831541615258">"手机选项"</string> <string name="global_action_lock" msgid="2844945191792119712">"屏幕锁定"</string> <string name="global_action_power_off" msgid="4471879440839879722">"关机"</string> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"静音模式"</string> - <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"已关闭声音"</string> - <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"已打开声音"</string> + <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"声音已关闭"</string> + <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"声音已开启"</string> <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"飞行模式"</string> - <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"飞行模式已开启"</string> - <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"飞行模式已关闭"</string> + <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"已开启飞行模式"</string> + <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"已关闭飞行模式"</string> <string name="safeMode" msgid="2788228061547930246">"安全模式"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 系统"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"需要您付费的服务"</string> <string name="permgroupdesc_costMoney" msgid="8193824940620517189">"允许应用程序执行可能需要您付费的操作。"</string> - <string name="permgrouplab_messages" msgid="7521249148445456662">"您的消息"</string> - <string name="permgroupdesc_messages" msgid="7045736972019211994">"读/写短信、电子邮件和其他消息。"</string> + <string name="permgrouplab_messages" msgid="7521249148445456662">"您的信息"</string> + <string name="permgroupdesc_messages" msgid="7045736972019211994">"读写短信、电子邮件和其他信息。"</string> <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"您的个人信息"</string> <string name="permgroupdesc_personalInfo" msgid="5488050357388806068">"直接访问手机上存储的联系人和日历。"</string> <string name="permgrouplab_location" msgid="635149742436692049">"您的位置"</string> <string name="permgroupdesc_location" msgid="2430258821648348660">"监视您的物理位置"</string> - <string name="permgrouplab_network" msgid="5808983377727109831">"网络通信"</string> + <string name="permgrouplab_network" msgid="5808983377727109831">"网络通讯"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"允许应用程序访问各种网络功能。"</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> - <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"硬件控制"</string> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"您的帐户"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"访问可用的帐户。"</string> + <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"硬件控件"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"直接访问手机上的硬件。"</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"手机通话"</string> - <string name="permgroupdesc_phoneCalls" msgid="7489701620446183770">"监视、记录和处理电话。"</string> + <string name="permgroupdesc_phoneCalls" msgid="7489701620446183770">"监管、记录和处理电话呼叫。"</string> <string name="permgrouplab_systemTools" msgid="4652191644082714048">"系统工具"</string> - <string name="permgroupdesc_systemTools" msgid="8162102602190734305">"对系统的低级别访问和控制。"</string> + <string name="permgroupdesc_systemTools" msgid="8162102602190734305">"对系统进行低级访问和控制。"</string> <string name="permgrouplab_developmentTools" msgid="3446164584710596513">"开发工具"</string> - <string name="permgroupdesc_developmentTools" msgid="9056431193893809814">"只有应用程序开发人员需要这些功能。"</string> + <string name="permgroupdesc_developmentTools" msgid="9056431193893809814">"只有应用程序开发人员才会用到的功能。"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"存储"</string> <string name="permgroupdesc_storage" msgid="9203302214915355774">"访问 SD 卡。"</string> <string name="permlab_statusBar" msgid="7417192629601890791">"停用或修改状态栏"</string> - <string name="permdesc_statusBar" msgid="1365473595331989732">"允许应用程序停用状态栏，或者添加和删除系统图标。"</string> - <string name="permlab_expandStatusBar" msgid="1148198785937489264">"展开/折叠状态栏"</string> - <string name="permdesc_expandStatusBar" msgid="7088604400110768665">"允许应用程序展开或折叠状态栏。"</string> + <string name="permdesc_statusBar" msgid="1365473595331989732">"允许应用程序停用状态栏或者增删系统图标。"</string> + <string name="permlab_expandStatusBar" msgid="1148198785937489264">"展开/收拢状态栏"</string> + <string name="permdesc_expandStatusBar" msgid="7088604400110768665">"允许应用程序展开或收拢状态栏。"</string> <string name="permlab_processOutgoingCalls" msgid="1136262550878335980">"拦截外拨电话"</string> - <string name="permdesc_processOutgoingCalls" msgid="2228988201852654461">"允许应用程序处理外拨电话和更改要拨打的号码。恶意应用程序可借此监视、重定向或阻止外拨电话。"</string> + <string name="permdesc_processOutgoingCalls" msgid="2228988201852654461">"允许应用程序处理外拨电话或更改要拨打的号码。恶意应用程序可能会借此监视、另行转接甚至阻止外拨电话。"</string> <string name="permlab_receiveSms" msgid="2697628268086208535">"接收短信"</string> <string name="permdesc_receiveSms" msgid="6298292335965966117">"允许应用程序接收和处理短信。恶意应用程序可借此监视您的信息，或者将信息删除而不向您显示。"</string> <string name="permlab_receiveMms" msgid="8894700916188083287">"接收彩信"</string> <string name="permdesc_receiveMms" msgid="4563346832000174373">"允许应用程序接收和处理彩信。恶意应用程序可借此监视您的信息，或者将信息删除而不向您显示。"</string> <string name="permlab_sendSms" msgid="5600830612147671529">"发送短信"</string> - <string name="permdesc_sendSms" msgid="1946540351763502120">"允许应用程序发送短信。恶意应用程序可借此不经您的确认发送信息来让您付费。"</string> + <string name="permdesc_sendSms" msgid="1946540351763502120">"允许应用程序发送短信。恶意应用程序可能会不经您的确认就发送信息，给您带来费用。"</string> <string name="permlab_readSms" msgid="4085333708122372256">"读取短信或彩信"</string> <string name="permdesc_readSms" msgid="3002170087197294591">"允许应用程序读取您的手机或 SIM 卡中存储的短信。恶意应用程序可借此读取您的机密信息。"</string> <string name="permlab_writeSms" msgid="6881122575154940744">"编辑短信或彩信"</string> <string name="permdesc_writeSms" msgid="6299398896177548095">"允许应用程序写入手机或 SIM 卡中存储的短信。恶意应用程序可借此删除您的信息。"</string> <string name="permlab_receiveWapPush" msgid="8258226427716551388">"接收 WAP"</string> - <string name="permdesc_receiveWapPush" msgid="5979623826128082171">"允许应用程序接收和处理 WAP 消息。恶意应用程序可借此监视您的消息，或者将消息删除而不向您显示。"</string> + <string name="permdesc_receiveWapPush" msgid="5979623826128082171">"允许应用程序接收和处理 WAP 信息。恶意应用程序可借此监视您的信息，或者将信息删除而不向您显示。"</string> <string name="permlab_getTasks" msgid="5005277531132573353">"检索当前运行的应用程序"</string> - <string name="permdesc_getTasks" msgid="7048711358713443341">"允许应用程序检索有关当前和最近运行的任务的信息。恶意应用程序可借此发现有关其他应用程序的私有信息。"</string> + <string name="permdesc_getTasks" msgid="7048711358713443341">"允许应用程序检索有关当前和最近运行的任务的信息。恶意应用程序可借此发现有关其他应用程序的保密信息。"</string> <string name="permlab_reorderTasks" msgid="5669588525059921549">"对正在运行的应用程序重新排序"</string> - <string name="permdesc_reorderTasks" msgid="126252774270522835">"允许应用程序将任务移至前台和后台。恶意应用程序可借此强行进到前台，而不受您的控制。"</string> + <string name="permdesc_reorderTasks" msgid="126252774270522835">"允许应用程序将任务移至前端和后台。恶意应用程序可借此强行进入前端，而不受您的控制。"</string> <string name="permlab_setDebugApp" msgid="4339730312925176742">"启用应用程序调试"</string> <string name="permdesc_setDebugApp" msgid="5584310661711990702">"允许应用程序启动对其他应用程序的调试。恶意应用程序可借此终止其他应用程序。"</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"更改用户界面设置"</string> - <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"允许应用程序更改当前配置，例如语言区域或整体字号。"</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"重新启动其他应用程序"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"允许应用程序强行重新启动其他应用程序。"</string> - <string name="permlab_forceBack" msgid="1804196839880393631">"强行关闭应用程序"</string> - <string name="permdesc_forceBack" msgid="6534109744159919013">"允许应用程序强行关闭前台中的任何活动并返回。普通应用程序从不需要使用此权限。"</string> + <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"允许应用程序更改当前配置，例如语言设置或整体的字体大小。"</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> + <string name="permlab_forceBack" msgid="1804196839880393631">"强制应用程序关闭"</string> + <string name="permdesc_forceBack" msgid="6534109744159919013">"允许应用程序强制前端的任何活动关闭并重新开始。普通应用程序从不需要使用此权限。"</string> <string name="permlab_dump" msgid="1681799862438954752">"检索系统内部状态"</string> - <string name="permdesc_dump" msgid="2198776174276275220">"允许应用程序检索系统的内部状态。恶意应用程序可借此检索它们通常并不需要的各种私有信息和安全信息。"</string> + <string name="permdesc_dump" msgid="2198776174276275220">"允许应用程序检索系统的内部状态。恶意应用程序可借此检索它们本不需要的各种保密信息和安全信息。"</string> <string name="permlab_shutdown" msgid="7185747824038909016">"部分关机"</string> <string name="permdesc_shutdown" msgid="7046500838746291775">"使活动管理器进入关闭状态。不执行彻底关机。"</string> <string name="permlab_stopAppSwitches" msgid="4138608610717425573">"禁止切换应用程序"</string> <string name="permdesc_stopAppSwitches" msgid="3857886086919033794">"禁止用户切换到另一应用程序。"</string> <string name="permlab_runSetActivityWatcher" msgid="7811586187574696296">"监控所有应用程序的启动"</string> - <string name="permdesc_runSetActivityWatcher" msgid="3228701938345388092">"允许应用程序监控系统启动活动的方式。恶意应用程序可借此彻底损坏系统。这一权限只在开发过程中需要，普通的手机操作不需要。"</string> - <string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"发送已删除包的广播"</string> - <string name="permdesc_broadcastPackageRemoved" msgid="3453286591439891260">"允许应用程序广播已删除应用程序包的通知。恶意应用程序可借此终止任何正在运行的其他应用程序。"</string> - <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"发送可通过短信接收的广播"</string> + <string name="permdesc_runSetActivityWatcher" msgid="3228701938345388092">"允许应用程序监控系统启动活动的方式。恶意应用程序可借此彻底损坏系统。此权限仅在开发时才需要，普通的手机应用不需要。"</string> + <string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"发送包删除的广播"</string> + <string name="permdesc_broadcastPackageRemoved" msgid="3453286591439891260">"允许应用程序广播已删除某应用程序包的通知。恶意应用程序可借此终止任何正在运行的其他应用程序。"</string> + <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"发送短信收到的广播"</string> <string name="permdesc_broadcastSmsReceived" msgid="9122419277306740155">"允许应用程序广播已收到短信的通知。恶意应用程序可借此伪造收到的短信。"</string> - <string name="permlab_broadcastWapPush" msgid="3145347413028582371">"发送 WAP 一键接收广播"</string> - <string name="permdesc_broadcastWapPush" msgid="3955303669461378091">"允许应用程序广播收到 WAP 一键信息的通知。恶意应用程序可借此乱发彩信或暗中用恶意内容替换任意网页中的内容。"</string> + <string name="permlab_broadcastWapPush" msgid="3145347413028582371">"发送 WAP-PUSH 收到的广播"</string> + <string name="permdesc_broadcastWapPush" msgid="3955303669461378091">"允许应用程序播报收到 WAP PUSH 消息的通知。恶意应用程序可能会借此乱发彩信或暗中用恶意内容替换任意网页中的内容。"</string> <string name="permlab_setProcessLimit" msgid="2451873664363662666">"限制运行的进程个数"</string> - <string name="permdesc_setProcessLimit" msgid="7824786028557379539">"允许应用程序控制将运行的最大进程数。普通应用程序从不需要使用此权限。"</string> + <string name="permdesc_setProcessLimit" msgid="7824786028557379539">"允许应用程序控制将运行的进程数上限。普通应用程序从不需要使用此权限。"</string> <string name="permlab_setAlwaysFinish" msgid="5342837862439543783">"关闭所有后台应用程序"</string> <string name="permdesc_setAlwaysFinish" msgid="8773936403987091620">"允许应用程序控制活动是否始终是一转至后台就完成。普通应用程序从不需要使用此权限。"</string> <string name="permlab_batteryStats" msgid="7863923071360031652">"修改电池统计信息"</string> <string name="permdesc_batteryStats" msgid="5847319823772230560">"允许修改收集的电池使用情况统计信息。普通应用程序不能使用此权限。"</string> <string name="permlab_backup" msgid="470013022865453920">"控制系统备份和还原"</string> - <string name="permdesc_backup" msgid="4837493065154256525">"允许应用程序控制系统的备份和还原机制。不适用于普通应用程序。"</string> + <string name="permdesc_backup" msgid="4837493065154256525">"允许应用程序控制系统的备份和还原机制。普通应用程序不能使用此权限。"</string> <string name="permlab_backup_data" msgid="4057625941707926463">"备份与还原应用程序数据"</string> <string name="permdesc_backup_data" msgid="8274426305151227766">"允许应用程序参与系统的备份和还原机制。"</string> <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"显示未授权的窗口"</string> - <string name="permdesc_internalSystemWindow" msgid="5895082268284998469">"允许创建专供内部系统用户界面使用的窗口。普通应用程序不能使用此权限。"</string> + <string name="permdesc_internalSystemWindow" msgid="5895082268284998469">"允许创建专用于内部系统用户界面的窗口。普通应用程序不能使用此权限。"</string> <string name="permlab_systemAlertWindow" msgid="3372321942941168324">"显示系统级警报"</string> <string name="permdesc_systemAlertWindow" msgid="5109622689323490558">"允许应用程序显示系统警报窗口。恶意应用程序可借此掌控整个手机屏幕。"</string> <string name="permlab_setAnimationScale" msgid="2805103241153907174">"修改全局动画速度"</string> <string name="permdesc_setAnimationScale" msgid="7181522138912391988">"允许应用程序随时更改全局动画速度（加快或放慢动画）。"</string> <string name="permlab_manageAppTokens" msgid="17124341698093865">"管理应用程序令牌"</string> - <string name="permdesc_manageAppTokens" msgid="977127907524195988">"允许应用程序创建和管理自己的令牌，从而绕开正常的 Z 方向排序。普通应用程序从不需要使用此权限。"</string> + <string name="permdesc_manageAppTokens" msgid="977127907524195988">"允许应用程序创建和管理自己的令牌，从而绕开其常规的 Z 方向。普通应用程序从不需要使用此权限。"</string> <string name="permlab_injectEvents" msgid="1378746584023586600">"按键和控制按钮"</string> <string name="permdesc_injectEvents" msgid="3946098050410874715">"允许应用程序将其自己的输入活动（按键等）提供给其他应用程序。恶意应用程序可借此掌控手机。"</string> - <string name="permlab_readInputState" msgid="469428900041249234">"记录您输入的内容和采取的操作"</string> + <string name="permlab_readInputState" msgid="469428900041249234">"记录您键入的内容和执行的操作"</string> <string name="permdesc_readInputState" msgid="5132879321450325445">"允许应用程序查看您按的键，即使在与其他应用程序交互（例如输入密码）时也不例外。普通应用程序从不需要使用此权限。"</string> <string name="permlab_bindInputMethod" msgid="3360064620230515776">"绑定至输入法"</string> <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"允许手机用户绑定至输入法的顶级界面。普通应用程序从不需要使用此权限。"</string> @@ -235,33 +238,33 @@ <string name="permlab_setOrientation" msgid="3365947717163866844">"更改屏幕显示方向"</string> <string name="permdesc_setOrientation" msgid="6335814461615851863">"允许应用程序随时更改屏幕的旋转方向。普通应用程序从不需要使用此权限。"</string> <string name="permlab_signalPersistentProcesses" msgid="4255467255488653854">"向应用程序发送 Linux 信号"</string> - <string name="permdesc_signalPersistentProcesses" msgid="3565530463215015289">"允许应用程序请求将提供的信号发送给所有持续的进程。"</string> + <string name="permdesc_signalPersistentProcesses" msgid="3565530463215015289">"允许应用程序请求将所提供的信号发送给所有持久进程。"</string> <string name="permlab_persistentActivity" msgid="8659652042401085862">"让应用程序始终运行"</string> <string name="permdesc_persistentActivity" msgid="5037199778265006008">"允许应用程序部分持续运行，这样系统便不能将其用于其他应用程序。"</string> <string name="permlab_deletePackages" msgid="3343439331576348805">"删除应用程序"</string> <string name="permdesc_deletePackages" msgid="3634943677518723314">"允许应用程序删除 Android 包。恶意应用程序可借此删除重要的应用程序。"</string> <string name="permlab_clearAppUserData" msgid="2192134353540277878">"删除其他应用程序的数据"</string> <string name="permdesc_clearAppUserData" msgid="7546345080434325456">"允许应用程序清除用户数据。"</string> - <string name="permlab_deleteCacheFiles" msgid="1518556602634276725">"删除其他应用程序缓存"</string> + <string name="permlab_deleteCacheFiles" msgid="1518556602634276725">"删除其他应用程序的缓存"</string> <string name="permdesc_deleteCacheFiles" msgid="2283074077168165971">"允许应用程序删除缓存文件。"</string> <string name="permlab_getPackageSize" msgid="4799785352306641460">"计算应用程序存储空间"</string> <string name="permdesc_getPackageSize" msgid="5557253039670753437">"允许应用程序检索其代码、数据和缓存大小"</string> <string name="permlab_installPackages" msgid="335800214119051089">"直接安装应用程序"</string> - <string name="permdesc_installPackages" msgid="526669220850066132">"允许应用程序安装新的或更新的 Android 包。恶意应用程序可借此添加具有极大权限的新应用程序。"</string> + <string name="permdesc_installPackages" msgid="526669220850066132">"允许应用程序安装全新的或更新的 Android 包。恶意应用程序可能会借此添加其具有任意权限的新应用程序。"</string> <string name="permlab_clearAppCache" msgid="4747698311163766540">"删除所有应用程序缓存数据"</string> - <string name="permdesc_clearAppCache" msgid="7740465694193671402">"允许应用程序通过删除应用程序缓存目录中的文件释放手机内存。通常严格限制访问系统进程。"</string> + <string name="permdesc_clearAppCache" msgid="7740465694193671402">"允许应用程序通过删除应用程序缓存目录中的文件释放手机存储空间。通常此权限只适用于系统进程。"</string> <string name="permlab_readLogs" msgid="4811921703882532070">"读取系统日志文件"</string> - <string name="permdesc_readLogs" msgid="2257937955580475902">"允许应用程序读取系统的各日志文件。这样应用程序可以发现有关您操作手机的一般信息，但这些信息不应包含任何个人信息或私有信息。"</string> + <string name="permdesc_readLogs" msgid="2257937955580475902">"允许应用程序从系统的各日志文件中读取信息。这样应用程序可以发现您的手机使用情况，但这些信息不应包含任何个人信息或保密信息。"</string> <string name="permlab_diagnostic" msgid="8076743953908000342">"读取/写入诊断所拥有的资源"</string> - <string name="permdesc_diagnostic" msgid="3121238373951637049">"允许应用程序读取/写入诊断组所拥有的任何资源；例如，/dev 中的文件。这可能会影响系统稳定性和安全性。此权限只应由制造商或运营商用于硬件特定的诊断。"</string> + <string name="permdesc_diagnostic" msgid="3121238373951637049">"允许应用程序读取/写入诊断组所拥有的任何资源（例如，/dev 中的文件）。这可能会影响系统稳定性和安全性。此权限仅供制造商或运营商诊断硬件问题。"</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"启用或停用应用程序组件"</string> <string name="permdesc_changeComponentState" msgid="4569107043246700630">"允许应用程序更改是否启用其他应用程序的组件。恶意应用程序可借此停用重要的手机功能。使用此权限时务必谨慎，因为这可能导致应用程序组件进入不可用、不一致或不稳定的状态。"</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"设置首选应用程序"</string> - <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"允许应用程序修改首选的应用程序。这样恶意应用程序可能会暗中更改运行的应用程序，从而骗过您的现有应用程序来收集您的私有数据。"</string> + <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"允许应用程序修改首选的应用程序。这样恶意应用程序可能会暗中更改运行的应用程序，从而骗过您的现有应用程序来收集您的保密数据。"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"修改全局系统设置"</string> - <string name="permdesc_writeSettings" msgid="838789419871034696">"允许应用程序修改系统的设置数据。恶意应用程序可借此破坏您的系统配置。"</string> + <string name="permdesc_writeSettings" msgid="838789419871034696">"允许应用程序修改系统设置方面的数据。恶意应用程序可借此破坏您的系统配置。"</string> <string name="permlab_writeSecureSettings" msgid="204676251876718288">"修改安全系统设置"</string> - <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"允许应用程序修改系统的安全设置数据。不适用于普通应用程序。"</string> + <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"允许应用程序修改系统的安全设置数据。普通应用程序不能使用此权限。"</string> <string name="permlab_writeGservices" msgid="2149426664226152185">"修改 Google 服务地图"</string> <string name="permdesc_writeGservices" msgid="6602362746516676175">"允许应用程序修改 Google 服务地图。普通应用程序不能使用此权限。"</string> <string name="permlab_receiveBootCompleted" msgid="7776779842866993377">"开机时自动启动"</string> @@ -272,40 +275,40 @@ <string name="permdesc_readContacts" msgid="3371591512896545975">"允许应用程序读取您手机上存储的所有联系人（地址）数据。恶意应用程序可借此将您的数据发送给其他人。"</string> <string name="permlab_writeContacts" msgid="644616215860933284">"写入联系数据"</string> <string name="permdesc_writeContacts" msgid="3924383579108183601">"允许应用程序修改您手机上存储的联系人（地址）数据。恶意应用程序可借此清除或修改您的联系人数据。"</string> - <string name="permlab_writeOwnerData" msgid="4892555913849295393">"写入拥有者数据"</string> - <string name="permdesc_writeOwnerData" msgid="2344055317969787124">"允许应用程序修改您手机上存储的手机拥有者数据。恶意应用程序可借此清除或修改拥有者数据。"</string> - <string name="permlab_readOwnerData" msgid="6668525984731523563">"读取拥有者数据"</string> - <string name="permdesc_readOwnerData" msgid="3088486383128434507">"允许应用程序读取您手机上存储的手机拥有者数据。恶意应用程序可借此读取手机拥有者数据。"</string> + <string name="permlab_writeOwnerData" msgid="4892555913849295393">"写入所有者数据"</string> + <string name="permdesc_writeOwnerData" msgid="2344055317969787124">"允许应用程序修改您手机上存储的手机所有者数据。恶意应用程序可借此清除或修改所有者数据。"</string> + <string name="permlab_readOwnerData" msgid="6668525984731523563">"读取所有者数据"</string> + <string name="permdesc_readOwnerData" msgid="3088486383128434507">"允许应用程序读取您手机上存储的手机所有者数据。恶意应用程序可借此读取手机所有者数据。"</string> <string name="permlab_readCalendar" msgid="3728905909383989370">"读取日历数据"</string> <string name="permdesc_readCalendar" msgid="5533029139652095734">"允许应用程序读取您手机上存储的所有日历活动。恶意应用程序可借此将您的日历活动发送给其他人。"</string> <string name="permlab_writeCalendar" msgid="377926474603567214">"写入日历数据"</string> <string name="permdesc_writeCalendar" msgid="8674240662630003173">"允许应用程序修改您手机上存储的日历活动。恶意应用程序可借此清除或修改您的日历数据。"</string> - <string name="permlab_accessMockLocation" msgid="8688334974036823330">"禁止使用位置来源进行测试"</string> - <string name="permdesc_accessMockLocation" msgid="7648286063459727252">"创建用于测试的模拟位置源。恶意应用程序可借此替代真正的位置源（如 GPS 或网络提供商）返回的位置和/或状态。"</string> - <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"访问更多位置提供者的命令"</string> - <string name="permdesc_accessLocationExtraCommands" msgid="1948144701382451721">"访问额外的位置提供程序命令。恶意应用程序可借此干扰 GPS 或其他位置源的运作。"</string> - <string name="permlab_installLocationProvider" msgid="6578101199825193873">"安装位置信息提供程序"</string> - <string name="permdesc_installLocationProvider" msgid="5449175116732002106">"创建用于测试的模拟地点信息源。恶意应用程序可借此覆盖真正的地点信息源（如 GPS 或网络提供商）返回的地点和/或状态，或者监视您的地点并向外部信息源报告。"</string> - <string name="permlab_accessFineLocation" msgid="8116127007541369477">"精准位置 (GPS)"</string> - <string name="permdesc_accessFineLocation" msgid="7411213317434337331">"访问精准的位置源，例如手机上的全球定位系统（如果适用）。恶意应用程序可能借此确定您所处的位置，并消耗额外的电池电量。"</string> - <string name="permlab_accessCoarseLocation" msgid="4642255009181975828">"粗略位置（以网络为基础）"</string> - <string name="permdesc_accessCoarseLocation" msgid="8235655958070862293">"访问粗略的位置源（例如蜂窝网络数据库）以确定手机的大体位置（如果适用）。恶意应用程序可借此确定您所处的大体位置。"</string> + <string name="permlab_accessMockLocation" msgid="8688334974036823330">"使用模拟地点来源进行测试"</string> + <string name="permdesc_accessMockLocation" msgid="7648286063459727252">"创建模拟地点来源进行测试。恶意应用程序可能利用此选项覆盖由真实地点来源（如 GPS 或网络提供商）传回的地点和/或状态。"</string> + <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"访问额外的位置信息提供程序命令"</string> + <string name="permdesc_accessLocationExtraCommands" msgid="1948144701382451721">"访问额外的位置信息提供程序命令。恶意应用程序可借此干扰 GPS 或其他位置源的正常工作。"</string> + <string name="permlab_installLocationProvider" msgid="6578101199825193873">"允许安装位置信息提供程序"</string> + <string name="permdesc_installLocationProvider" msgid="5449175116732002106">"创建模拟地点来源进行测试。恶意应用程序可能利用此选项覆盖由真实地点来源（如 GPS 或网络提供商）所传回的地点和/或状态，或者监视您的位置并将其提供给外部来源。"</string> + <string name="permlab_accessFineLocation" msgid="8116127007541369477">"精准的(GPS)位置"</string> + <string name="permdesc_accessFineLocation" msgid="7411213317434337331">"访问精准的位置源，例如手机上的全球定位系统（如果有）。恶意应用程序可能会借此确定您所处的位置，并可能消耗额外的电池电量。"</string> + <string name="permlab_accessCoarseLocation" msgid="4642255009181975828">"（基于网络的）粗略位置"</string> + <string name="permdesc_accessCoarseLocation" msgid="8235655958070862293">"访问粗略的位置源（例如蜂窝网络数据库）以确定手机的大体位置（如果可以）。恶意应用程序可借此确定您所处的大体位置。"</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"访问 SurfaceFlinger"</string> <string name="permdesc_accessSurfaceFlinger" msgid="6805241830020733025">"允许应用程序使用 SurfaceFlinger 低级别功能。"</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"读取帧缓冲区"</string> <string name="permdesc_readFrameBuffer" msgid="7530020370469942528">"允许应用程序读取帧缓冲区中的内容。"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"更改您的音频设置"</string> - <string name="permdesc_modifyAudioSettings" msgid="5793461287365991922">"允许应用程序修改全局音频设置，如音量和路由。"</string> + <string name="permdesc_modifyAudioSettings" msgid="5793461287365991922">"允许应用程序修改整个系统的音频设置，如音量和路由。"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"录音"</string> <string name="permdesc_recordAudio" msgid="6493228261176552356">"允许应用程序访问录音路径。"</string> <string name="permlab_camera" msgid="8059288807274039014">"拍照"</string> - <string name="permdesc_camera" msgid="9013476258810982546">"允许应用程序使用相机拍照。此权限允许应用程序随时收集相机看到的图片。"</string> + <string name="permdesc_camera" msgid="9013476258810982546">"允许应用程序使用相机拍照，这样应用程序可随时收集进入相机镜头的图像。"</string> <string name="permlab_brick" msgid="8337817093326370537">"永久停用手机"</string> <string name="permdesc_brick" msgid="5569526552607599221">"允许应用程序永久停用整个手机，这非常危险。"</string> <string name="permlab_reboot" msgid="2898560872462638242">"强行重新启动手机"</string> <string name="permdesc_reboot" msgid="7914933292815491782">"允许应用程序强行重新启动手机。"</string> - <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"安装和卸载文件系统"</string> - <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"允许应用程序安装和卸载可移动存储器的文件系统。"</string> + <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"装载和卸载文件系统"</string> + <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"允许应用程序装载和卸载可移动存储器的文件系统。"</string> <string name="permlab_mount_format_filesystems" msgid="5523285143576718981">"格式化外部存储设备"</string> <string name="permdesc_mount_format_filesystems" msgid="574060044906047386">"允许应用程序格式化可移除的存储设备。"</string> <string name="permlab_vibrate" msgid="7768356019980849603">"控制振动器"</string> @@ -313,21 +316,21 @@ <string name="permlab_flashlight" msgid="2155920810121984215">"控制闪光灯"</string> <string name="permdesc_flashlight" msgid="6433045942283802309">"允许应用程序控制闪光灯。"</string> <string name="permlab_hardware_test" msgid="4148290860400659146">"测试硬件"</string> - <string name="permdesc_hardware_test" msgid="3668894686500081699">"允许应用程序控制各种用于硬件测试的外围设备。"</string> + <string name="permdesc_hardware_test" msgid="3668894686500081699">"允许应用程序控制各外围设备以进行硬件测试。"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"直接拨打电话号码"</string> - <string name="permdesc_callPhone" msgid="3369867353692722456">"允许应用程序在无人操作的情况下拨打电话。恶意应用程序可借此在您的话费单上产生意外通话费。请注意，此权限不允许应用程序拨打紧急电话。"</string> + <string name="permdesc_callPhone" msgid="3369867353692722456">"允许应用程序在您不介入的情况下拨打电话。恶意应用程序可借此在您的话费单上产生意外通话费。请注意，此权限不允许应用程序拨打紧急呼救电话。"</string> <string name="permlab_callPrivileged" msgid="4198349211108497879">"直接呼叫任何电话号码"</string> - <string name="permdesc_callPrivileged" msgid="244405067160028452">"允许应用程序在无人操作的情况下拨打任何电话（包括紧急电话）。恶意应用程序可借此向紧急服务拨打骚扰电话和非法电话。"</string> + <string name="permdesc_callPrivileged" msgid="244405067160028452">"允许应用程序在您不介入的情况下拨打任何电话（包括紧急呼救）。恶意应用程序可借此向应急服务机构拨打骚扰电话甚至非法电话。"</string> <string name="permlab_performCdmaProvisioning" msgid="5604848095315421425">"直接启动 CDMA 电话设置"</string> <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"允许应用程序启动 CDMA 服务。恶意应用程序可能会无端启动 CDMA 服务"</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"控制位置更新通知"</string> - <string name="permdesc_locationUpdates" msgid="2300018303720930256">"允许启用/停用收音机的位置更新通知。普通应用程序不能使用此权限。"</string> + <string name="permdesc_locationUpdates" msgid="2300018303720930256">"允许启用/停用来自收音机的位置更新通知。普通应用程序不能使用此权限。"</string> <string name="permlab_checkinProperties" msgid="7855259461268734914">"访问检入属性"</string> <string name="permdesc_checkinProperties" msgid="7150307006141883832">"允许对检入服务上传的属性进行读/写访问。普通应用程序不能使用此权限。"</string> <string name="permlab_bindGadget" msgid="776905339015863471">"选择窗口小部件"</string> - <string name="permdesc_bindGadget" msgid="2098697834497452046">"允许应用程序告诉系统哪个应用程序可以使用哪些窗口小部件。具有该权限的应用程序可以允许其他应用程序访问个人数据。普通应用程序不适合使用此权限。"</string> + <string name="permdesc_bindGadget" msgid="2098697834497452046">"允许应用程序告诉系统哪个应用程序可以使用哪些窗口小部件。具有该权限的应用程序可以允许其他应用程序访问个人数据。普通应用程序不能使用此权限。"</string> <string name="permlab_modifyPhoneState" msgid="8423923777659292228">"修改手机状态"</string> - <string name="permdesc_modifyPhoneState" msgid="3302284561346956587">"允许应用程序控制设备的手机功能。具有此权限的应用程序可切换网络、打开和关闭手机收音机等，而不通知您。"</string> + <string name="permdesc_modifyPhoneState" msgid="3302284561346956587">"允许应用程序控制设备的电话功能。拥有此权限的应用程序可自行切换网络、打开和关闭无线通信等，而不会通知您。"</string> <string name="permlab_readPhoneState" msgid="2326172951448691631">"读取手机状态和身份"</string> <string name="permdesc_readPhoneState" msgid="188877305147626781">"允许应用程序访问设备的手机功能。有此权限的应用程序可确定此手机的号码和序列号，是否正在通话，以及对方的号码等。"</string> <string name="permlab_wakeLock" msgid="573480187941496130">"防止手机休眠"</string> @@ -335,13 +338,13 @@ <string name="permlab_devicePower" msgid="4928622470980943206">"开机或关机"</string> <string name="permdesc_devicePower" msgid="4577331933252444818">"允许应用程序打开或关闭手机。"</string> <string name="permlab_factoryTest" msgid="3715225492696416187">"在出厂测试模式下运行"</string> - <string name="permdesc_factoryTest" msgid="8136644990319244802">"作为低级别制造商测试运行，以允许完全访问手机硬件。此权限只有当手机在制造商测试模式下运行时才可用。"</string> + <string name="permdesc_factoryTest" msgid="8136644990319244802">"作为一项低级制造商测试来运行，从而允许对手机硬件进行完全访问。此权限仅当手机在制造商测试模式下运行时才可用。。"</string> <string name="permlab_setWallpaper" msgid="6627192333373465143">"设置壁纸"</string> <string name="permdesc_setWallpaper" msgid="6417041752170585837">"允许应用程序设置系统壁纸。"</string> - <string name="permlab_setWallpaperHints" msgid="3600721069353106851">"设置壁纸大小提示"</string> - <string name="permdesc_setWallpaperHints" msgid="6019479164008079626">"允许应用程序设置系统壁纸大小提示。"</string> - <string name="permlab_masterClear" msgid="2315750423139697397">"将系统重置为出厂时的默认设置"</string> - <string name="permdesc_masterClear" msgid="5033465107545174514">"允许应用程序将系统完全重置为出厂设置，即清除所有数据、配置和安装的应用程序。"</string> + <string name="permlab_setWallpaperHints" msgid="3600721069353106851">"设置有关壁纸大小的提示"</string> + <string name="permdesc_setWallpaperHints" msgid="6019479164008079626">"允许应用程序设置有关壁纸大小的提示。"</string> + <string name="permlab_masterClear" msgid="2315750423139697397">"将系统恢复为出厂设置"</string> + <string name="permdesc_masterClear" msgid="5033465107545174514">"允许应用程序将系统恢复为出厂设置，即清除所有数据、配置以及所安装的应用程序。"</string> <string name="permlab_setTimeZone" msgid="2945079801013077340">"设置时区"</string> <string name="permdesc_setTimeZone" msgid="1902540227418179364">"允许应用程序更改手机的时区。"</string> <string name="permlab_accountManagerService" msgid="4829262349691386986">"作为 AccountManagerService"</string> @@ -356,12 +359,12 @@ <string name="permdesc_useCredentials" msgid="7416570544619546974">"允许应用程序请求身份验证标记。"</string> <string name="permlab_accessNetworkState" msgid="6865575199464405769">"查看网络状态"</string> <string name="permdesc_accessNetworkState" msgid="558721128707712766">"允许应用程序查看所有网络的状态。"</string> - <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"完全访问互联网"</string> + <string name="permlab_createNetworkSockets" msgid="9121633680349549585">"完全的互联网访问权限"</string> <string name="permdesc_createNetworkSockets" msgid="4593339106921772192">"允许应用程序创建网络套接字。"</string> - <string name="permlab_writeApnSettings" msgid="7823599210086622545">"写入接入点名称设置"</string> + <string name="permlab_writeApnSettings" msgid="7823599210086622545">"写入“接入点名称”设置"</string> <string name="permdesc_writeApnSettings" msgid="7443433457842966680">"允许应用程序修改 APN 设置，例如任何 APN 的代理和端口。"</string> - <string name="permlab_changeNetworkState" msgid="958884291454327309">"更改网络连接"</string> - <string name="permdesc_changeNetworkState" msgid="6278115726355634395">"允许应用程序更改网络连接状态。"</string> + <string name="permlab_changeNetworkState" msgid="958884291454327309">"更改网络连接性"</string> + <string name="permdesc_changeNetworkState" msgid="6278115726355634395">"允许应用程序更改状态网络连接性。"</string> <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"更改背景数据使用设置"</string> <string name="permdesc_changeBackgroundDataSetting" msgid="1001482853266638864">"允许应用程序更改背景数据使用设置。"</string> <string name="permlab_accessWifiState" msgid="8100926650211034400">"查看 Wi-Fi 状态"</string> @@ -371,15 +374,15 @@ <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"允许接收 Wi-Fi 多播"</string> <string name="permdesc_changeWifiMulticastState" msgid="8199464507656067553">"允许应用程序接收并非直接向您的设备发送的数据包。这样在查找附近提供的服务时很有用。这种操作所耗电量大于非多播模式。"</string> <string name="permlab_bluetoothAdmin" msgid="1092209628459341292">"蓝牙管理"</string> - <string name="permdesc_bluetoothAdmin" msgid="7256289774667054555">"允许应用程序配置本地蓝牙手机，以及查找远程设备并与之配对。"</string> + <string name="permdesc_bluetoothAdmin" msgid="7256289774667054555">"允许应用程序配置本地蓝牙手机，以及发现远程设备并与其配对。"</string> <string name="permlab_bluetooth" msgid="8361038707857018732">"创建蓝牙连接"</string> - <string name="permdesc_bluetooth" msgid="762515380679392945">"允许应用程序查看本地蓝牙手机的配置，以及建立和接受与配对设备的连接。"</string> + <string name="permdesc_bluetooth" msgid="762515380679392945">"允许应用程序查看本地蓝牙手机的配置，以及建立或接受与配对设备的连接。"</string> <string name="permlab_disableKeyguard" msgid="4977406164311535092">"停用键锁"</string> - <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"允许应用程序停用键锁和任何关联的密码安全设置。这种情况的一个恰当示例就是这样一个手机：在接听来电时停用键锁，在通话结束后重新启用键锁。"</string> + <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"允许应用程序停用键锁和任何关联的密码安全设置。例如，在手机上接听电话时停用键锁，在通话结束后重新启用键锁。"</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"读取同步设置"</string> - <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"允许应用程序读取同步设置，例如是否针对联系人启用同步。"</string> + <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"允许应用程序读取同步设置，例如是否为“联系人”启用同步。"</string> <string name="permlab_writeSyncSettings" msgid="6297138566442486462">"写入同步设置"</string> - <string name="permdesc_writeSyncSettings" msgid="2498201614431360044">"允许应用程序修改同步设置，例如是否针对联系人启用同步。"</string> + <string name="permdesc_writeSyncSettings" msgid="2498201614431360044">"允许应用程序修改同步设置，例如是否为“联系人”启用同步。"</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"读取同步统计信息"</string> <string name="permdesc_readSyncStats" msgid="7511448343374465000">"允许应用程序读取同步统计信息；例如已发生的同步历史记录。"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"读取订阅的供稿"</string> @@ -392,21 +395,25 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"允许应用程序向用户词典中写入新词。"</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"修改/删除 SD 卡内容"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"允许应用程序写入 SD 卡。"</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> - <item msgid="8901098336658710359">"住宅电话"</item> + <item msgid="8901098336658710359">"住宅"</item> <item msgid="869923650527136615">"手机"</item> <item msgid="7897544654242874543">"单位电话"</item> <item msgid="1103601433382158155">"单位传真"</item> <item msgid="1735177144948329370">"住宅传真"</item> <item msgid="603878674477207394">"寻呼机"</item> - <item msgid="1650824275177931637">"其他电话"</item> - <item msgid="9192514806975898961">"自定义电话"</item> + <item msgid="1650824275177931637">"其他"</item> + <item msgid="9192514806975898961">"自定义"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"主要邮箱"</item> - <item msgid="7084237356602625604">"单位邮箱"</item> - <item msgid="1112044410659011023">"其他邮箱"</item> - <item msgid="2374913952870110618">"自定义邮箱"</item> + <item msgid="8073994352956129127">"家庭"</item> + <item msgid="7084237356602625604">"单位"</item> + <item msgid="1112044410659011023">"其他"</item> + <item msgid="2374913952870110618">"自定义"</item> </string-array> <string-array name="postalAddressTypes"> <item msgid="6880257626740047286">"住宅"</item> @@ -415,15 +422,15 @@ <item msgid="4932682847595299369">"自定义"</item> </string-array> <string-array name="imAddressTypes"> - <item msgid="1738585194601476694">"住宅聊天工具"</item> - <item msgid="1359644565647383708">"单位聊天工具"</item> - <item msgid="7868549401053615677">"其他聊天工具"</item> - <item msgid="3145118944639869809">"自定义聊天工具"</item> + <item msgid="1738585194601476694">"住宅"</item> + <item msgid="1359644565647383708">"单位"</item> + <item msgid="7868549401053615677">"其他"</item> + <item msgid="3145118944639869809">"自定义"</item> </string-array> <string-array name="organizationTypes"> <item msgid="7546335612189115615">"单位"</item> - <item msgid="4378074129049520373">"其他组织"</item> - <item msgid="3455047468583965104">"自定义组织"</item> + <item msgid="4378074129049520373">"其他"</item> + <item msgid="3455047468583965104">"自定义"</item> </string-array> <string-array name="imProtocols"> <item msgid="8595261363518459565">"AIM"</item> @@ -435,180 +442,128 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"自定义"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"住宅"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"手机"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"单位"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"单位传真"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"住宅传真"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"寻呼机"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"其他"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"回拨号码"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"车载电话"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"公司总机"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"总机"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"其他传真"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"无线装置"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"电报"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"单位手机"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"单位寻呼机"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"助理"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"彩信"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"生日"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"周年纪念"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"活动"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"自定义"</string> + <string name="emailTypeHome" msgid="449227236140433919">"住宅"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"单位"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"其他"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"手机"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"自定义"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"住宅"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"单位"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"其他"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"自定义"</string> + <string name="imTypeHome" msgid="6241181032954263892">"住宅"</string> + <string name="imTypeWork" msgid="1371489290242433090">"单位"</string> + <string name="imTypeOther" msgid="5377007495735915478">"其他"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"自定义"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"雅虎"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"公司"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"其他"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"自定义"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"通过 <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"时间：<xliff:g id="DATE">%1$s</xliff:g>，方式：<xliff:g id="SOURCE">%2$s</xliff:g>"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"输入 PIN 码"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN 码不正确！"</string> <string name="keyguard_label_text" msgid="861796461028298424">"要解锁，请先按 MENU 再按 0。"</string> - <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"紧急电话号码"</string> + <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"急救或报警电话"</string> <string name="lockscreen_carrier_default" msgid="8812714795156374435">"（无服务）"</string> <string name="lockscreen_screen_locked" msgid="7288443074806832904">"屏幕已锁定。"</string> - <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"按 MENU 解锁或拨打紧急电话。"</string> + <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"按 Menu 解锁或进行紧急呼救。"</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"按 MENU 解锁。"</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"绘制解锁图案"</string> - <string name="lockscreen_emergency_call" msgid="5347633784401285225">"紧急呼叫"</string> + <string name="lockscreen_emergency_call" msgid="5347633784401285225">"紧急呼救"</string> <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"正确！"</string> <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"很抱歉，请重试"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"正在充电 (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"已充满。"</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"连接您的充电器。"</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"没有 SIM 卡"</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"手机中无 SIM 卡"</string> <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"请插入 SIM 卡"</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"网络已锁定"</string> - <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM 卡被 PUK 锁定"</string> + <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM 卡已用 PUK 码锁定"</string> <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"请参阅《用户指南》或联系客服人员。"</string> <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM 卡被锁定"</string> <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"正在解锁 SIM 卡..."</string> - <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="3514742106066877476">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地绘制了解锁图案。"\n\n"请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string> - <string name="lockscreen_failed_attempts_almost_glogin" msgid="3351013842320127827">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地绘制了解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统会要求您使用自己的 Google 登录信息解锁手机。"\n\n"请在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒后重试。"</string> + <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="3514742106066877476">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次绘错了自己的解锁图案。"\n\n"请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string> + <string name="lockscreen_failed_attempts_almost_glogin" msgid="3351013842320127827">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次绘错了自己的解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统会要求您使用自己的 Google 登录信息解锁手机。"\n\n"请在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒后重试。"</string> <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"<xliff:g id="NUMBER">%d</xliff:g> 秒后重试。"</string> <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"忘记了图案？"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"帐户解锁"</string> - <string name="lockscreen_glogin_too_many_attempts" msgid="2446246026221678244">"图案尝试次数过多！"</string> + <string name="lockscreen_glogin_too_many_attempts" msgid="2446246026221678244">"图案尝试次数太多！"</string> <string name="lockscreen_glogin_instructions" msgid="1816635201812207709">"要解除锁定，请使用您的 Google 帐户登录"</string> <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"用户名（电子邮件）"</string> <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"密码"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"登录"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"用户名或密码无效。"</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"正在检查..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"解锁"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"打开声音"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"关闭声音"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="AMPM">%P</xliff:g><xliff:g id="HOUR">%-l</xliff:g>点"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="AMPM">%p</xliff:g><xliff:g id="HOUR">%-l</xliff:g>点"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"清除"</string> <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"无通知"</string> - <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"正在进行"</string> + <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"正在进行的"</string> <string name="status_bar_latest_events_title" msgid="6594767438577593172">"通知"</string> <string name="battery_status_text_percent_format" msgid="7660311274698797147">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="battery_status_charging" msgid="756617993998772213">"正在充电..."</string> <string name="battery_low_title" msgid="7923774589611311406">"请连接充电器"</string> - <string name="battery_low_subtitle" msgid="7388781709819722764">"电量在减少："</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_subtitle" msgid="7388781709819722764">"电量所剩不多："</string> + <string name="battery_low_percent_format" msgid="696154104579022959">"电量剩余 <xliff:g id="NUMBER">%d%%</xliff:g> 或更少。"</string> <string name="battery_low_why" msgid="7279169609518386372">"电量使用情况"</string> <string name="factorytest_failed" msgid="5410270329114212041">"出厂测试失败"</string> - <string name="factorytest_not_system" msgid="4435201656767276723">"只有 /system/app 中安装的包支持 FACTORY_TEST 操作。"</string> + <string name="factorytest_not_system" msgid="4435201656767276723">"只有在 /system/app 中安装的包支持 FACTORY_TEST 操作。"</string> <string name="factorytest_no_action" msgid="872991874799998561">"未发现支持 FACTORY_TEST 操作的包。"</string> <string name="factorytest_reboot" msgid="6320168203050791643">"重新启动"</string> <string name="js_dialog_title" msgid="8143918455087008109">"“<xliff:g id="TITLE">%s</xliff:g>”处的页面表明："</string> <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"是否从该页面导航至它处？"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"选择“确定”继续，或选择“取消”留在当前页面。"</string> <string name="save_password_label" msgid="6860261758665825069">"确认"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"提示：点按两次可放大和缩小。"</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"读取浏览器的历史记录和书签"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"允许应用程序读取用浏览器访问过的所有网址，以及浏览器的所有书签。"</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"写入浏览器的历史记录和书签"</string> <string name="permdesc_writeHistoryBookmarks" msgid="945571990357114950">"允许应用程序修改存储在手机中的浏览器历史记录或书签。恶意应用程序可借此清除或修改浏览器数据。"</string> <string name="save_password_message" msgid="767344687139195790">"是否希望浏览器记住此密码？"</string> - <string name="save_password_notnow" msgid="6389675316706699758">"此时不保存密码"</string> + <string name="save_password_notnow" msgid="6389675316706699758">"暂不保存"</string> <string name="save_password_remember" msgid="6491879678996749466">"记住"</string> <string name="save_password_never" msgid="8274330296785855105">"从不"</string> <string name="open_permission_deny" msgid="5661861460947222274">"您无权打开此网页。"</string> - <string name="text_copied" msgid="4985729524670131385">"文字已复制到剪贴板。"</string> + <string name="text_copied" msgid="4985729524670131385">"文本已复制到剪贴板。"</string> <string name="more_item_label" msgid="4650918923083320495">"更多"</string> <string name="prepend_shortcut_label" msgid="2572214461676015642">"MENU+"</string> <string name="menu_space_shortcut_label" msgid="2410328639272162537">"空格"</string> @@ -724,8 +679,8 @@ <string name="inputMethod" msgid="1653630062304567879">"输入法"</string> <string name="addToDictionary" msgid="8793624991686948709">"将“<xliff:g id="WORD">%s</xliff:g>”添加到词典"</string> <string name="editTextMenuTitle" msgid="1672989176958581452">"编辑文字"</string> - <string name="low_internal_storage_view_title" msgid="1399732408701697546">"空间不足"</string> - <string name="low_internal_storage_view_text" msgid="635106544616378836">"手机内存空间正在减少。"</string> + <string name="low_internal_storage_view_title" msgid="1399732408701697546">"存储空间不足"</string> + <string name="low_internal_storage_view_text" msgid="635106544616378836">"手机内存空间所剩不多了。"</string> <string name="ok" msgid="5970060430562524910">"确定"</string> <string name="cancel" msgid="6442560571259935130">"取消"</string> <string name="yes" msgid="5362982303337969312">"确定"</string> @@ -735,25 +690,24 @@ <string name="capital_off" msgid="6815870386972805832">"关闭"</string> <string name="whichApplication" msgid="4533185947064773386">"使用以下方式发送"</string> <string name="alwaysUse" msgid="4583018368000610438">"默认使用此方式发送。"</string> - <string name="clearDefaultHintMsg" msgid="4815455344600932173">"清除“主屏幕设置”>“应用程序”>“管理应用程序”中的默认设置。"</string> + <string name="clearDefaultHintMsg" msgid="4815455344600932173">"通过主屏幕上的“设置”>“应用程序”>“管理应用程序”清除默认设置。"</string> <string name="chooseActivity" msgid="1009246475582238425">"选择一项操作"</string> <string name="noApplications" msgid="1691104391758345586">"没有应用程序可执行此操作。"</string> <string name="aerr_title" msgid="653922989522758100">"很抱歉！"</string> - <string name="aerr_application" msgid="4683614104336409186">"<xliff:g id="APPLICATION">%1$s</xliff:g>应用程序（<xliff:g id="PROCESS">%2$s</xliff:g> 进程）意外停止，请重试。"</string> - <string name="aerr_process" msgid="1551785535966089511">"<xliff:g id="PROCESS">%1$s</xliff:g> 进程意外停止，请重试。"</string> + <string name="aerr_application" msgid="4683614104336409186">"“<xliff:g id="APPLICATION">%1$s</xliff:g>”应用程序（在“<xliff:g id="PROCESS">%2$s</xliff:g>”进程中）意外停止，请重试。"</string> + <string name="aerr_process" msgid="1551785535966089511">"“<xliff:g id="PROCESS">%1$s</xliff:g>”进程意外停止，请重试。"</string> <string name="anr_title" msgid="3100070910664756057">"很抱歉！"</string> - <string name="anr_activity_application" msgid="3538242413112507636">"<xliff:g id="ACTIVITY">%1$s</xliff:g>活动（在<xliff:g id="APPLICATION">%2$s</xliff:g>应用程序中）无响应。"</string> - <string name="anr_activity_process" msgid="5420826626009561014">"<xliff:g id="ACTIVITY">%1$s</xliff:g>活动（在 <xliff:g id="PROCESS">%2$s</xliff:g> 进程中）无响应。"</string> - <string name="anr_application_process" msgid="4185842666452210193">"<xliff:g id="APPLICATION">%1$s</xliff:g>应用程序（在 <xliff:g id="PROCESS">%2$s</xliff:g> 进程中）无响应。"</string> - <string name="anr_process" msgid="1246866008169975783">"<xliff:g id="PROCESS">%1$s</xliff:g> 进程无响应。"</string> + <string name="anr_activity_application" msgid="3538242413112507636">"“<xliff:g id="ACTIVITY">%1$s</xliff:g>”活动（在“<xliff:g id="APPLICATION">%2$s</xliff:g>”应用程序中）无响应。"</string> + <string name="anr_activity_process" msgid="5420826626009561014">"“<xliff:g id="ACTIVITY">%1$s</xliff:g>”活动（在“<xliff:g id="PROCESS">%2$s</xliff:g>”进程中）无响应。"</string> + <string name="anr_application_process" msgid="4185842666452210193">"“<xliff:g id="APPLICATION">%1$s</xliff:g>”应用程序（在“<xliff:g id="PROCESS">%2$s</xliff:g>”进程中）无响应。"</string> + <string name="anr_process" msgid="1246866008169975783">"“<xliff:g id="PROCESS">%1$s</xliff:g>”进程无响应。"</string> <string name="force_close" msgid="3653416315450806396">"强行关闭"</string> <string name="report" msgid="4060218260984795706">"报告"</string> <string name="wait" msgid="7147118217226317732">"等待"</string> - <string name="debug" msgid="9103374629678531849">"调试"</string> <string name="sendText" msgid="5132506121645618310">"选择要对文字执行的操作"</string> <string name="volume_ringtone" msgid="6885421406845734650">"铃声音量"</string> <string name="volume_music" msgid="5421651157138628171">"媒体音量"</string> - <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"通过蓝牙播放"</string> + <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"正通过蓝牙播放"</string> <string name="volume_music_hint_silent_ringtone_selected" msgid="6158339745293431194">"选择的是静音铃声"</string> <string name="volume_call" msgid="3941680041282788711">"通话音量"</string> <string name="volume_bluetooth_call" msgid="2002891926351151534">"使用蓝牙时的通话音量"</string> @@ -786,12 +740,12 @@ <string name="perms_show_all" msgid="2671791163933091180"><b>"全部显示"</b></string> <string name="googlewebcontenthelper_loading" msgid="4722128368651947186">"正在载入..."</string> <string name="usb_storage_title" msgid="5901459041398751495">"USB 已连接"</string> - <string name="usb_storage_message" msgid="2759542180575016871">"您已通过 USB 将手机连接至计算机。如果要在计算机和手机的 SD 卡之间复制文件，请选择“安装”。"</string> - <string name="usb_storage_button_mount" msgid="8063426289195405456">"安装"</string> - <string name="usb_storage_button_unmount" msgid="6092146330053864766">"不安装"</string> + <string name="usb_storage_message" msgid="2759542180575016871">"已通过 USB 连接与计算机。若要在计算机和手机 SD 卡之间复制文件，请选择“装载”。"</string> + <string name="usb_storage_button_mount" msgid="8063426289195405456">"装载"</string> + <string name="usb_storage_button_unmount" msgid="6092146330053864766">"不装载"</string> <string name="usb_storage_error_message" msgid="2534784751603345363">"使用 SD 卡进行 USB 存储时出现问题。"</string> <string name="usb_storage_notification_title" msgid="8175892554757216525">"USB 已连接"</string> - <string name="usb_storage_notification_message" msgid="7380082404288219341">"选择将文件复制到计算机/从计算机复制到存储设备。"</string> + <string name="usb_storage_notification_message" msgid="7380082404288219341">"选择将文件复制到计算机或从计算机复制到存储设备。"</string> <string name="usb_storage_stop_notification_title" msgid="2336058396663516017">"关闭 USB 存储设备"</string> <string name="usb_storage_stop_notification_message" msgid="2591813490269841539">"选中以关闭 USB 存储设备。"</string> <string name="usb_storage_stop_title" msgid="6014127947456185321">"关闭 USB 存储设备"</string> @@ -800,28 +754,26 @@ <string name="usb_storage_stop_button_unmount" msgid="3774611918660582898">"取消"</string> <string name="usb_storage_stop_error_message" msgid="3746037090369246731">"关闭 USB 存储设备时遇到问题。请检查是否卸载了 USB 主设备，然后重试。"</string> <string name="extmedia_format_title" msgid="8663247929551095854">"格式化 SD 卡"</string> - <string name="extmedia_format_message" msgid="3621369962433523619">"您确定要格式化 SD 卡？卡上的所有数据都会丢失。"</string> + <string name="extmedia_format_message" msgid="3621369962433523619">"确定要将 SD 卡格式化吗？该卡上的所有数据都将丢失。"</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"格式化"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"已连接 USB 调试"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"选择停用 USB 调试。"</string> + <string name="select_input_method" msgid="6865512749462072765">"选择输入法"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"候选"</u></string> <string name="ext_media_checking_notification_title" msgid="5457603418970994050">"正在准备 SD 卡"</string> <string name="ext_media_checking_notification_message" msgid="8287319882926737053">"正在检查是否有错误。"</string> <string name="ext_media_nofs_notification_title" msgid="780477838241212997">"空 SD 卡"</string> - <string name="ext_media_nofs_notification_message" msgid="3817704088027829380">"SD 卡是空的或其文件系统不受支持。"</string> + <string name="ext_media_nofs_notification_message" msgid="3817704088027829380">"SD 卡无文件系统，或文件系统不受支持。"</string> <string name="ext_media_unmountable_notification_title" msgid="6410723906019100189">"SD 卡受损"</string> - <string name="ext_media_unmountable_notification_message" msgid="6902531775948238989">"SD 卡已损坏。可能必须重新格式化。"</string> - <string name="ext_media_badremoval_notification_title" msgid="6872152882604407837">"SD 卡被意外拔除"</string> - <string name="ext_media_badremoval_notification_message" msgid="7260183293747448241">"先卸载 SD 卡再拔除，以避免数据丢失。"</string> + <string name="ext_media_unmountable_notification_message" msgid="6902531775948238989">"SD 卡已损坏。您可能必须将其重新格式化。"</string> + <string name="ext_media_badremoval_notification_title" msgid="6872152882604407837">"SD 卡未正常移除"</string> + <string name="ext_media_badremoval_notification_message" msgid="7260183293747448241">"请先卸载 SD 卡，再将其移除，以防数据丢失。"</string> <string name="ext_media_safe_unmount_notification_title" msgid="6729801130790616200">"SD 卡已安全移除"</string> - <string name="ext_media_safe_unmount_notification_message" msgid="568841278138377604">"可安全地取出 SD 卡。"</string> + <string name="ext_media_safe_unmount_notification_message" msgid="568841278138377604">"您现在可以安全移除 SD 卡。"</string> <string name="ext_media_nomedia_notification_title" msgid="8902518030404381318">"已移除 SD 卡"</string> - <string name="ext_media_nomedia_notification_message" msgid="3870120652983659641">"SD 卡已取出。请插入另一 SD 卡。"</string> + <string name="ext_media_nomedia_notification_message" msgid="3870120652983659641">"SD 卡已移除。请插入新的 SD 卡。"</string> <string name="activity_list_empty" msgid="4168820609403385789">"找不到匹配的活动"</string> <string name="permlab_pkgUsageStats" msgid="8787352074326748892">"更新组件使用情况统计"</string> <string name="permdesc_pkgUsageStats" msgid="891553695716752835">"允许修改收集的组件使用情况统计。普通应用程序不能使用此权限。"</string> @@ -837,22 +789,29 @@ <string name="create_contact_using" msgid="4947405226788104538">"创建电话号码为"\n"<xliff:g id="NUMBER">%s</xliff:g> 的联系人"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"已选中"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"未选中"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"允许"</string> <string name="deny" msgid="2081879885755434506">"拒绝"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"已请求权限"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"已为帐户<xliff:g id="ACCOUNT">%s</xliff:g>"\n"请求了权限"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"输入法"</string> <string name="sync_binding_label" msgid="3687969138375092423">"同步"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"辅助功能"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"壁纸"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"更改壁纸"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"点对点隧道协议"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"第 2 层隧道协议"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"基于预共享密钥的 L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"基于证书的 L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 354253655613..ee3133302513 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -111,8 +111,7 @@ <string name="httpErrorFile" msgid="8250549644091165175">"無法存取此檔案。"</string> <string name="httpErrorFileNotFound" msgid="5588380756326017105">"找不到要求的檔案。"</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"太多執行要求。請稍後再試一次。"</string> - <!-- no translation found for notification_title (1259940370369187045) --> - <skip /> + <string name="notification_title" msgid="1259940370369187045">"<xliff:g id="ACCOUNT">%1$s</xliff:g>登入錯誤"</string> <string name="contentServiceSync" msgid="8353523060269335667">"同步處理"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"同步處理"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"同時刪除太多 <xliff:g id="CONTENT_TYPE">%s</xliff:g>。"</string> @@ -148,10 +147,8 @@ <string name="permgroupdesc_location" msgid="2430258821648348660">"監視實際位置"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"網路通訊"</string> <string name="permgroupdesc_network" msgid="5035763698958415998">"允許應用程式存取多項網路功能。"</string> - <!-- no translation found for permgrouplab_accounts (3359646291125325519) --> - <skip /> - <!-- no translation found for permgroupdesc_accounts (4948732641827091312) --> - <skip /> + <string name="permgrouplab_accounts" msgid="3359646291125325519">"您的帳戶"</string> + <string name="permgroupdesc_accounts" msgid="4948732641827091312">"存取可用帳戶。"</string> <string name="permgrouplab_hardwareControls" msgid="7998214968791599326">"硬體控制"</string> <string name="permgroupdesc_hardwareControls" msgid="4357057861225462702">"在免持設備上直接存取硬體。"</string> <string name="permgrouplab_phoneCalls" msgid="9067173988325865923">"撥打電話"</string> @@ -188,8 +185,14 @@ <string name="permdesc_setDebugApp" msgid="5584310661711990702">"允許應用程式為其他程式開啟偵錯功能。請注意：惡意程式可利用此功能終止其他應用程式。"</string> <string name="permlab_changeConfiguration" msgid="8214475779521218295">"變更介面設定"</string> <string name="permdesc_changeConfiguration" msgid="3465121501528064399">"允許應用程式變更目前設定，例如：地區設定或字型大小。"</string> - <string name="permlab_restartPackages" msgid="2386396847203622628">"重新啟動其他應用程式"</string> - <string name="permdesc_restartPackages" msgid="1076364837492936814">"允許應用程式強制重新啟動其他應用程式。"</string> + <!-- no translation found for permlab_killBackgroundProcesses (8373714752793061963) --> + <skip /> + <!-- no translation found for permdesc_killBackgroundProcesses (2908829602869383753) --> + <skip /> + <!-- no translation found for permlab_forceStopPackages (1447830113260156236) --> + <skip /> + <!-- no translation found for permdesc_forceStopPackages (7263036616161367402) --> + <skip /> <string name="permlab_forceBack" msgid="1804196839880393631">"強制關閉應用程式"</string> <string name="permdesc_forceBack" msgid="6534109744159919013">"允許應用程式強制關閉在前端運作的活動並返回。一般應用程式不需要此功能。"</string> <string name="permlab_dump" msgid="1681799862438954752">"接收系統內部狀態"</string> @@ -392,6 +395,10 @@ <string name="permdesc_writeDictionary" msgid="2241256206524082880">"允許應用程式將新字詞寫入使用者的字典。"</string> <string name="permlab_sdcardWrite" msgid="8079403759001777291">"修改/刪除 SD 卡的內容"</string> <string name="permdesc_sdcardWrite" msgid="6643963204976471878">"允許應用程式寫入 SD 卡。"</string> + <!-- no translation found for permlab_cache_filesystem (5656487264819669824) --> + <skip /> + <!-- no translation found for permdesc_cache_filesystem (1624734528435659906) --> + <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"住家電話"</item> <item msgid="869923650527136615">"行動電話"</item> @@ -435,110 +442,58 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <!-- no translation found for phoneTypeCustom (1644738059053355820) --> - <skip /> - <!-- no translation found for phoneTypeHome (2570923463033985887) --> - <skip /> - <!-- no translation found for phoneTypeMobile (6501463557754751037) --> - <skip /> - <!-- no translation found for phoneTypeWork (8863939667059911633) --> - <skip /> - <!-- no translation found for phoneTypeFaxWork (3517792160008890912) --> - <skip /> - <!-- no translation found for phoneTypeFaxHome (2067265972322971467) --> - <skip /> - <!-- no translation found for phoneTypePager (7582359955394921732) --> - <skip /> - <!-- no translation found for phoneTypeOther (1544425847868765990) --> - <skip /> - <!-- no translation found for phoneTypeCallback (2712175203065678206) --> - <skip /> - <!-- no translation found for phoneTypeCar (8738360689616716982) --> - <skip /> - <!-- no translation found for phoneTypeCompanyMain (540434356461478916) --> - <skip /> - <!-- no translation found for phoneTypeIsdn (8022453193171370337) --> - <skip /> - <!-- no translation found for phoneTypeMain (6766137010628326916) --> - <skip /> - <!-- no translation found for phoneTypeOtherFax (8587657145072446565) --> - <skip /> - <!-- no translation found for phoneTypeRadio (4093738079908667513) --> - <skip /> - <!-- no translation found for phoneTypeTelex (3367879952476250512) --> - <skip /> - <!-- no translation found for phoneTypeTtyTdd (8606514378585000044) --> - <skip /> - <!-- no translation found for phoneTypeWorkMobile (1311426989184065709) --> - <skip /> - <!-- no translation found for phoneTypeWorkPager (649938731231157056) --> - <skip /> - <!-- no translation found for phoneTypeAssistant (5596772636128562884) --> - <skip /> - <!-- no translation found for phoneTypeMms (7254492275502768992) --> - <skip /> - <!-- no translation found for eventTypeBirthday (2813379844211390740) --> - <skip /> - <!-- no translation found for eventTypeAnniversary (3876779744518284000) --> - <skip /> - <!-- no translation found for eventTypeOther (5834288791948564594) --> - <skip /> - <!-- no translation found for emailTypeCustom (8525960257804213846) --> - <skip /> - <!-- no translation found for emailTypeHome (449227236140433919) --> - <skip /> - <!-- no translation found for emailTypeWork (3548058059601149973) --> - <skip /> - <!-- no translation found for emailTypeOther (2923008695272639549) --> - <skip /> - <!-- no translation found for emailTypeMobile (119919005321166205) --> - <skip /> - <!-- no translation found for postalTypeCustom (8903206903060479902) --> - <skip /> - <!-- no translation found for postalTypeHome (8165756977184483097) --> - <skip /> - <!-- no translation found for postalTypeWork (5268172772387694495) --> - <skip /> - <!-- no translation found for postalTypeOther (2726111966623584341) --> - <skip /> - <!-- no translation found for imTypeCustom (2074028755527826046) --> - <skip /> - <!-- no translation found for imTypeHome (6241181032954263892) --> - <skip /> - <!-- no translation found for imTypeWork (1371489290242433090) --> - <skip /> - <!-- no translation found for imTypeOther (5377007495735915478) --> - <skip /> - <!-- no translation found for imProtocolCustom (6919453836618749992) --> - <skip /> - <!-- no translation found for imProtocolAim (7050360612368383417) --> - <skip /> - <!-- no translation found for imProtocolMsn (144556545420769442) --> - <skip /> - <!-- no translation found for imProtocolYahoo (8271439408469021273) --> - <skip /> - <!-- no translation found for imProtocolSkype (9019296744622832951) --> - <skip /> - <!-- no translation found for imProtocolQq (8887484379494111884) --> - <skip /> - <!-- no translation found for imProtocolGoogleTalk (3808393979157698766) --> - <skip /> - <!-- no translation found for imProtocolIcq (1574870433606517315) --> - <skip /> - <!-- no translation found for imProtocolJabber (2279917630875771722) --> - <skip /> - <!-- no translation found for imProtocolNetMeeting (8287625655986827971) --> - <skip /> - <!-- no translation found for orgTypeWork (29268870505363872) --> - <skip /> - <!-- no translation found for orgTypeOther (3951781131570124082) --> - <skip /> - <!-- no translation found for orgTypeCustom (225523415372088322) --> - <skip /> - <!-- no translation found for contact_status_update_attribution (5112589886094402795) --> - <skip /> - <!-- no translation found for contact_status_update_attribution_with_date (5945386376369979909) --> - <skip /> + <string name="phoneTypeCustom" msgid="1644738059053355820">"自訂"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"住家"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"行動裝置"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"公司"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"公司傳真"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"住家傳真"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"呼叫器"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"其他"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"回撥電話"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"汽車電話"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"公司代表號"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"代表號"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"其他傳真"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"無線電"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY/TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"公司行動電話"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"公司呼叫器"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"助理"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"生日"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"週年紀念日"</string> + <string name="eventTypeOther" msgid="5834288791948564594">"活動"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"自訂"</string> + <string name="emailTypeHome" msgid="449227236140433919">"住家"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"公司"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"其他"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"行動裝置"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"自訂"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"住家"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"公司"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"其他"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"自訂"</string> + <string name="imTypeHome" msgid="6241181032954263892">"住家"</string> + <string name="imTypeWork" msgid="1371489290242433090">"公司"</string> + <string name="imTypeOther" msgid="5377007495735915478">"其他"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"自訂"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"網路會議"</string> + <string name="orgTypeWork" msgid="29268870505363872">"公司"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"其他"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"自訂"</string> + <string name="contact_status_update_attribution" msgid="5112589886094402795">"透過 <xliff:g id="SOURCE">%1$s</xliff:g>"</string> + <string name="contact_status_update_attribution_with_date" msgid="5945386376369979909">"<xliff:g id="DATE">%1$s</xliff:g>透過「<xliff:g id="SOURCE">%2$s</xliff:g>」"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"輸入 PIN 碼"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN 碼錯誤！"</string> <string name="keyguard_label_text" msgid="861796461028298424">"如要解鎖，請按 Menu 鍵，然後按 0。"</string> @@ -553,8 +508,7 @@ <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"很抱歉，請再試一次"</string> <string name="lockscreen_plugged_in" msgid="613343852842944435">"正在充電 (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"充電完成。"</string> - <!-- no translation found for lockscreen_battery_short (3617549178603354656) --> - <skip /> + <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"請連接充電器。"</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"沒有 SIM 卡。"</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"手機未插入 SIM 卡。"</string> @@ -576,6 +530,9 @@ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"登入"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"使用者名稱或密碼錯誤。"</string> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"檢查中..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"解除封鎖"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"開啟音效"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"關閉音效"</string> <string name="hour_ampm" msgid="4329881288269772723">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> <string name="hour_cap_ampm" msgid="1829009197680861107">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"清除"</string> @@ -586,8 +543,7 @@ <string name="battery_status_charging" msgid="756617993998772213">"充電中"</string> <string name="battery_low_title" msgid="7923774589611311406">"請連接充電器"</string> <string name="battery_low_subtitle" msgid="7388781709819722764">"電池電量即將不足："</string> - <!-- no translation found for battery_low_percent_format (696154104579022959) --> - <skip /> + <string name="battery_low_percent_format" msgid="696154104579022959">"還剩 <xliff:g id="NUMBER">%d%%</xliff:g> 以下。"</string> <string name="battery_low_why" msgid="7279169609518386372">"電池使用狀況"</string> <string name="factorytest_failed" msgid="5410270329114212041">"出廠測試失敗"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"只有安裝在 /system/app 裡的程式才能支援 FACTORY_TEST 操作。"</string> @@ -597,8 +553,7 @@ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"離開此頁？"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n" 選取 [確定] 離開此頁；或 [取消] 留在此頁。"</string> <string name="save_password_label" msgid="6860261758665825069">"確認"</string> - <!-- no translation found for double_tap_toast (1068216937244567247) --> - <skip /> + <string name="double_tap_toast" msgid="1068216937244567247">"提示：輕按兩下可放大縮小。"</string> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"讀取瀏覽器的記錄與書籤"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"允許應用程式讀取瀏覽器曾經造訪過的所有網址，以及瀏覽器的所有書籤。"</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"寫入瀏覽器的記錄與書籤"</string> @@ -749,7 +704,6 @@ <string name="force_close" msgid="3653416315450806396">"強制關閉"</string> <string name="report" msgid="4060218260984795706">"回報"</string> <string name="wait" msgid="7147118217226317732">"等待"</string> - <string name="debug" msgid="9103374629678531849">"偵錯"</string> <string name="sendText" msgid="5132506121645618310">"訊息傳送方式"</string> <string name="volume_ringtone" msgid="6885421406845734650">"鈴聲音量"</string> <string name="volume_music" msgid="5421651157138628171">"媒體音量"</string> @@ -803,10 +757,8 @@ <string name="extmedia_format_message" msgid="3621369962433523619">"確定要將 SD 卡格式化嗎？該 SD 卡中的所有資料將會遺失。"</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"格式化"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB 偵錯模式已啟用"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> - <!-- no translation found for select_input_method (6865512749462072765) --> - <skip /> + <string name="adb_active_notification_message" msgid="8470296818270110396">"選取以停用 USB 偵錯。"</string> + <string name="select_input_method" msgid="6865512749462072765">"選取輸入方式"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"待選項目"</u></string> @@ -830,29 +782,36 @@ <string name="ime_action_go" msgid="8320845651737369027">"開始"</string> <string name="ime_action_search" msgid="658110271822807811">"搜尋"</string> <string name="ime_action_send" msgid="2316166556349314424">"傳送"</string> - <string name="ime_action_next" msgid="3138843904009813834">"下一步"</string> + <string name="ime_action_next" msgid="3138843904009813834">"下一頁"</string> <string name="ime_action_done" msgid="8971516117910934605">"完成"</string> <string name="ime_action_default" msgid="2840921885558045721">"執行"</string> <string name="dial_number_using" msgid="5789176425167573586">"使用 <xliff:g id="NUMBER">%s</xliff:g>"\n"撥號"</string> <string name="create_contact_using" msgid="4947405226788104538">"建立手機號碼為 <xliff:g id="NUMBER">%s</xliff:g>"\n"的聯絡人"</string> <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"已勾選"</string> <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"未勾選"</string> + <!-- no translation found for grant_credentials_permission_message_header (6824538733852821001) --> + <skip /> + <!-- no translation found for grant_credentials_permission_message_footer (3125211343379376561) --> + <skip /> + <!-- no translation found for grant_permissions_header_text (2722567482180797717) --> + <skip /> <string name="allow" msgid="7225948811296386551">"允許"</string> <string name="deny" msgid="2081879885755434506">"拒絕"</string> <string name="permission_request_notification_title" msgid="5390555465778213840">"已要求權限"</string> - <!-- no translation found for permission_request_notification_with_subtitle (4325409589686688000) --> - <skip /> + <string name="permission_request_notification_with_subtitle" msgid="4325409589686688000">"帳戶 <xliff:g id="ACCOUNT">%s</xliff:g> 的"\n"權限要求"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"輸入方式"</string> <string name="sync_binding_label" msgid="3687969138375092423">"同步處理"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"協助工具"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"桌布"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"變更桌布"</string> - <!-- no translation found for pptp_vpn_description (2688045385181439401) --> - <skip /> - <!-- no translation found for l2tp_vpn_description (3750692169378923304) --> + <string name="pptp_vpn_description" msgid="2688045385181439401">"點對點通道通訊協定"</string> + <string name="l2tp_vpn_description" msgid="3750692169378923304">"第二層通道通訊協定"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"採用預先共用金鑰的 L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"採用憑證的 L2TP/IPSec VPN"</string> + <!-- no translation found for upload_file (2897957172366730416) --> <skip /> - <!-- no translation found for l2tp_ipsec_psk_vpn_description (3945043564008303239) --> + <!-- no translation found for reset (2448168080964209908) --> <skip /> - <!-- no translation found for l2tp_ipsec_crt_vpn_description (5382714073103653577) --> + <!-- no translation found for submit (1602335572089911941) --> <skip /> </resources> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 0b605ed06109..8dadd88ac0e7 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1394,8 +1394,10 @@ be a dimension (such as "12dip") for a constant width or one of the special constants. --> <attr name="layout_width" format="dimension"> - <!-- The view should be as big as its parent (minus padding). --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The view should be as big as its parent (minus padding). --> + <enum name="match_parent" value="-1" /> <!-- The view should be only big enough to enclose its content (plus padding). --> <enum name="wrap_content" value="-2" /> </attr> @@ -1405,8 +1407,10 @@ be a dimension (such as "12dip") for a constant height or one of the special constants. --> <attr name="layout_height" format="dimension"> - <!-- The view should be as big as its parent (minus padding). --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The view should be as big as its parent (minus padding). --> + <enum name="match_parent" value="-1" /> <!-- The view should be only big enough to enclose its content (plus padding). --> <enum name="wrap_content" value="-2" /> </attr> @@ -2110,22 +2114,26 @@ is used. --> <attr name="dropDownAnchor" format="reference" /> <!-- Specifies the basic width of the dropdown. Its value may - be a dimension (such as "12dip") for a constant width, fill_parent - to fill the width of the screen, or wrap_content to match the width + be a dimension (such as "12dip") for a constant width, match_parent + to match the width of the screen, or wrap_content to match the width of the anchored view. --> <attr name="dropDownWidth" format="dimension"> - <!-- The dropdown should fill the width of the screen. --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The dropdown should fit the width of the screen. --> + <enum name="match_parent" value="-1" /> <!-- The dropdown should fit the width of its anchor. --> <enum name="wrap_content" value="-2" /> </attr> <!-- Specifies the basic width of the dropdown. Its value may - be a dimension (such as "12dip") for a constant width, fill_parent + be a dimension (such as "12dip") for a constant width, match_parent to fill the width of the screen, or wrap_content to match the height of the content of the drop down. --> <attr name="dropDownHeight" format="dimension"> - <!-- The dropdown should fill the width of the screen. --> + <!-- {@deprecated Use match_parent instead.} --> <enum name="fill_parent" value="-1" /> + <!-- The dropdown should fill the width of the screen. --> + <enum name="match_parent" value="-1" /> <!-- The dropdown should fit the width of its anchor. --> <enum name="wrap_content" value="-2" /> </attr> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index f2b52d9b5b77..58e9f4590ab1 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -371,7 +371,7 @@ <style name="Widget.TextView.ListSeparator"> <item name="android:background">@android:drawable/dark_header_dither</item> - <item name="android:layout_width">fill_parent</item> + <item name="android:layout_width">match_parent</item> <item name="android:layout_height">25dip</item> <item name="android:textStyle">bold</item> <item name="android:textColor">?textColorSecondary</item> diff --git a/media/libmedia/StagefrightMediaScanner.h b/include/media/stagefright/StagefrightMediaScanner.h index 108acb4c3515..af125dc62082 100644 --- a/media/libmedia/StagefrightMediaScanner.h +++ b/include/media/stagefright/StagefrightMediaScanner.h @@ -22,6 +22,8 @@ namespace android { +struct StagefrightMetadataRetriever; + struct StagefrightMediaScanner : public MediaScanner { StagefrightMediaScanner(); virtual ~StagefrightMediaScanner(); @@ -33,6 +35,8 @@ struct StagefrightMediaScanner : public MediaScanner { virtual char *extractAlbumArt(int fd); private: + sp<StagefrightMetadataRetriever> mRetriever; + StagefrightMediaScanner(const StagefrightMediaScanner &); StagefrightMediaScanner &operator=(const StagefrightMediaScanner &); }; diff --git a/libs/rs/java/ImageProcessing/res/layout/main.xml b/libs/rs/java/ImageProcessing/res/layout/main.xml index 0872cf2a2924..6770c18838c9 100644 --- a/libs/rs/java/ImageProcessing/res/layout/main.xml +++ b/libs/rs/java/ImageProcessing/res/layout/main.xml @@ -31,7 +31,7 @@ android:layout_marginBottom="10dip" android:layout_marginLeft="10dip" android:layout_marginRight="10dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" /> diff --git a/libs/rs/rsUtils.h b/libs/rs/rsUtils.h index 07f893338bfa..3c6da68f6d30 100644 --- a/libs/rs/rsUtils.h +++ b/libs/rs/rsUtils.h @@ -17,7 +17,6 @@ #ifndef ANDROID_RS_UTILS_H #define ANDROID_RS_UTILS_H -#define LOG_NDEBUG 0 #define LOG_TAG "RenderScript" #include <utils/Log.h> #include <utils/Vector.h> diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 5c0b7a5c7d49..74af9b623cb4 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -23,7 +23,6 @@ import android.os.Looper; import android.os.RemoteException; import android.os.Handler; import android.os.Message; -import android.util.Config; import android.util.Log; import com.android.internal.location.DummyLocationProvider; @@ -248,7 +247,7 @@ public class LocationManager { * factory Context.getSystemService. */ public LocationManager(ILocationManager service) { - if (Config.LOGD) { + if (false) { Log.d(TAG, "Constructor: service = " + service); } mService = service; @@ -277,7 +276,7 @@ public class LocationManager { * @return list of Strings containing names of the providers */ public List<String> getAllProviders() { - if (Config.LOGD) { + if (false) { Log.d(TAG, "getAllProviders"); } try { @@ -829,7 +828,7 @@ public class LocationManager { if (listener == null) { throw new IllegalArgumentException("listener==null"); } - if (Config.LOGD) { + if (false) { Log.d(TAG, "removeUpdates: listener = " + listener); } try { @@ -854,7 +853,7 @@ public class LocationManager { if (intent == null) { throw new IllegalArgumentException("intent==null"); } - if (Config.LOGD) { + if (false) { Log.d(TAG, "removeUpdates: intent = " + intent); } try { @@ -909,7 +908,7 @@ public class LocationManager { */ public void addProximityAlert(double latitude, double longitude, float radius, long expiration, PendingIntent intent) { - if (Config.LOGD) { + if (false) { Log.d(TAG, "addProximityAlert: latitude = " + latitude + ", longitude = " + longitude + ", radius = " + radius + ", expiration = " + expiration + @@ -930,7 +929,7 @@ public class LocationManager { * proximity alerts */ public void removeProximityAlert(PendingIntent intent) { - if (Config.LOGD) { + if (false) { Log.d(TAG, "removeProximityAlert: intent = " + intent); } try { diff --git a/location/java/com/android/internal/location/GpsLocationProvider.java b/location/java/com/android/internal/location/GpsLocationProvider.java index 7763549ee1e5..ee56621910a7 100755 --- a/location/java/com/android/internal/location/GpsLocationProvider.java +++ b/location/java/com/android/internal/location/GpsLocationProvider.java @@ -41,7 +41,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; import android.provider.Settings; -import android.util.Config; import android.util.Log; import android.util.SparseIntArray; @@ -69,7 +68,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { private static final String TAG = "GpsLocationProvider"; - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private static final boolean VERBOSE = false; /** @@ -377,7 +376,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { public void updateNetworkState(int state, NetworkInfo info) { mNetworkAvailable = (state == LocationProvider.AVAILABLE); - if (Config.LOGD) { + if (DEBUG) { Log.d(TAG, "updateNetworkState " + (mNetworkAvailable ? "available" : "unavailable") + " info: " + info); } @@ -498,7 +497,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { * when the provider is enabled. */ public synchronized void enable() { - if (Config.LOGD) Log.d(TAG, "enable"); + if (DEBUG) Log.d(TAG, "enable"); if (mEnabled) return; mEnabled = native_init(); @@ -534,7 +533,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { * down while the provider is disabled. */ public synchronized void disable() { - if (Config.LOGD) Log.d(TAG, "disable"); + if (DEBUG) Log.d(TAG, "disable"); if (!mEnabled) return; mEnabled = false; @@ -602,7 +601,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } public void setMinTime(long minTime) { - if (Config.LOGD) Log.d(TAG, "setMinTime " + minTime); + if (DEBUG) Log.d(TAG, "setMinTime " + minTime); if (minTime >= 0) { int interval = (int)(minTime/1000); @@ -623,7 +622,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } public void binderDied() { - if (Config.LOGD) Log.d(TAG, "GPS status listener died"); + if (DEBUG) Log.d(TAG, "GPS status listener died"); synchronized(mListeners) { mListeners.remove(this); @@ -721,7 +720,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } private boolean forceTimeInjection() { - if (Config.LOGD) Log.d(TAG, "forceTimeInjection"); + if (DEBUG) Log.d(TAG, "forceTimeInjection"); if (mNetworkThread != null) { mNetworkThread.timeInjectRequest(); return true; @@ -797,7 +796,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { // report time to first fix if (mTTFF == 0 && (flags & LOCATION_HAS_LAT_LONG) == LOCATION_HAS_LAT_LONG) { mTTFF = (int)(mLastFixTime - mFixRequestTime); - if (Config.LOGD) Log.d(TAG, "TTFF: " + mTTFF); + if (DEBUG) Log.d(TAG, "TTFF: " + mTTFF); // notify status listeners synchronized(mListeners) { @@ -1046,7 +1045,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } private void xtraDownloadRequest() { - if (Config.LOGD) Log.d(TAG, "xtraDownloadRequest"); + if (DEBUG) Log.d(TAG, "xtraDownloadRequest"); if (mNetworkThread != null) { mNetworkThread.xtraDownloadRequest(); } @@ -1063,7 +1062,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { StringBuilder extrasBuf = new StringBuilder(); - if (Config.LOGD) Log.d(TAG, "sendNiResponse, notifId: " + notificationId + + if (DEBUG) Log.d(TAG, "sendNiResponse, notifId: " + notificationId + ", response: " + userResponse); native_send_ni_response(notificationId, userResponse); @@ -1149,14 +1148,14 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } public void run() { - if (Config.LOGD) Log.d(TAG, "GpsEventThread starting"); + if (DEBUG) Log.d(TAG, "GpsEventThread starting"); // Exit as soon as disable() is called instead of waiting for the GPS to stop. while (mEnabled) { // this will wait for an event from the GPS, // which will be reported via reportLocation or reportStatus native_wait_for_event(); } - if (Config.LOGD) Log.d(TAG, "GpsEventThread exiting"); + if (DEBUG) Log.d(TAG, "GpsEventThread exiting"); } } @@ -1181,7 +1180,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } public void runLocked() { - if (Config.LOGD) Log.d(TAG, "NetworkThread starting"); + if (DEBUG) Log.d(TAG, "NetworkThread starting"); SntpClient client = new SntpClient(); GpsXtraDownloader xtraDownloader = null; @@ -1197,18 +1196,17 @@ public class GpsLocationProvider extends ILocationProvider.Stub { synchronized (this) { try { if (!mNetworkAvailable) { - if (Config.LOGD) Log.d(TAG, - "NetworkThread wait for network"); + if (DEBUG) Log.d(TAG, "NetworkThread wait for network"); wait(); } else if (waitTime > 0) { - if (Config.LOGD) { + if (DEBUG) { Log.d(TAG, "NetworkThread wait for " + waitTime + "ms"); } wait(waitTime); } } catch (InterruptedException e) { - if (Config.LOGD) { + if (DEBUG) { Log.d(TAG, "InterruptedException in GpsNetworkThread"); } } @@ -1217,12 +1215,11 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } while (!mDone && ((!mXtraDownloadRequested && !mTimeInjectRequested && waitTime > 0) || !mNetworkAvailable)); - if (Config.LOGD) Log.d(TAG, "NetworkThread out of wake loop"); - + if (DEBUG) Log.d(TAG, "NetworkThread out of wake loop"); if (!mDone) { if (mNtpServer != null && (mTimeInjectRequested || mNextNtpTime <= System.currentTimeMillis())) { - if (Config.LOGD) { + if (DEBUG) { Log.d(TAG, "Requesting time from NTP server " + mNtpServer); } mTimeInjectRequested = false; @@ -1231,14 +1228,14 @@ public class GpsLocationProvider extends ILocationProvider.Stub { long timeReference = client.getNtpTimeReference(); int certainty = (int)(client.getRoundTripTime()/2); - if (Config.LOGD) Log.d(TAG, "calling native_inject_time: " + + if (DEBUG) Log.d(TAG, "calling native_inject_time: " + time + " reference: " + timeReference + " certainty: " + certainty); native_inject_time(time, timeReference, certainty); mNextNtpTime = System.currentTimeMillis() + NTP_INTERVAL; } else { - if (Config.LOGD) Log.d(TAG, "requestTime failed"); + if (DEBUG) Log.d(TAG, "requestTime failed"); mNextNtpTime = System.currentTimeMillis() + RETRY_INTERVAL; } } @@ -1249,7 +1246,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { mXtraDownloadRequested = false; byte[] data = xtraDownloader.downloadXtraData(); if (data != null) { - if (Config.LOGD) { + if (DEBUG) { Log.d(TAG, "calling native_inject_xtra_data"); } native_inject_xtra_data(data, data.length); @@ -1260,7 +1257,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } } } - if (Config.LOGD) Log.d(TAG, "NetworkThread exiting"); + if (DEBUG) Log.d(TAG, "NetworkThread exiting"); } synchronized void xtraDownloadRequest() { @@ -1278,7 +1275,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { } synchronized void setDone() { - if (Config.LOGD) Log.d(TAG, "stopping NetworkThread"); + if (DEBUG) Log.d(TAG, "stopping NetworkThread"); mDone = true; notify(); } diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 5819d25997e3..482fc4f304b5 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1438,6 +1438,8 @@ public class AudioService extends IAudioService.Stub { AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, AudioSystem.DEVICE_STATE_AVAILABLE, address); + // Reset A2DP suspend state each time a new sink is connected + AudioSystem.setParameters("A2dpSuspended=false"); mConnectedDevices.put( new Integer(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP), address); } diff --git a/media/jni/Android.mk b/media/jni/Android.mk index fdcf3d1b48ee..ca6230f7f87b 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -15,7 +15,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ libskia \ - libui + libui \ + libcutils ifneq ($(BUILD_WITHOUT_PV),true) LOCAL_SRC_FILES += \ @@ -28,6 +29,15 @@ else LOCAL_CFLAGS += -DNO_OPENCORE endif +ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) + +LOCAL_CFLAGS += -DBUILD_WITH_FULL_STAGEFRIGHT=1 + +LOCAL_SHARED_LIBRARIES += \ + libstagefright + +endif + LOCAL_STATIC_LIBRARIES := LOCAL_C_INCLUDES += \ diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 144fba2d5873..2ab2445b7b59 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -24,6 +24,7 @@ #include <limits.h> #include <unistd.h> #include <fcntl.h> +#include <cutils/properties.h> #include <utils/threads.h> #include "jni.h" @@ -32,8 +33,10 @@ #ifndef NO_OPENCORE #include "pvmediascanner.h" -#else -#include "StagefrightMediaScanner.h" +#endif + +#if BUILD_WITH_FULL_STAGEFRIGHT +#include <media/stagefright/StagefrightMediaScanner.h> #endif // ---------------------------------------------------------------------------- @@ -283,14 +286,25 @@ android_media_MediaScanner_native_init(JNIEnv *env) } } +static MediaScanner *createMediaScanner() { +#if BUILD_WITH_FULL_STAGEFRIGHT + char value[PROPERTY_VALUE_MAX]; + if (property_get("media.stagefright.enable-scan", value, NULL) + && (!strcmp(value, "1") || !strcasecmp(value, "true"))) { + return new StagefrightMediaScanner; + } +#endif +#ifndef NO_OPENCORE + return new PVMediaScanner(); +#endif + + return NULL; +} + static void android_media_MediaScanner_native_setup(JNIEnv *env, jobject thiz) { -#ifndef NO_OPENCORE - MediaScanner *mp = new PVMediaScanner(); -#else - MediaScanner *mp = new StagefrightMediaScanner(); -#endif + MediaScanner *mp = createMediaScanner(); if (mp == NULL) { jniThrowException(env, "java/lang/RuntimeException", "Out of memory"); diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 088ad6d85d88..fc234ee0e372 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -26,11 +26,6 @@ LOCAL_SRC_FILES:= \ MediaScannerClient.cpp \ autodetect.cpp -ifneq ($(BUILD_WITHOUT_PV),true) -else -LOCAL_SRC_FILES += StagefrightMediaScanner.cpp -endif - LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox libicuuc diff --git a/media/libmedia/StagefrightMediaScanner.cpp b/media/libmedia/StagefrightMediaScanner.cpp deleted file mode 100644 index 522ab5ada856..000000000000 --- a/media/libmedia/StagefrightMediaScanner.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2009 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. - */ - -#include "StagefrightMediaScanner.h" - -namespace android { - -StagefrightMediaScanner::StagefrightMediaScanner() {} - -StagefrightMediaScanner::~StagefrightMediaScanner() {} - -status_t StagefrightMediaScanner::processFile( - const char *path, const char *mimeType, - MediaScannerClient &client) { - client.setLocale(locale()); - client.beginFile(); - client.endFile(); - - return OK; -} - -char *StagefrightMediaScanner::extractAlbumArt(int fd) { - return NULL; -} - -} // namespace android diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 5e59710065db..d51ab3034f81 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -19,7 +19,6 @@ LOCAL_SRC_FILES:= \ ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) LOCAL_SRC_FILES += \ - StagefrightMetadataRetriever.cpp \ StagefrightPlayer.cpp \ StagefrightRecorder.cpp diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index f7df69ca92fd..30b45065b589 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -31,6 +31,8 @@ LOCAL_SRC_FILES += \ MediaExtractor.cpp \ SampleTable.cpp \ ShoutcastSource.cpp \ + StagefrightMediaScanner.cpp \ + StagefrightMetadataRetriever.cpp \ TimeSource.cpp \ TimedEventQueue.cpp \ WAVExtractor.cpp \ diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp new file mode 100644 index 000000000000..9b419292b1bc --- /dev/null +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2009 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. + */ + +#include <media/stagefright/StagefrightMediaScanner.h> + +#include "include/StagefrightMetadataRetriever.h" + +namespace android { + +StagefrightMediaScanner::StagefrightMediaScanner() + : mRetriever(new StagefrightMetadataRetriever) { +} + +StagefrightMediaScanner::~StagefrightMediaScanner() {} + +status_t StagefrightMediaScanner::processFile( + const char *path, const char *mimeType, + MediaScannerClient &client) { + client.setLocale(locale()); + client.beginFile(); + + if (mRetriever->setDataSource(path) == OK + && mRetriever->setMode( + METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) { + struct KeyMap { + const char *tag; + int key; + }; + static const KeyMap kKeyMap[] = { + { "tracknumber", METADATA_KEY_CD_TRACK_NUMBER }, + { "album", METADATA_KEY_ALBUM }, + { "artist", METADATA_KEY_ARTIST }, + { "composer", METADATA_KEY_COMPOSER }, + { "genre", METADATA_KEY_GENRE }, + { "title", METADATA_KEY_TITLE }, + { "year", METADATA_KEY_YEAR }, + { "duration", METADATA_KEY_DURATION }, + { "writer", METADATA_KEY_WRITER }, + }; + static const size_t kNumEntries = sizeof(kKeyMap) / sizeof(kKeyMap[0]); + + for (size_t i = 0; i < kNumEntries; ++i) { + const char *value; + if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) { + client.addStringTag(kKeyMap[i].tag, value); + } + } + } + + client.endFile(); + + return OK; +} + +char *StagefrightMediaScanner::extractAlbumArt(int fd) { + if (mRetriever->setDataSource(fd, 0, 0) == OK + && mRetriever->setMode( + METADATA_MODE_FRAME_CAPTURE_ONLY) == OK) { + MediaAlbumArt *art = mRetriever->extractAlbumArt(); + + // TODO: figure out what format the result should be in. + } + + return NULL; +} + +} // namespace android diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index 42c18770c9f8..128e776503cb 100644 --- a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -19,7 +19,7 @@ #define LOG_TAG "StagefrightMetadataRetriever" #include <utils/Log.h> -#include "StagefrightMetadataRetriever.h" +#include "include/StagefrightMetadataRetriever.h" #include <media/stagefright/CachingDataSource.h> #include <media/stagefright/ColorConverter.h> diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.h b/media/libstagefright/include/StagefrightMetadataRetriever.h index 16127d7f2bce..16127d7f2bce 100644 --- a/media/libmediaplayerservice/StagefrightMetadataRetriever.h +++ b/media/libstagefright/include/StagefrightMetadataRetriever.h diff --git a/media/sdutils/sdutil.cpp b/media/sdutils/sdutil.cpp index 7f0dda7a9b70..c77424fbc674 100644 --- a/media/sdutils/sdutil.cpp +++ b/media/sdutils/sdutil.cpp @@ -105,33 +105,33 @@ static int asec_create(const char *id, int sizeMb, const char *fstype, String16 sFstype(fstype); String16 sKey(key); - String16 r = gMountService->createSecureCache(sId, sizeMb, sFstype, - sKey, ownerUid); + String16 r = gMountService->createSecureContainer(sId, sizeMb, sFstype, + sKey, ownerUid); return 0; } static int asec_finalize(const char *id) { String16 sId(id); - gMountService->finalizeSecureCache(sId); + gMountService->finalizeSecureContainer(sId); return 0; } static int asec_destroy(const char *id) { String16 sId(id); - gMountService->destroySecureCache(sId); + gMountService->destroySecureContainer(sId); return 0; } static int asec_mount(const char *id, const char *key, int ownerUid) { String16 sId(id); String16 sKey(key); - gMountService->mountSecureCache(sId, sKey, ownerUid); + gMountService->mountSecureContainer(sId, sKey, ownerUid); return 0; } static int asec_path(const char *id) { String16 sId(id); - gMountService->getSecureCachePath(sId); + gMountService->getSecureContainerPath(sId); return 0; } diff --git a/media/tests/MediaFrameworkTest/res/layout/movie_view.xml b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml index 35fedfab5eb9..cfd86bb7f953 100644 --- a/media/tests/MediaFrameworkTest/res/layout/movie_view.xml +++ b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml @@ -15,12 +15,12 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical"> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1"> @@ -32,12 +32,12 @@ </FrameLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <EditText android:id="@+id/url" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" android:singleLine="true" diff --git a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml index cbd1ff811751..a72c283d8812 100644 --- a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml +++ b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml @@ -15,18 +15,18 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical"> <FrameLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <SurfaceView android:id="@+id/surface_view" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_centerInParent="true" /> diff --git a/opengl/tests/gldual/res/layout/gldual_activity.xml b/opengl/tests/gldual/res/layout/gldual_activity.xml index f2d59c74edd5..d75acbcb3e7d 100644 --- a/opengl/tests/gldual/res/layout/gldual_activity.xml +++ b/opengl/tests/gldual/res/layout/gldual_activity.xml @@ -17,14 +17,14 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <android.opengl.GLSurfaceView android:id="@+id/gl1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> <com.android.gldual.GLDualGL2View android:id="@+id/gl2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> </LinearLayout> diff --git a/packages/SettingsProvider/res/values-da/strings.xml b/packages/SettingsProvider/res/values-da/strings.xml index f0afc0bbccb1..bc160f3a0ab6 100644 --- a/packages/SettingsProvider/res/values-da/strings.xml +++ b/packages/SettingsProvider/res/values-da/strings.xml @@ -15,5 +15,5 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="4567566098528588863">"Indstillingslagring"</string> + <string name="app_label" msgid="4567566098528588863">"Lagring af indstillinger"</string> </resources> diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index ab93d8c8e7eb..7686aa026e01 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -51,4 +51,10 @@ <!-- Default value for whether or not to pulse the notification LED when there is a pending notification --> <bool name="def_notification_pulse">true</bool> + + <bool name="def_mount_play_notification_snd">true</bool> + <bool name="def_mount_ums_autostart">false</bool> + <bool name="def_mount_ums_prompt">true</bool> + <bool name="def_mount_ums_notify_enabled">true</bool> + </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 983693019833..a1dca7e73a8d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -71,7 +71,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion' // is properly propagated through your change. Not doing so will result in a loss of user // settings. - private static final int DATABASE_VERSION = 45; + private static final int DATABASE_VERSION = 46; private Context mContext; @@ -558,8 +558,29 @@ public class DatabaseHelper extends SQLiteOpenHelper { db.execSQL("DROP INDEX IF EXISTS gservicesIndex1"); upgradeVersion = 45; } - - + + if (upgradeVersion == 45) { + /* + * New settings for MountService + */ + db.beginTransaction(); + try { + db.execSQL("INSERT INTO secure(name,value) values('" + + Settings.Secure.MOUNT_PLAY_NOTIFICATION_SND + "','1');"); + db.execSQL("INSERT INTO secure(name,value) values('" + + Settings.Secure.MOUNT_UMS_AUTOSTART + "','0');"); + db.execSQL("INSERT INTO secure(name,value) values('" + + Settings.Secure.MOUNT_UMS_PROMPT + "','1');"); + db.execSQL("INSERT INTO secure(name,value) values('" + + Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED + "','1');"); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + upgradeVersion = 46; + } + + if (upgradeVersion != currentVersion) { Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion + ", must wipe the settings provider"); @@ -888,7 +909,19 @@ public class DatabaseHelper extends SQLiteOpenHelper { "1".equals(SystemProperties.get("ro.allow.mock.location")) ? 1 : 0); loadSecure35Settings(stmt); - + + loadBooleanSetting(stmt, Settings.Secure.MOUNT_PLAY_NOTIFICATION_SND, + R.bool.def_mount_play_notification_snd); + + loadBooleanSetting(stmt, Settings.Secure.MOUNT_UMS_AUTOSTART, + R.bool.def_mount_ums_autostart); + + loadBooleanSetting(stmt, Settings.Secure.MOUNT_UMS_PROMPT, + R.bool.def_mount_ums_prompt); + + loadBooleanSetting(stmt, Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED, + R.bool.def_mount_ums_notify_enabled); + stmt.close(); } diff --git a/packages/TtsService/jni/android_tts_SynthProxy.cpp b/packages/TtsService/jni/android_tts_SynthProxy.cpp index 0ec8dabb9bdb..d114ea951efe 100644 --- a/packages/TtsService/jni/android_tts_SynthProxy.cpp +++ b/packages/TtsService/jni/android_tts_SynthProxy.cpp @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define LOG_NDEBUG 0 #include <stdio.h> #include <unistd.h> @@ -231,9 +230,8 @@ class SynthProxyJniStorage { mAudioOut = NULL; } else { //LOGI("AudioTrack OK"); - mAudioOut->setVolume(2.0f, 2.0f); - mAudioOut->start(); - LOGV("AudioTrack started"); + mAudioOut->setVolume(1.0f, 1.0f); + LOGV("AudioTrack ready"); } } }; diff --git a/packages/TtsService/src/android/tts/TtsService.java b/packages/TtsService/src/android/tts/TtsService.java index 23365c91c887..1efa5a3e5179 100755 --- a/packages/TtsService/src/android/tts/TtsService.java +++ b/packages/TtsService/src/android/tts/TtsService.java @@ -744,6 +744,7 @@ public class TtsService extends Service implements OnCompletionListener { String country = ""; String variant = ""; String speechRate = ""; + String engine = ""; if (speechItem.mParams != null){ for (int i = 0; i < speechItem.mParams.size() - 1; i = i + 2){ String param = speechItem.mParams.get(i); @@ -765,12 +766,17 @@ public class TtsService extends Service implements OnCompletionListener { } catch (NumberFormatException e) { streamType = DEFAULT_STREAM_TYPE; } + } else if (param.equals(TextToSpeech.Engine.KEY_PARAM_ENGINE)) { + engine = speechItem.mParams.get(i + 1); } } } } // Only do the synthesis if it has not been killed by a subsequent utterance. if (mKillList.get(speechItem) == null) { + if (engine.length() > 0) { + setEngine(engine); + } if (language.length() > 0){ setLanguage("", language, country, variant); } @@ -825,6 +831,7 @@ public class TtsService extends Service implements OnCompletionListener { String country = ""; String variant = ""; String speechRate = ""; + String engine = ""; if (speechItem.mParams != null){ for (int i = 0; i < speechItem.mParams.size() - 1; i = i + 2){ String param = speechItem.mParams.get(i); @@ -839,12 +846,17 @@ public class TtsService extends Service implements OnCompletionListener { variant = speechItem.mParams.get(i+1); } else if (param.equals(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID)){ utteranceId = speechItem.mParams.get(i+1); + } else if (param.equals(TextToSpeech.Engine.KEY_PARAM_ENGINE)) { + engine = speechItem.mParams.get(i + 1); } } } } // Only do the synthesis if it has not been killed by a subsequent utterance. if (mKillList.get(speechItem) == null){ + if (engine.length() > 0) { + setEngine(engine); + } if (language.length() > 0){ setLanguage("", language, country, variant); } diff --git a/packages/VpnServices/res/values-nb/strings.xml b/packages/VpnServices/res/values-nb/strings.xml index 506f99926de0..9aac82867b04 100644 --- a/packages/VpnServices/res/values-nb/strings.xml +++ b/packages/VpnServices/res/values-nb/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4589592829302498102">"VPN-tjenester"</string> - <string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> er VPN-tilkoblet"</string> - <string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> er VPN-frakoblet"</string> + <string name="vpn_notification_title_connected" msgid="8598654486956133580">"Koblet til VPNet <xliff:g id="PROFILENAME">%s</xliff:g>"</string> + <string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Koblet fra VPNet <xliff:g id="PROFILENAME">%s</xliff:g>"</string> <string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Trykk for å koble til et VPN på nytt"</string> </resources> diff --git a/packages/VpnServices/res/values-zh-rCN/strings.xml b/packages/VpnServices/res/values-zh-rCN/strings.xml index 940e210959f2..ee8878fa9876 100644 --- a/packages/VpnServices/res/values-zh-rCN/strings.xml +++ b/packages/VpnServices/res/values-zh-rCN/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4589592829302498102">"虚拟专用网服务"</string> - <string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN 已连接"</string> - <string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN 连接已断开"</string> + <string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN“<xliff:g id="PROFILENAME">%s</xliff:g>”已连接"</string> + <string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN“<xliff:g id="PROFILENAME">%s</xliff:g>”连接已断开"</string> <string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"轻触可重新连接到虚拟专用网。"</string> </resources> diff --git a/services/java/com/android/server/MountListener.java b/services/java/com/android/server/MountListener.java index 5eea335681e7..9443ff84921f 100644 --- a/services/java/com/android/server/MountListener.java +++ b/services/java/com/android/server/MountListener.java @@ -203,7 +203,7 @@ final class MountListener implements Runnable { // FMT: NNN Volume <label> <mountpoint> bad removal (<major>:<minor>) mService.notifyMediaBadRemoval(cooked[3]); } else { - Log.d(TAG, "Unhandled event {" + raw + "}"); + Log.w(TAG, "Unhandled event {" + raw + "}"); } } @@ -220,7 +220,7 @@ final class MountListener implements Runnable { */ private void sendCommand(String command, String argument) { synchronized (this) { - Log.d(TAG, "sendCommand {" + command + "} {" + argument + "}"); + // Log.d(TAG, "sendCommand {" + command + "} {" + argument + "}"); if (mOutputStream == null) { Log.e(TAG, "No connection to Vold", new IllegalStateException()); } else { @@ -364,7 +364,7 @@ final class MountListener implements Runnable { for (String line : rsp) { String []tok = line.split(" "); int code = Integer.parseInt(tok[0]); - if (code == ResponseCode.AsecPathResult) { + if (code == ResponseCode.AsecListResult) { rdata[idx++] = tok[1]; } else if (code == ResponseCode.CommandOkay) { return rdata; diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index 473cc7a598ed..cd17bd2e3ecf 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -30,9 +30,14 @@ import android.os.IMountService; import android.os.Environment; import android.os.SystemProperties; import android.os.UEventObserver; +import android.os.Handler; import android.text.TextUtils; import android.util.Log; +import android.provider.Settings; +import android.content.ContentResolver; +import android.database.ContentObserver; + import java.io.File; import java.io.FileReader; import java.lang.IllegalStateException; @@ -95,7 +100,10 @@ class MountService extends IMountService.Stub { private boolean mMounted; + private SettingsWatcher mSettingsWatcher; private boolean mAutoStartUms; + private boolean mPromptUms; + private boolean mUmsActiveNotify; private boolean mUmsConnected = false; private boolean mUmsEnabled = false; @@ -121,7 +129,72 @@ class MountService extends IMountService.Stub { mPlaySounds = SystemProperties.get("persist.service.mount.playsnd", "1").equals("1"); - mAutoStartUms = SystemProperties.get("persist.service.mount.umsauto", "0").equals("1"); + ContentResolver cr = mContext.getContentResolver(); + mAutoStartUms = (Settings.Secure.getInt( + cr, Settings.Secure.MOUNT_UMS_AUTOSTART, 0) == 1); + mPromptUms = (Settings.Secure.getInt( + cr, Settings.Secure.MOUNT_UMS_PROMPT, 1) == 1); + mUmsActiveNotify = (Settings.Secure.getInt( + cr, Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED, 1) == 1); + + mSettingsWatcher = new SettingsWatcher(new Handler()); + } + + private class SettingsWatcher extends ContentObserver { + public SettingsWatcher(Handler handler) { + super(handler); + ContentResolver cr = mContext.getContentResolver(); + cr.registerContentObserver(Settings.System.getUriFor( + Settings.Secure.MOUNT_PLAY_NOTIFICATION_SND), false, this); + cr.registerContentObserver(Settings.Secure.getUriFor( + Settings.Secure.MOUNT_UMS_AUTOSTART), false, this); + cr.registerContentObserver(Settings.Secure.getUriFor( + Settings.Secure.MOUNT_UMS_PROMPT), false, this); + cr.registerContentObserver(Settings.Secure.getUriFor( + Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED), false, this); + } + + public void onChange(boolean selfChange) { + super.onChange(selfChange); + ContentResolver cr = mContext.getContentResolver(); + + boolean newPlayNotificationSounds = (Settings.Secure.getInt( + cr, Settings.Secure.MOUNT_PLAY_NOTIFICATION_SND, 1) == 1); + + boolean newUmsAutostart = (Settings.Secure.getInt( + cr, Settings.Secure.MOUNT_UMS_AUTOSTART, 0) == 1); + + if (newUmsAutostart != mAutoStartUms) { + mAutoStartUms = newUmsAutostart; + } + + boolean newUmsPrompt = (Settings.Secure.getInt( + cr, Settings.Secure.MOUNT_UMS_PROMPT, 1) == 1); + + if (newUmsPrompt != mPromptUms) { + mPromptUms = newUmsAutostart; + } + + boolean newUmsNotifyEnabled = (Settings.Secure.getInt( + cr, Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED, 1) == 1); + + if (mUmsEnabled) { + if (newUmsNotifyEnabled) { + Intent intent = new Intent(); + intent.setClass(mContext, com.android.internal.app.UsbStorageStopActivity.class); + PendingIntent pi = PendingIntent.getActivity(mContext, 0, intent, 0); + setUsbStorageNotification(com.android.internal.R.string.usb_storage_stop_notification_title, + com.android.internal.R.string.usb_storage_stop_notification_message, + com.android.internal.R.drawable.stat_sys_warning, + false, true, pi); + } else { + setUsbStorageNotification(0, 0, 0, false, false, null); + } + } + if (newUmsNotifyEnabled != mUmsActiveNotify) { + mUmsActiveNotify = newUmsNotifyEnabled; + } + } } BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @@ -142,7 +215,7 @@ class MountService extends IMountService.Stub { throw new SecurityException("Requires SHUTDOWN permission"); } - Log.d(TAG, "Shutting down"); + Log.i(TAG, "Shutting down"); String state = Environment.getExternalStorageState(); if (state.equals(Environment.MEDIA_SHARED)) { @@ -205,13 +278,18 @@ class MountService extends IMountService.Stub { * @param enable true to enable USB mass storage support */ public void setMassStorageEnabled(boolean enable) throws IllegalStateException { + if (mContext.checkCallingOrSelfPermission( + android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("Requires MOUNT_UNMOUNT_FILESYSTEMS permission"); + } try { String vp = Environment.getExternalStorageDirectory().getPath(); String vs = getVolumeState(vp); if (enable && vs.equals(Environment.MEDIA_MOUNTED)) { - Log.d(TAG, "Unmounting media before UMS enable"); - unmountMedia(vp); + mListener.unmountVolume(vp); + updateUsbMassStorageNotification(true, false); } mListener.setShareMethodEnabled(Environment @@ -220,8 +298,12 @@ class MountService extends IMountService.Stub { "ums", enable); mUmsEnabled = enable; if (!enable) { - Log.d(TAG, "Mounting media after UMS disable"); mountMedia(vp); + if (mPromptUms) { + updateUsbMassStorageNotification(false, false); + } else { + updateUsbMassStorageNotification(true, false); + } } } catch (IllegalStateException rex) { Log.e(TAG, "Failed to set ums enable {" + enable + "}"); @@ -316,26 +398,6 @@ class MountService extends IMountService.Stub { SystemProperties.set("persist.service.mount.playsnd", (enabled ? "1" : "0")); } - /** - * Returns true if we auto-start UMS on cable insertion. - */ - public boolean getAutoStartUms() { - return mAutoStartUms; - } - - /** - * Set whether or not we're playing media notification sounds. - */ - public void setAutoStartUms(boolean enabled) { - if (mContext.checkCallingOrSelfPermission( - android.Manifest.permission.WRITE_SETTINGS) - != PackageManager.PERMISSION_GRANTED) { - throw new SecurityException("Requires WRITE_SETTINGS permission"); - } - mAutoStartUms = enabled; - SystemProperties.set("persist.service.mount.umsauto", (enabled ? "1" : "0")); - } - void updatePublicVolumeState(String mountPoint, String state) { if (!mountPoint.equals(Environment.getExternalStorageDirectory().getPath())) { Log.w(TAG, "Multiple volumes not currently supported"); @@ -387,7 +449,6 @@ class MountService extends IMountService.Stub { .equals(Environment.MEDIA_MOUNTED)) { try { mountMedia(Environment.getExternalStorageDirectory().getPath()); - Log.d(TAG, "Connection-mount suceeded"); } catch (Exception ex) { Log.w(TAG, "Connection-mount failed"); } @@ -395,7 +456,7 @@ class MountService extends IMountService.Stub { Log.d(TAG, "Skipping connection-mount; already mounted"); } } catch (IllegalStateException rex) { - Log.e(TAG, "Exception while handling connection mount " + rex); + Log.e(TAG, "Exception while handling connection mount ", rex); } try { @@ -456,7 +517,7 @@ class MountService extends IMountService.Stub { setMassStorageEnabled(true); } catch (IllegalStateException e) { } - } else { + } else if (mPromptUms) { updateUsbMassStorageNotification(false, true); } } @@ -465,17 +526,29 @@ class MountService extends IMountService.Stub { mContext.sendBroadcast(intent); } - void notifyShareAvailabilityChange(String method, boolean avail) { - Log.d(TAG, "Share method {" + method + "} availability now " + avail); + void notifyShareAvailabilityChange(String method, final boolean avail) { if (!method.equals("ums")) { Log.w(TAG, "Ignoring unsupported share method {" + method + "}"); return; } - if (avail) { - notifyUmsConnected(); - } else { - notifyUmsDisconnected(); - } + + /* + * Notification needs to run in a different thread as + * it may need to call back into vold + */ + new Thread() { + public void run() { + try { + if (avail) { + notifyUmsConnected(); + } else { + notifyUmsDisconnected(); + } + } catch (Exception ex) { + Log.w(TAG, "Failed to mount media on insertion"); + } + } + }.start(); } /** @@ -483,6 +556,14 @@ class MountService extends IMountService.Stub { */ void notifyUmsDisconnected() { mUmsConnected = false; + if (mUmsEnabled) { + try { + Log.w(TAG, "UMS disconnected while enabled!"); + setMassStorageEnabled(false); + } catch (Exception ex) { + Log.e(TAG, "Error disabling UMS on unsafe UMS disconnect", ex); + } + } updateUsbMassStorageNotification(false, false); Intent intent = new Intent(Intent.ACTION_UMS_DISCONNECTED); mContext.sendBroadcast(intent); @@ -492,10 +573,9 @@ class MountService extends IMountService.Stub { new Thread() { public void run() { try { - Log.d(TAG, "Mounting media after insertion"); mountMedia(path); } catch (Exception ex) { - Log.w(TAG, "Failed to mount media on insertion"); + Log.w(TAG, "Failed to mount media on insertion", ex); } } }.start(); @@ -522,7 +602,6 @@ class MountService extends IMountService.Stub { true, false, null); handlePossibleExplicitUnmountBroadcast(path); - // Log.d(TAG, "Sending ACTION_MEDIA_REMOVED"); Intent intent = new Intent(Intent.ACTION_MEDIA_REMOVED, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); @@ -547,7 +626,6 @@ class MountService extends IMountService.Stub { } updateUsbMassStorageNotification(false, false); - // Log.d(TAG, "Sending ACTION_MEDIA_UNMOUNTED"); Intent intent = new Intent(Intent.ACTION_MEDIA_UNMOUNTED, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); @@ -566,7 +644,6 @@ class MountService extends IMountService.Stub { true, false, null); updateUsbMassStorageNotification(true, false); - // Log.d(TAG, "Sending ACTION_MEDIA_CHECKING"); Intent intent = new Intent(Intent.ACTION_MEDIA_CHECKING, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); @@ -587,7 +664,6 @@ class MountService extends IMountService.Stub { com.android.internal.R.drawable.stat_notify_sdcard_usb, true, false, pi); updateUsbMassStorageNotification(false, false); - // Log.d(TAG, "Sending ACTION_MEDIA_NOFS"); intent = new Intent(Intent.ACTION_MEDIA_NOFS, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); @@ -601,7 +677,6 @@ class MountService extends IMountService.Stub { setMediaStorageNotification(0, 0, 0, false, false, null); updateUsbMassStorageNotification(false, false); - // Log.d(TAG, "Sending ACTION_MEDIA_MOUNTED"); Intent intent = new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.parse("file://" + path)); intent.putExtra("read-only", readOnly); @@ -620,16 +695,17 @@ class MountService extends IMountService.Stub { updatePublicVolumeState(path, Environment.MEDIA_SHARED); - Intent intent = new Intent(); - intent.setClass(mContext, com.android.internal.app.UsbStorageStopActivity.class); - PendingIntent pi = PendingIntent.getActivity(mContext, 0, intent, 0); - setUsbStorageNotification(com.android.internal.R.string.usb_storage_stop_notification_title, - com.android.internal.R.string.usb_storage_stop_notification_message, - com.android.internal.R.drawable.stat_sys_warning, - false, true, pi); + if (mUmsActiveNotify) { + Intent intent = new Intent(); + intent.setClass(mContext, com.android.internal.app.UsbStorageStopActivity.class); + PendingIntent pi = PendingIntent.getActivity(mContext, 0, intent, 0); + setUsbStorageNotification(com.android.internal.R.string.usb_storage_stop_notification_title, + com.android.internal.R.string.usb_storage_stop_notification_message, + com.android.internal.R.drawable.stat_sys_warning, + false, true, pi); + } handlePossibleExplicitUnmountBroadcast(path); - // Log.d(TAG, "Sending ACTION_MEDIA_SHARED"); - intent = new Intent(Intent.ACTION_MEDIA_SHARED, + Intent intent = new Intent(Intent.ACTION_MEDIA_SHARED, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); } @@ -647,7 +723,6 @@ class MountService extends IMountService.Stub { true, true, null); handlePossibleExplicitUnmountBroadcast(path); - // Log.d(TAG, "Sending ACTION_MEDIA_BAD_REMOVAL"); Intent intent = new Intent(Intent.ACTION_MEDIA_BAD_REMOVAL, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); @@ -671,7 +746,6 @@ class MountService extends IMountService.Stub { handlePossibleExplicitUnmountBroadcast(path); - // Log.d(TAG, "Sending ACTION_MEDIA_UNMOUNTABLE"); intent = new Intent(Intent.ACTION_MEDIA_UNMOUNTABLE, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); @@ -681,7 +755,6 @@ class MountService extends IMountService.Stub { * Broadcasts the media eject event to all clients. */ void notifyMediaUnmounting(String path) { - // Log.d(TAG, "Sending ACTION_MEDIA_EJECT"); Intent intent = new Intent(Intent.ACTION_MEDIA_EJECT, Uri.parse("file://" + path)); mContext.sendBroadcast(intent); @@ -815,28 +888,28 @@ class MountService extends IMountService.Stub { } } - public String[] getSecureCacheList() throws IllegalStateException { + public String[] getSecureContainerList() throws IllegalStateException { return mListener.listAsec(); } - public String createSecureCache(String id, int sizeMb, String fstype, + public String createSecureContainer(String id, int sizeMb, String fstype, String key, int ownerUid) throws IllegalStateException { return mListener.createAsec(id, sizeMb, fstype, key, ownerUid); } - public void finalizeSecureCache(String id) throws IllegalStateException { + public void finalizeSecureContainer(String id) throws IllegalStateException { mListener.finalizeAsec(id); } - public void destroySecureCache(String id) throws IllegalStateException { + public void destroySecureContainer(String id) throws IllegalStateException { mListener.destroyAsec(id); } - public String mountSecureCache(String id, String key, int ownerUid) throws IllegalStateException { + public String mountSecureContainer(String id, String key, int ownerUid) throws IllegalStateException { return mListener.mountAsec(id, key, ownerUid); } - public String getSecureCachePath(String id) throws IllegalStateException { + public String getSecureContainerPath(String id) throws IllegalStateException { return mListener.getAsecPath(id); } diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 6fab96b4643a..de3dcb01cee8 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -333,16 +333,18 @@ public class WifiService extends IWifiManager.Stub { setWifiEnabledState(enable ? WIFI_STATE_ENABLING : WIFI_STATE_DISABLING, uid); if (enable) { - if (!WifiNative.loadDriver()) { - Log.e(TAG, "Failed to load Wi-Fi driver."); - setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); - return false; - } - if (!WifiNative.startSupplicant()) { - WifiNative.unloadDriver(); - Log.e(TAG, "Failed to start supplicant daemon."); - setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); - return false; + synchronized (mWifiStateTracker) { + if (!WifiNative.loadDriver()) { + Log.e(TAG, "Failed to load Wi-Fi driver."); + setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); + return false; + } + if (!WifiNative.startSupplicant()) { + WifiNative.unloadDriver(); + Log.e(TAG, "Failed to start supplicant daemon."); + setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); + return false; + } } registerForBroadcasts(); mWifiStateTracker.startEventLoop(); @@ -353,21 +355,23 @@ public class WifiService extends IWifiManager.Stub { mWifiStateTracker.setNotificationVisible(false, 0, false, 0); boolean failedToStopSupplicantOrUnloadDriver = false; - if (!WifiNative.stopSupplicant()) { - Log.e(TAG, "Failed to stop supplicant daemon."); - setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); - failedToStopSupplicantOrUnloadDriver = true; - } - - // We must reset the interface before we unload the driver - mWifiStateTracker.resetInterface(false); - - if (!WifiNative.unloadDriver()) { - Log.e(TAG, "Failed to unload Wi-Fi driver."); - if (!failedToStopSupplicantOrUnloadDriver) { + synchronized (mWifiStateTracker) { + if (!WifiNative.stopSupplicant()) { + Log.e(TAG, "Failed to stop supplicant daemon."); setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); failedToStopSupplicantOrUnloadDriver = true; } + + // We must reset the interface before we unload the driver + mWifiStateTracker.resetInterface(false); + + if (!WifiNative.unloadDriver()) { + Log.e(TAG, "Failed to unload Wi-Fi driver."); + if (!failedToStopSupplicantOrUnloadDriver) { + setWifiEnabledState(WIFI_STATE_UNKNOWN, uid); + failedToStopSupplicantOrUnloadDriver = true; + } + } } if (failedToStopSupplicantOrUnloadDriver) { return false; @@ -380,7 +384,6 @@ public class WifiService extends IWifiManager.Stub { persistWifiEnabled(enable); } setWifiEnabledState(eventualWifiState, uid); - return true; } @@ -698,7 +701,7 @@ public class WifiService extends IWifiManager.Stub { * @return the supplicant-assigned identifier for the new or updated * network if the operation succeeds, or {@code -1} if it fails */ - public synchronized int addOrUpdateNetwork(WifiConfiguration config) { + public int addOrUpdateNetwork(WifiConfiguration config) { enforceChangePermission(); /* * If the supplied networkId is -1, we create a new empty @@ -710,41 +713,41 @@ public class WifiService extends IWifiManager.Stub { boolean doReconfig; int currentPriority; // networkId of -1 means we want to create a new network - if (newNetwork) { - netId = WifiNative.addNetworkCommand(); - if (netId < 0) { - if (DBG) { - Log.d(TAG, "Failed to add a network!"); + synchronized (mWifiStateTracker) { + if (newNetwork) { + netId = WifiNative.addNetworkCommand(); + if (netId < 0) { + if (DBG) { + Log.d(TAG, "Failed to add a network!"); + } + return -1; } - return -1; - } - doReconfig = true; - } else { - String priorityVal = WifiNative.getNetworkVariableCommand(netId, WifiConfiguration.priorityVarName); - currentPriority = -1; - if (!TextUtils.isEmpty(priorityVal)) { - try { - currentPriority = Integer.parseInt(priorityVal); - } catch (NumberFormatException ignore) { + doReconfig = true; + } else { + String priorityVal = WifiNative.getNetworkVariableCommand(netId, WifiConfiguration.priorityVarName); + currentPriority = -1; + if (!TextUtils.isEmpty(priorityVal)) { + try { + currentPriority = Integer.parseInt(priorityVal); + } catch (NumberFormatException ignore) { + } } + doReconfig = currentPriority != config.priority; } - doReconfig = currentPriority != config.priority; - } - mNeedReconfig = mNeedReconfig || doReconfig; + mNeedReconfig = mNeedReconfig || doReconfig; - setVariables: { + setVariables: { /* * Note that if a networkId for a non-existent network * was supplied, then the first setNetworkVariableCommand() * will fail, so we don't bother to make a separate check * for the validity of the ID up front. */ - if (config.SSID != null && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.ssidVarName, - convertToQuotedString(config.SSID))) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.ssidVarName, + convertToQuotedString(config.SSID))) { if (DBG) { Log.d(TAG, "failed to set SSID: "+config.SSID); } @@ -752,10 +755,10 @@ public class WifiService extends IWifiManager.Stub { } if (config.BSSID != null && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.bssidVarName, - config.BSSID)) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.bssidVarName, + config.BSSID)) { if (DBG) { Log.d(TAG, "failed to set BSSID: "+config.BSSID); } @@ -765,13 +768,13 @@ public class WifiService extends IWifiManager.Stub { String allowedKeyManagementString = makeString(config.allowedKeyManagement, WifiConfiguration.KeyMgmt.strings); if (config.allowedKeyManagement.cardinality() != 0 && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.KeyMgmt.varName, - allowedKeyManagementString)) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.KeyMgmt.varName, + allowedKeyManagementString)) { if (DBG) { Log.d(TAG, "failed to set key_mgmt: "+ - allowedKeyManagementString); + allowedKeyManagementString); } break setVariables; } @@ -779,13 +782,13 @@ public class WifiService extends IWifiManager.Stub { String allowedProtocolsString = makeString(config.allowedProtocols, WifiConfiguration.Protocol.strings); if (config.allowedProtocols.cardinality() != 0 && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.Protocol.varName, - allowedProtocolsString)) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.Protocol.varName, + allowedProtocolsString)) { if (DBG) { Log.d(TAG, "failed to set proto: "+ - allowedProtocolsString); + allowedProtocolsString); } break setVariables; } @@ -793,13 +796,13 @@ public class WifiService extends IWifiManager.Stub { String allowedAuthAlgorithmsString = makeString(config.allowedAuthAlgorithms, WifiConfiguration.AuthAlgorithm.strings); if (config.allowedAuthAlgorithms.cardinality() != 0 && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.AuthAlgorithm.varName, - allowedAuthAlgorithmsString)) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.AuthAlgorithm.varName, + allowedAuthAlgorithmsString)) { if (DBG) { Log.d(TAG, "failed to set auth_alg: "+ - allowedAuthAlgorithmsString); + allowedAuthAlgorithmsString); } break setVariables; } @@ -807,13 +810,13 @@ public class WifiService extends IWifiManager.Stub { String allowedPairwiseCiphersString = makeString(config.allowedPairwiseCiphers, WifiConfiguration.PairwiseCipher.strings); if (config.allowedPairwiseCiphers.cardinality() != 0 && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.PairwiseCipher.varName, - allowedPairwiseCiphersString)) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.PairwiseCipher.varName, + allowedPairwiseCiphersString)) { if (DBG) { Log.d(TAG, "failed to set pairwise: "+ - allowedPairwiseCiphersString); + allowedPairwiseCiphersString); } break setVariables; } @@ -821,13 +824,13 @@ public class WifiService extends IWifiManager.Stub { String allowedGroupCiphersString = makeString(config.allowedGroupCiphers, WifiConfiguration.GroupCipher.strings); if (config.allowedGroupCiphers.cardinality() != 0 && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.GroupCipher.varName, - allowedGroupCiphersString)) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.GroupCipher.varName, + allowedGroupCiphersString)) { if (DBG) { Log.d(TAG, "failed to set group: "+ - allowedGroupCiphersString); + allowedGroupCiphersString); } break setVariables; } @@ -835,10 +838,10 @@ public class WifiService extends IWifiManager.Stub { // Prevent client screw-up by passing in a WifiConfiguration we gave it // by preventing "*" as a key. if (config.preSharedKey != null && !config.preSharedKey.equals("*") && - !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.pskVarName, - config.preSharedKey)) { + !WifiNative.setNetworkVariableCommand( + netId, + WifiConfiguration.pskVarName, + config.preSharedKey)) { if (DBG) { Log.d(TAG, "failed to set psk: "+config.preSharedKey); } @@ -852,13 +855,13 @@ public class WifiService extends IWifiManager.Stub { // by preventing "*" as a key. if (config.wepKeys[i] != null && !config.wepKeys[i].equals("*")) { if (!WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.wepKeyVarNames[i], - config.wepKeys[i])) { + netId, + WifiConfiguration.wepKeyVarNames[i], + config.wepKeys[i])) { if (DBG) { Log.d(TAG, - "failed to set wep_key"+i+": " + - config.wepKeys[i]); + "failed to set wep_key"+i+": " + + config.wepKeys[i]); } break setVariables; } @@ -869,36 +872,36 @@ public class WifiService extends IWifiManager.Stub { if (hasSetKey) { if (!WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.wepTxKeyIdxVarName, - Integer.toString(config.wepTxKeyIndex))) { + netId, + WifiConfiguration.wepTxKeyIdxVarName, + Integer.toString(config.wepTxKeyIndex))) { if (DBG) { Log.d(TAG, - "failed to set wep_tx_keyidx: "+ - config.wepTxKeyIndex); + "failed to set wep_tx_keyidx: "+ + config.wepTxKeyIndex); } break setVariables; } } if (!WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.priorityVarName, - Integer.toString(config.priority))) { + netId, + WifiConfiguration.priorityVarName, + Integer.toString(config.priority))) { if (DBG) { Log.d(TAG, config.SSID + ": failed to set priority: " - +config.priority); + +config.priority); } break setVariables; } if (config.hiddenSSID && !WifiNative.setNetworkVariableCommand( - netId, - WifiConfiguration.hiddenSSIDVarName, - Integer.toString(config.hiddenSSID ? 1 : 0))) { + netId, + WifiConfiguration.hiddenSSIDVarName, + Integer.toString(config.hiddenSSID ? 1 : 0))) { if (DBG) { Log.d(TAG, config.SSID + ": failed to set hiddenSSID: "+ - config.hiddenSSID); + config.hiddenSSID); } break setVariables; } @@ -912,32 +915,33 @@ public class WifiService extends IWifiManager.Stub { value = convertToQuotedString(value); } if (!WifiNative.setNetworkVariableCommand( - netId, - varName, - value)) { + netId, + varName, + value)) { if (DBG) { Log.d(TAG, config.SSID + ": failed to set " + varName + - ": " + value); + ": " + value); } break setVariables; } } } return netId; - } + } - /* - * For an update, if one of the setNetworkVariable operations fails, - * we might want to roll back all the changes already made. But the - * chances are that if anything is going to go wrong, it'll happen - * the first time we try to set one of the variables. - */ - if (newNetwork) { - removeNetwork(netId); - if (DBG) { - Log.d(TAG, - "Failed to set a network variable, removed network: " - + netId); + /* + * For an update, if one of the setNetworkVariable operations fails, + * we might want to roll back all the changes already made. But the + * chances are that if anything is going to go wrong, it'll happen + * the first time we try to set one of the variables. + */ + if (newNetwork) { + removeNetwork(netId); + if (DBG) { + Log.d(TAG, + "Failed to set a network variable, removed network: " + + netId); + } } } return -1; @@ -1849,13 +1853,14 @@ public class WifiService extends IWifiManager.Stub { public void initializeMulticastFiltering() { enforceMulticastChangePermission(); - synchronized (mMulticasters) { // if anybody had requested filters be off, leave off if (mMulticasters.size() != 0) { return; } else { - WifiNative.startPacketFiltering(); + synchronized (mWifiStateTracker) { + WifiNative.startPacketFiltering(); + } } } } diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 9270a8297374..1d14e5e65684 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -7095,8 +7095,8 @@ public class WindowManagerService extends IWindowManager.Stub w = mAttrs.width < 0 ? pw : mAttrs.width; h = mAttrs.height< 0 ? ph : mAttrs.height; } else { - w = mAttrs.width == mAttrs.FILL_PARENT ? pw : mRequestedWidth; - h = mAttrs.height== mAttrs.FILL_PARENT ? ph : mRequestedHeight; + w = mAttrs.width == mAttrs.MATCH_PARENT ? pw : mRequestedWidth; + h = mAttrs.height== mAttrs.MATCH_PARENT ? ph : mRequestedHeight; } final Rect content = mContentFrame; @@ -10136,8 +10136,8 @@ public class WindowManagerService extends IWindowManager.Stub if (displayed) { if (!covered) { - if (attrs.width == LayoutParams.FILL_PARENT - && attrs.height == LayoutParams.FILL_PARENT) { + if (attrs.width == LayoutParams.MATCH_PARENT + && attrs.height == LayoutParams.MATCH_PARENT) { covered = true; } } diff --git a/services/java/com/android/server/status/StatusBarIcon.java b/services/java/com/android/server/status/StatusBarIcon.java index 857784b44577..b20d3f6dd005 100644 --- a/services/java/com/android/server/status/StatusBarIcon.java +++ b/services/java/com/android/server/status/StatusBarIcon.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.Typeface; -import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; @@ -12,7 +11,6 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -41,7 +39,7 @@ class StatusBarIcon { mTextView = t; LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.FILL_PARENT); + LinearLayout.LayoutParams.MATCH_PARENT); t.setTextSize(16); t.setTextColor(0xff000000); t.setTypeface(Typeface.DEFAULT_BOLD); diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java index 34921d66cdc8..0a731a88c360 100644 --- a/services/java/com/android/server/status/StatusBarService.java +++ b/services/java/com/android/server/status/StatusBarService.java @@ -329,7 +329,7 @@ public class StatusBarService extends IStatusBar.Stub public void systemReady() { final StatusBarView view = mStatusBarView; WindowManager.LayoutParams lp = new WindowManager.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, view.getContext().getResources().getDimensionPixelSize( com.android.internal.R.dimen.status_bar_height), WindowManager.LayoutParams.TYPE_STATUS_BAR, @@ -1486,8 +1486,8 @@ public class StatusBarService extends IStatusBar.Stub } lp = new WindowManager.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL, WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS @@ -1520,7 +1520,7 @@ public class StatusBarService extends IStatusBar.Stub final int disph = mDisplay.getHeight(); lp = mExpandedDialog.getWindow().getAttributes(); - lp.width = ViewGroup.LayoutParams.FILL_PARENT; + lp.width = ViewGroup.LayoutParams.MATCH_PARENT; lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; lp.x = 0; mTrackingPosition = lp.y = -disph; // sufficiently large negative @@ -1539,7 +1539,7 @@ public class StatusBarService extends IStatusBar.Stub mExpandedDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); mExpandedDialog.setContentView(mExpandedView, - new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, + new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); mExpandedDialog.show(); FrameLayout hack = (FrameLayout)mExpandedView.getParent(); diff --git a/services/jni/com_android_server_SensorService.cpp b/services/jni/com_android_server_SensorService.cpp index 3911d1f1400f..77db6da22a6e 100644 --- a/services/jni/com_android_server_SensorService.cpp +++ b/services/jni/com_android_server_SensorService.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "SensorService" -#define LOG_NDEBUG 0 #include "utils/Log.h" #include <hardware/sensors.h> diff --git a/tests/AndroidTests/res/layout/layout_five.xml b/tests/AndroidTests/res/layout/layout_five.xml index fd1e0efde33f..9923eaf0fdd2 100644 --- a/tests/AndroidTests/res/layout/layout_five.xml +++ b/tests/AndroidTests/res/layout/layout_five.xml @@ -17,6 +17,6 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <TextView android:id="@+id/text" android:text="@string/layout_five_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView android:id="@+id/text" android:text="@string/layout_five_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/AndroidTests/res/layout/layout_one.xml b/tests/AndroidTests/res/layout/layout_one.xml index f5c78bd46a9c..c326b2baf01f 100644 --- a/tests/AndroidTests/res/layout/layout_one.xml +++ b/tests/AndroidTests/res/layout/layout_one.xml @@ -17,4 +17,4 @@ ** limitations under the License. */ --> -<view xmlns:android="http://schemas.android.com/apk/res/android" class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<view xmlns:android="http://schemas.android.com/apk/res/android" class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/tests/AndroidTests/res/layout/layout_six.xml b/tests/AndroidTests/res/layout/layout_six.xml index 6efcdf362016..b78082d164e8 100644 --- a/tests/AndroidTests/res/layout/layout_six.xml +++ b/tests/AndroidTests/res/layout/layout_six.xml @@ -17,11 +17,11 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="fill_parent" android:layout_height="wrap_content" /> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/AndroidTests/res/layout/layout_tag.xml b/tests/AndroidTests/res/layout/layout_tag.xml index 1f1770111ba0..72874a6d5b93 100644 --- a/tests/AndroidTests/res/layout/layout_tag.xml +++ b/tests/AndroidTests/res/layout/layout_tag.xml @@ -20,4 +20,4 @@ <view xmlns:android="http://schemas.android.com/apk/res/android" class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:tag="MyTag" - android:layout_width="fill_parent" android:layout_height="fill_parent"/> + android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/tests/AndroidTests/res/layout/layout_three.xml b/tests/AndroidTests/res/layout/layout_three.xml index 77b2aa9f890f..7b1ccc54149a 100644 --- a/tests/AndroidTests/res/layout/layout_three.xml +++ b/tests/AndroidTests/res/layout/layout_three.xml @@ -17,11 +17,11 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view1" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view2" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view3" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view4" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view5" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view6" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view1" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view2" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view3" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view4" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view5" android:layout_width="match_parent" android:layout_height="match_parent"/> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/view6" android:layout_width="match_parent" android:layout_height="match_parent"/> </LinearLayout> diff --git a/tests/AndroidTests/res/layout/layout_two.xml b/tests/AndroidTests/res/layout/layout_two.xml index 9c997104f26e..af14228f98b5 100644 --- a/tests/AndroidTests/res/layout/layout_two.xml +++ b/tests/AndroidTests/res/layout/layout_two.xml @@ -17,7 +17,7 @@ ** limitations under the License. */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <view class="com.android.unit_tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/> </LinearLayout> diff --git a/tests/AndroidTests/res/raw/medium.xml b/tests/AndroidTests/res/raw/medium.xml index 51c952c32879..5757a24e290f 100644 --- a/tests/AndroidTests/res/raw/medium.xml +++ b/tests/AndroidTests/res/raw/medium.xml @@ -17,11 +17,11 @@ ** limitations under the License. */ --> -<LinearLayout id="@+id/content" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <TextView id="@+id/text" android:text="S" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="M" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="T" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="W" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="H" android:layout_width="fill_parent" android:layout_height="wrap_content" /> - <TextView id="@+id/text" android:text="F" android:layout_width="fill_parent" android:layout_height="wrap_content" /> +<LinearLayout id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView id="@+id/text" android:text="S" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="M" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="T" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="W" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="H" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <TextView id="@+id/text" android:text="F" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/AndroidTests/res/raw/small.xml b/tests/AndroidTests/res/raw/small.xml index 2697fb8b4651..ee859b99b217 100644 --- a/tests/AndroidTests/res/raw/small.xml +++ b/tests/AndroidTests/res/raw/small.xml @@ -17,4 +17,4 @@ ** limitations under the License. */ --> -<view class="com.android.tests.InflateTest$ViewOne" id="@+id/viewOne" android:layout_width="fill_parent" android:layout_height="fill_parent"/> +<view class="com.android.tests.InflateTest$ViewOne" id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java b/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java index 342094dfba7c..0c57ac4fa77e 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/CreateViewTest.java @@ -21,7 +21,7 @@ import android.test.AndroidTestCase; import android.test.PerformanceTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.view.View; -import static android.view.ViewGroup.LayoutParams.FILL_PARENT; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import android.widget.LinearLayout; import android.widget.TextView; @@ -45,7 +45,7 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa public void testLayout2() throws Exception { LinearLayout vert = new LinearLayout(mContext); vert.addView(new CreateViewTest.ViewOne(mContext), - new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); } @SmallTest @@ -53,22 +53,22 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa LinearLayout vert = new LinearLayout(mContext); ViewOne one = new ViewOne(mContext); - vert.addView(one, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(one, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne two = new ViewOne(mContext); - vert.addView(two, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(two, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne three = new ViewOne(mContext); - vert.addView(three, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(three, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne four = new ViewOne(mContext); - vert.addView(four, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(four, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne five = new ViewOne(mContext); - vert.addView(five, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(five, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); ViewOne six = new ViewOne(mContext); - vert.addView(six, new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT, 0)); + vert.addView(six, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0)); } @SmallTest @@ -83,7 +83,7 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa text.setText("S"); LinearLayout vert = new LinearLayout(mContext); - vert.addView(text, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(text, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); } @SmallTest @@ -92,27 +92,27 @@ public class CreateViewTest extends AndroidTestCase implements PerformanceTestCa TextView one = new TextView(mContext); one.setText("S"); - vert.addView(one, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(one, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView two = new TextView(mContext); two.setText("M"); - vert.addView(two, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(two, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView three = new TextView(mContext); three.setText("T"); - vert.addView(three, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(three, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView four = new TextView(mContext); four.setText("W"); - vert.addView(four, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(four, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView five = new TextView(mContext); five.setText("H"); - vert.addView(five, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(five, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); TextView six = new TextView(mContext); six.setText("F"); - vert.addView(six, new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0)); + vert.addView(six, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0)); } public static class ViewOne extends View { diff --git a/tests/BatteryWaster/res/layout/battery_waster.xml b/tests/BatteryWaster/res/layout/battery_waster.xml index b6eab03bc8f1..e1cb6bff1c68 100644 --- a/tests/BatteryWaster/res/layout/battery_waster.xml +++ b/tests/BatteryWaster/res/layout/battery_waster.xml @@ -15,13 +15,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <CheckBox android:id="@+id/checkbox" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="25dp" android:layout_marginTop="25dp" @@ -31,12 +31,12 @@ /> <ScrollView android:id="@+id/scroll" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" > <TextView android:id="@+id/log" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="25dp" android:textSize="12sp" diff --git a/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java b/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java index 77e390b2fd65..e750ac854040 100644 --- a/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java +++ b/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java @@ -65,8 +65,8 @@ public class PowerTestActivity extends Activity { webView.setWebChromeClient(chromeClient); contentView.addView(webView, new LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT, 0.0f)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0.0f)); handler = new Handler() { @Override diff --git a/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java b/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java index ae53b7666960..cde2c719933f 100644 --- a/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java +++ b/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java @@ -141,20 +141,20 @@ public class DpiTestActivity extends Activity { private View scrollWrap(View view) { ScrollView scroller = new ScrollView(this); - scroller.addView(view, new ScrollView.LayoutParams(ScrollView.LayoutParams.FILL_PARENT, - ScrollView.LayoutParams.FILL_PARENT)); + scroller.addView(view, new ScrollView.LayoutParams(ScrollView.LayoutParams.MATCH_PARENT, + ScrollView.LayoutParams.MATCH_PARENT)); return scroller; } private void addLabelToRoot(LinearLayout root, String text) { TextView label = new TextView(this); label.setText(text); - root.addView(label, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, + root.addView(label, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)); } private void addChildToRoot(LinearLayout root, LinearLayout layout) { - root.addView(layout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, + root.addView(layout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)); } diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java index fbce78afa41b..9a4e99ea7bda 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java @@ -85,8 +85,8 @@ public class ReliabilityTestActivity extends Activity { webView.setWebChromeClient(chromeClient); contentView.addView(webView, new LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT, 0.0f)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0.0f)); handler = new Handler() { @Override diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index b6b16618091b..5763b85e04b3 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -126,7 +126,7 @@ public class TestShellActivity extends Activity implements LayoutTestController mWebView.addJavascriptInterface(mCallbackProxy, "eventSender"); setupWebViewForLayoutTests(mWebView, mCallbackProxy); - contentView.addView(mWebView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT, 0.0f)); + contentView.addView(mWebView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, 0.0f)); mWebView.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL); diff --git a/tests/FrameworkTest/res/layout/add_column_in_table.xml b/tests/FrameworkTest/res/layout/add_column_in_table.xml index 62c27f31023a..05f55a8b360e 100644 --- a/tests/FrameworkTest/res/layout/add_column_in_table.xml +++ b/tests/FrameworkTest/res/layout/add_column_in_table.xml @@ -16,11 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TableLayout android:id="@+id/table" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1.0"> diff --git a/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml b/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml index d408a86919aa..1a2007640e94 100644 --- a/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml +++ b/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml @@ -20,12 +20,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <AutoCompleteTextView android:id="@+id/autocompletetextview1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text|textAutoComplete" android:completionThreshold="1" /> diff --git a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml b/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml index 83f3fcbf64b8..aa3132d3ea50 100644 --- a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml +++ b/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml @@ -19,10 +19,10 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:id="@+id/layout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:visibility="gone"> diff --git a/tests/FrameworkTest/res/layout/baseline_buttons.xml b/tests/FrameworkTest/res/layout/baseline_buttons.xml index ae942017bb14..3e364bdfd0f1 100644 --- a/tests/FrameworkTest/res/layout/baseline_buttons.xml +++ b/tests/FrameworkTest/res/layout/baseline_buttons.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> diff --git a/tests/FrameworkTest/res/layout/baseline_center_gravity.xml b/tests/FrameworkTest/res/layout/baseline_center_gravity.xml index 9793ab42357b..dd1318d310dc 100644 --- a/tests/FrameworkTest/res/layout/baseline_center_gravity.xml +++ b/tests/FrameworkTest/res/layout/baseline_center_gravity.xml @@ -19,7 +19,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/button1" android:layout_height="wrap_content" diff --git a/tests/FrameworkTest/res/layout/descendant_focusability.xml b/tests/FrameworkTest/res/layout/descendant_focusability.xml index 6a30d50dd2dc..0cb75fdb6a06 100644 --- a/tests/FrameworkTest/res/layout/descendant_focusability.xml +++ b/tests/FrameworkTest/res/layout/descendant_focusability.xml @@ -20,19 +20,19 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" > <LinearLayout android:id="@+id/beforeDescendants" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="beforeDescendants" > <Button - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> @@ -40,12 +40,12 @@ <LinearLayout android:id="@+id/afterDescendants" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="afterDescendants" > <Button - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> @@ -53,12 +53,12 @@ <LinearLayout android:id="@+id/blocksDescendants" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="blocksDescendants" > <Button - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/disabled.xml b/tests/FrameworkTest/res/layout/disabled.xml index ed7ff0640cf2..4b4124863322 100644 --- a/tests/FrameworkTest/res/layout/disabled.xml +++ b/tests/FrameworkTest/res/layout/disabled.xml @@ -23,8 +23,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/clickableParent" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/disabledButton" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/fill_in_wrap.xml b/tests/FrameworkTest/res/layout/fill_in_wrap.xml index b61fd306cc52..1c3f8110f5b5 100644 --- a/tests/FrameworkTest/res/layout/fill_in_wrap.xml +++ b/tests/FrameworkTest/res/layout/fill_in_wrap.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:baselineAligned="false" @@ -28,7 +28,7 @@ /> <LinearLayout android:id="@+id/layout" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="0dip" android:paddingRight="0dip" @@ -43,7 +43,7 @@ <EditText android:id="@+id/data" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_marginLeft="8dip" android:paddingBottom="4dip" android:layout_gravity="center_vertical" diff --git a/tests/FrameworkTest/res/layout/focus_after_removal.xml b/tests/FrameworkTest/res/layout/focus_after_removal.xml index 7cf6cbe2921a..f4e388d695c9 100644 --- a/tests/FrameworkTest/res/layout/focus_after_removal.xml +++ b/tests/FrameworkTest/res/layout/focus_after_removal.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <LinearLayout android:id="@+id/leftLayout" diff --git a/tests/FrameworkTest/res/layout/focus_listener.xml b/tests/FrameworkTest/res/layout/focus_listener.xml index a8382053cb5e..6faa21c32013 100644 --- a/tests/FrameworkTest/res/layout/focus_listener.xml +++ b/tests/FrameworkTest/res/layout/focus_listener.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/left" diff --git a/tests/FrameworkTest/res/layout/framelayout_gravity.xml b/tests/FrameworkTest/res/layout/framelayout_gravity.xml index ce488252b31a..e89fce596935 100644 --- a/tests/FrameworkTest/res/layout/framelayout_gravity.xml +++ b/tests/FrameworkTest/res/layout/framelayout_gravity.xml @@ -16,8 +16,8 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parent" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/left" android:layout_gravity="left" diff --git a/tests/FrameworkTest/res/layout/framelayout_margin.xml b/tests/FrameworkTest/res/layout/framelayout_margin.xml index 1e14899b9bad..9120bcb52a4e 100644 --- a/tests/FrameworkTest/res/layout/framelayout_margin.xml +++ b/tests/FrameworkTest/res/layout/framelayout_margin.xml @@ -16,8 +16,8 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parent" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/left" android:layout_gravity="left" diff --git a/tests/FrameworkTest/res/layout/grid_in_horizontal.xml b/tests/FrameworkTest/res/layout/grid_in_horizontal.xml index 835dce3d481c..62d7bcb53021 100644 --- a/tests/FrameworkTest/res/layout/grid_in_horizontal.xml +++ b/tests/FrameworkTest/res/layout/grid_in_horizontal.xml @@ -16,12 +16,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:padding="10dip" android:verticalSpacing="10dp" diff --git a/tests/FrameworkTest/res/layout/grid_in_vertical.xml b/tests/FrameworkTest/res/layout/grid_in_vertical.xml index 731bc5412f9b..fea459aa1319 100644 --- a/tests/FrameworkTest/res/layout/grid_in_vertical.xml +++ b/tests/FrameworkTest/res/layout/grid_in_vertical.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/grid_scroll_listener.xml b/tests/FrameworkTest/res/layout/grid_scroll_listener.xml index c02aed93c825..82b1058a8eda 100644 --- a/tests/FrameworkTest/res/layout/grid_scroll_listener.xml +++ b/tests/FrameworkTest/res/layout/grid_scroll_listener.xml @@ -16,11 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:padding="10dip" @@ -32,7 +32,7 @@ android:gravity="center"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/grid_thrasher.xml b/tests/FrameworkTest/res/layout/grid_thrasher.xml index 1a260df8de59..346acff9f9c3 100644 --- a/tests/FrameworkTest/res/layout/grid_thrasher.xml +++ b/tests/FrameworkTest/res/layout/grid_thrasher.xml @@ -16,12 +16,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView android:id="@+id/grid" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:padding="10dip" android:verticalSpacing="10dp" android:horizontalSpacing="10dp" @@ -31,7 +31,7 @@ android:gravity="center"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/include_tag.xml b/tests/FrameworkTest/res/layout/include_tag.xml index d1047f1d8168..b2f6ab1cf632 100644 --- a/tests/FrameworkTest/res/layout/include_tag.xml +++ b/tests/FrameworkTest/res/layout/include_tag.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TextView android:text="@string/include_label" diff --git a/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml b/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml index d01e7c528a60..6f683e530957 100644 --- a/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml +++ b/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml @@ -16,5 +16,5 @@ <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/elv" - android:layout_height="fill_parent" - android:layout_width="fill_parent" /> + android:layout_height="match_parent" + android:layout_width="match_parent" /> diff --git a/tests/FrameworkTest/res/layout/linear_layout_buttons.xml b/tests/FrameworkTest/res/layout/linear_layout_buttons.xml index f60692add8ef..bcb28e7df03a 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_buttons.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_buttons.xml @@ -20,26 +20,26 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/button1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_one"/> <Button android:id="@+id/button2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_two"/> <Button android:id="@+id/button3" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_three"/> diff --git a/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml b/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml index 21e7399ba6d7..ab76e29c5fa1 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml @@ -20,18 +20,18 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <EditText android:id="@+id/editText" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1"/> <Button android:id="@+id/button" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:text="@string/keypad_one"/> diff --git a/tests/FrameworkTest/res/layout/linear_layout_grid.xml b/tests/FrameworkTest/res/layout/linear_layout_grid.xml index 81f7b15dee51..67b687705f33 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_grid.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_grid.xml @@ -20,80 +20,80 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:id="@+id/column1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:orientation="horizontal"> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_one"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_two"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_three"/> </LinearLayout> <LinearLayout android:id="@+id/column2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:orientation="horizontal"> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_four"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_five"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_six"/> </LinearLayout> <LinearLayout android:id="@+id/column3" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0sp" android:layout_weight="1" android:orientation="horizontal"> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_seven"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_eight"/> <Button android:layout_width="0sp" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:text="@string/keypad_nine"/> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml b/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml index 10ef2ce16a9e..873b2d264a56 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml @@ -20,19 +20,19 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- Outer linear layout providing vertical layout --> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <!-- The control buttons --> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <Button @@ -58,7 +58,7 @@ <ListView android:id="@+id/inner_list" android:layout_width="200dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:background="@android:drawable/spinner_dropdown_background" android:divider="@android:drawable/divider_horizontal_bright" /> diff --git a/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml b/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml index 7ed245b79a12..53c028087b1f 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml @@ -20,7 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Spinner android:id="@+id/reminder_value" diff --git a/tests/FrameworkTest/res/layout/linear_layout_textviews.xml b/tests/FrameworkTest/res/layout/linear_layout_textviews.xml index 84a898c1c984..ccec21399193 100644 --- a/tests/FrameworkTest/res/layout/linear_layout_textviews.xml +++ b/tests/FrameworkTest/res/layout/linear_layout_textviews.xml @@ -21,7 +21,7 @@ android:id="@+id/layout" android:background="#FFFF0000" android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <EditText diff --git a/tests/FrameworkTest/res/layout/list_dividers.xml b/tests/FrameworkTest/res/layout/list_dividers.xml index b56511e6bd67..93810b49a9ac 100644 --- a/tests/FrameworkTest/res/layout/list_dividers.xml +++ b/tests/FrameworkTest/res/layout/list_dividers.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/list_filter.xml b/tests/FrameworkTest/res/layout/list_filter.xml index cea518c7f48f..0ab7101c6854 100644 --- a/tests/FrameworkTest/res/layout/list_filter.xml +++ b/tests/FrameworkTest/res/layout/list_filter.xml @@ -16,24 +16,24 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <FrameLayout android:id="@+id/frame" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false" /> </FrameLayout> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/hide" diff --git a/tests/FrameworkTest/res/layout/list_in_horizontal.xml b/tests/FrameworkTest/res/layout/list_in_horizontal.xml index 371cb842003f..b7706288e859 100644 --- a/tests/FrameworkTest/res/layout/list_in_horizontal.xml +++ b/tests/FrameworkTest/res/layout/list_in_horizontal.xml @@ -15,8 +15,8 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/list_in_vertical.xml b/tests/FrameworkTest/res/layout/list_in_vertical.xml index 0ea2475fee90..f951cb7d05a5 100644 --- a/tests/FrameworkTest/res/layout/list_in_vertical.xml +++ b/tests/FrameworkTest/res/layout/list_in_vertical.xml @@ -15,16 +15,16 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <ImageButton diff --git a/tests/FrameworkTest/res/layout/list_recycler_profiling.xml b/tests/FrameworkTest/res/layout/list_recycler_profiling.xml index 9678eb71e91e..3fc6bd62c02a 100644 --- a/tests/FrameworkTest/res/layout/list_recycler_profiling.xml +++ b/tests/FrameworkTest/res/layout/list_recycler_profiling.xml @@ -16,11 +16,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1.0" /> diff --git a/tests/FrameworkTest/res/layout/list_scroll_listener.xml b/tests/FrameworkTest/res/layout/list_scroll_listener.xml index 001296ad9928..58ab55fdcf83 100644 --- a/tests/FrameworkTest/res/layout/list_scroll_listener.xml +++ b/tests/FrameworkTest/res/layout/list_scroll_listener.xml @@ -16,17 +16,17 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:drawSelectorOnTop="false"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml b/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml index cf141cc5bece..ee4001906095 100644 --- a/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml +++ b/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml @@ -16,19 +16,19 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@android:id/list" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:drawSelectorOnTop="false"/> <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="fill_parent"> + android:layout_height="match_parent"> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/tests/FrameworkTest/res/layout/list_thrasher.xml b/tests/FrameworkTest/res/layout/list_thrasher.xml index 001296ad9928..58ab55fdcf83 100644 --- a/tests/FrameworkTest/res/layout/list_thrasher.xml +++ b/tests/FrameworkTest/res/layout/list_thrasher.xml @@ -16,17 +16,17 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:drawSelectorOnTop="false"/> <TextView android:id="@+id/text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"/> diff --git a/tests/FrameworkTest/res/layout/list_with_button_above.xml b/tests/FrameworkTest/res/layout/list_with_button_above.xml index 25db01683f97..18bcf6b10bbe 100644 --- a/tests/FrameworkTest/res/layout/list_with_button_above.xml +++ b/tests/FrameworkTest/res/layout/list_with_button_above.xml @@ -19,18 +19,18 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/button" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/button_above_list_label"/> <ListView android:id="@android:id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" android:paddingTop="2dip" diff --git a/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml b/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml index 0163d9630c4a..82af6cad0010 100644 --- a/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml +++ b/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml @@ -16,13 +16,13 @@ <!-- A layout is needed to reprod the bug. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight"> <TextView android:id="@+id/text1" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" android:paddingLeft="27dip" diff --git a/tests/FrameworkTest/res/layout/list_with_empty_view.xml b/tests/FrameworkTest/res/layout/list_with_empty_view.xml index 00d81a7e6858..23bb65811373 100644 --- a/tests/FrameworkTest/res/layout/list_with_empty_view.xml +++ b/tests/FrameworkTest/res/layout/list_with_empty_view.xml @@ -16,17 +16,17 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent" > <ListView android:id="@android:id/list" android:drawSelectorOnTop="false" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> + android:layout_width="match_parent" + android:layout_height="match_parent"/> <TextView android:id="@+id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="center" android:textSize="36sp" android:textColor="#999" diff --git a/tests/FrameworkTest/res/layout/longpress.xml b/tests/FrameworkTest/res/layout/longpress.xml index ef3672c52656..3a69fae4e1fb 100644 --- a/tests/FrameworkTest/res/layout/longpress.xml +++ b/tests/FrameworkTest/res/layout/longpress.xml @@ -20,8 +20,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <View android:id="@+id/simple_view" android:background="@drawable/blue" diff --git a/tests/FrameworkTest/res/layout/mail_message.xml b/tests/FrameworkTest/res/layout/mail_message.xml index ed527518c56f..7f15e4f4ae8a 100644 --- a/tests/FrameworkTest/res/layout/mail_message.xml +++ b/tests/FrameworkTest/res/layout/mail_message.xml @@ -18,11 +18,11 @@ a list with a list of messages.--> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:id="@+id/subject" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <WebView android:id="@+id/body" diff --git a/tests/FrameworkTest/res/layout/popup_window_visibility.xml b/tests/FrameworkTest/res/layout/popup_window_visibility.xml index 21c94bbd0153..3aa714d9f05c 100644 --- a/tests/FrameworkTest/res/layout/popup_window_visibility.xml +++ b/tests/FrameworkTest/res/layout/popup_window_visibility.xml @@ -16,25 +16,25 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <FrameLayout android:id="@+id/frame" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Spinner android:id="@+id/spinner" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <AutoCompleteTextView android:id="@+id/auto" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> @@ -43,7 +43,7 @@ <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/hide" diff --git a/tests/FrameworkTest/res/layout/pre_draw_listener.xml b/tests/FrameworkTest/res/layout/pre_draw_listener.xml index d348d9f2c2c1..7a8f33f5f18d 100644 --- a/tests/FrameworkTest/res/layout/pre_draw_listener.xml +++ b/tests/FrameworkTest/res/layout/pre_draw_listener.xml @@ -16,20 +16,20 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ScrollView android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"> <view class="com.android.frameworktest.view.PreDrawListener$MyLinearLayout" android:id="@+id/frame" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </ScrollView> diff --git a/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml b/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml index 7724729ff510..db88f4dc2f27 100644 --- a/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml +++ b/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml @@ -21,23 +21,23 @@ <RadioButton android:id="@+id/value_one" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textColor="#555555" android:checked="true" android:text="@string/visibility_1_view_1" /> <RadioButton android:id="@+id/value_two" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textColor="#555555" android:text="@string/visibility_1_view_2" /> <RadioButton android:id="@+id/value_three" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:textColor="#555555" android:text="@string/visibility_1_view_3" /> diff --git a/tests/FrameworkTest/res/layout/remote_view_host.xml b/tests/FrameworkTest/res/layout/remote_view_host.xml index dc52181f8354..19d0a738decc 100644 --- a/tests/FrameworkTest/res/layout/remote_view_host.xml +++ b/tests/FrameworkTest/res/layout/remote_view_host.xml @@ -20,6 +20,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml b/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml index 6a659762f968..bdac697a9f6c 100644 --- a/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml +++ b/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml @@ -21,8 +21,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <EditText android:id="@+id/edit" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml b/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml index 70613c3d87d2..630e60311a97 100644 --- a/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml +++ b/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml @@ -21,8 +21,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <WebView android:id="@+id/web" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/remote_view_test_good.xml b/tests/FrameworkTest/res/layout/remote_view_test_good.xml index 54f4db92cbf0..ce9755bf9c02 100644 --- a/tests/FrameworkTest/res/layout/remote_view_test_good.xml +++ b/tests/FrameworkTest/res/layout/remote_view_test_good.xml @@ -21,8 +21,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/linear" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TextView android:id="@+id/text" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml b/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml index d22122d541e0..b6ec479ca30e 100644 --- a/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml +++ b/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml @@ -22,24 +22,24 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/scrollToBlob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/scroll_top_button"/> <TextView android:id="@+id/blob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="80dip" android:layout_marginTop="500dip" android:layout_marginBottom="5dip"/> diff --git a/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml b/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml index 0839b1a227e9..55d057d4b4a0 100644 --- a/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml +++ b/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml @@ -22,55 +22,55 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <Button android:id="@+id/scrollToRectFromTop" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/scroll_top_button"/> <Button android:id="@+id/scrollToRectFromTop2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="10dip" android:text="@string/scroll_top_button2"/> <TextView android:id="@+id/topBlob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dip" android:layout_marginBottom="5dip"/> <TextView android:id="@+id/childToMakeVisible" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dip" android:layout_marginBottom="5dip" android:text="@string/scroll_to_me"/> <TextView android:id="@+id/bottomBlob" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dip" android:layout_marginBottom="5dip"/> <Button android:id="@+id/scrollToRectFromBottom2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="10dip" android:text="@string/scroll_bottom_button2"/> <Button android:id="@+id/scrollToRectFromBottom" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/scroll_bottom_button"/> diff --git a/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml b/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml index 536d2ed7cf44..a3c12ce61f37 100644 --- a/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml +++ b/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml @@ -16,14 +16,14 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml b/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml index 7963475281a8..e0c0c66a75ca 100644 --- a/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml +++ b/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml @@ -16,27 +16,27 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scrollView" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="none"> <LinearLayout android:id="@+id/layout" android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <WebView android:id="@+id/wb1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <Button android:id="@+id/button" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> <WebView android:id="@+id/wb2" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/table_layout_cell_span.xml b/tests/FrameworkTest/res/layout/table_layout_cell_span.xml index 26831e47ba20..fceef0a4bdfb 100644 --- a/tests/FrameworkTest/res/layout/table_layout_cell_span.xml +++ b/tests/FrameworkTest/res/layout/table_layout_cell_span.xml @@ -18,7 +18,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml b/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml index 91d912868845..507701ed1a49 100644 --- a/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml +++ b/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml b/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml index dee81a5d0e84..fb72d81bd4a3 100644 --- a/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml +++ b/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:stretchColumns="1"> diff --git a/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml b/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml index 6a8b7844840b..ae17ada26e62 100644 --- a/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml +++ b/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow> diff --git a/tests/FrameworkTest/res/layout/table_layout_weight.xml b/tests/FrameworkTest/res/layout/table_layout_weight.xml index 432c04a2544c..ba4fade388dd 100644 --- a/tests/FrameworkTest/res/layout/table_layout_weight.xml +++ b/tests/FrameworkTest/res/layout/table_layout_weight.xml @@ -19,7 +19,7 @@ --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TableRow android:id="@+id/row" diff --git a/tests/FrameworkTest/res/layout/translucent_background.xml b/tests/FrameworkTest/res/layout/translucent_background.xml index 6b6e1cfd06a1..c4a1acfeda96 100644 --- a/tests/FrameworkTest/res/layout/translucent_background.xml +++ b/tests/FrameworkTest/res/layout/translucent_background.xml @@ -19,6 +19,6 @@ <!-- This screen consists of a single text field that displays some text. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" - android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical|center_horizontal" android:text="@string/translucent_background"/> diff --git a/tests/FrameworkTest/res/layout/viewgroupchildren.xml b/tests/FrameworkTest/res/layout/viewgroupchildren.xml index a5bb7cbdd642..22595ed0f01c 100644 --- a/tests/FrameworkTest/res/layout/viewgroupchildren.xml +++ b/tests/FrameworkTest/res/layout/viewgroupchildren.xml @@ -23,7 +23,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/group" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/viewstub.xml b/tests/FrameworkTest/res/layout/viewstub.xml index 9a6f37683340..8b32d8f00738 100644 --- a/tests/FrameworkTest/res/layout/viewstub.xml +++ b/tests/FrameworkTest/res/layout/viewstub.xml @@ -20,8 +20,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/vis" android:layout_width="wrap_content" diff --git a/tests/FrameworkTest/res/layout/visibility.xml b/tests/FrameworkTest/res/layout/visibility.xml index b4f9d8baf22c..7edfa331ee16 100644 --- a/tests/FrameworkTest/res/layout/visibility.xml +++ b/tests/FrameworkTest/res/layout/visibility.xml @@ -22,30 +22,30 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" android:background="@drawable/box" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:id="@+id/refUp" android:background="@drawable/red" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_1"/> <TextView android:id="@+id/victim" android:background="@drawable/green" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_2"/> <TextView android:id="@+id/refDown" android:background="@drawable/blue" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_3"/> diff --git a/tests/FrameworkTest/res/layout/visibility_callback.xml b/tests/FrameworkTest/res/layout/visibility_callback.xml index 8fd7c8faa984..322b640f7a9e 100644 --- a/tests/FrameworkTest/res/layout/visibility_callback.xml +++ b/tests/FrameworkTest/res/layout/visibility_callback.xml @@ -22,35 +22,35 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" android:background="@drawable/box" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:id="@+id/refUp" android:background="@drawable/red" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_1"/> <FrameLayout android:id="@+id/parent" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <view class="com.android.frameworktest.view.VisibilityCallback$MonitoredTextView" android:id="@+id/victim" android:background="@drawable/green" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_2"/> </FrameLayout> <TextView android:id="@+id/refDown" android:background="@drawable/blue" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/visibility_1_view_3"/> diff --git a/tests/FrameworkTest/res/layout/weight_sum.xml b/tests/FrameworkTest/res/layout/weight_sum.xml index 249dc687f158..f8921ec3bf7b 100644 --- a/tests/FrameworkTest/res/layout/weight_sum.xml +++ b/tests/FrameworkTest/res/layout/weight_sum.xml @@ -22,8 +22,8 @@ android:orientation="horizontal" android:weightSum="1.0" android:gravity="center_horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <Button android:id="@+id/child" android:layout_width="0dip" diff --git a/tests/FrameworkTest/res/layout/with_bitmap_background.xml b/tests/FrameworkTest/res/layout/with_bitmap_background.xml index b32d99eb58b8..01605d5628c3 100644 --- a/tests/FrameworkTest/res/layout/with_bitmap_background.xml +++ b/tests/FrameworkTest/res/layout/with_bitmap_background.xml @@ -20,8 +20,8 @@ <LinearLayout android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@drawable/bitmap_drawable"> </LinearLayout> diff --git a/tests/FrameworkTest/res/layout/zero_sized.xml b/tests/FrameworkTest/res/layout/zero_sized.xml index c837bf9418d2..f1c94f8a6929 100644 --- a/tests/FrameworkTest/res/layout/zero_sized.xml +++ b/tests/FrameworkTest/res/layout/zero_sized.xml @@ -22,8 +22,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <View android:id="@+id/dimension" android:background="#ffff0000" diff --git a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java b/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java index f1089a11d27f..aff0507a6c36 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/expandablelistview/InflatedExpandableListView.java @@ -65,7 +65,7 @@ public class InflatedExpandableListView extends Activity { public TextView getGenericView() { // Layout parameters for the ExpandableListView AbsListView.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, 64); + ViewGroup.LayoutParams.MATCH_PARENT, 64); TextView textView = new TextView(InflatedExpandableListView.this); textView.setLayoutParams(lp); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java index c4e2705a1a83..09bec2ccf251 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/AdjacentVerticalRectLists.java @@ -66,11 +66,11 @@ public class AdjacentVerticalRectLists extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.HORIZONTAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, - ViewGroup.LayoutParams.FILL_PARENT, 1); + ViewGroup.LayoutParams.MATCH_PARENT, 1); mLeftColumn = new InternalSelectionView(this, 5, "left column"); mLeftColumn.setLayoutParams(params); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java index 91bd7b4f34a1..8f2245f9cff8 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/GoneParentFocusedChild.java @@ -58,15 +58,15 @@ public class GoneParentFocusedChild extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.HORIZONTAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mGoneGroup = new LinearLayout(this); mGoneGroup.setOrientation(LinearLayout.HORIZONTAL); mGoneGroup.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mButton = new Button(this); mButton.setLayoutParams(new LinearLayout.LayoutParams( diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java index 01a9821b0476..05f05eea6cfc 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/HorizontalFocusSearch.java @@ -61,8 +61,8 @@ public class HorizontalFocusSearch extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.HORIZONTAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mLeftTall = makeTall("left tall"); mLayout.addView(mLeftTall); @@ -95,7 +95,7 @@ public class HorizontalFocusSearch extends Activity { button.setText(label); button.setLayoutParams(new LinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT)); return button; } @@ -118,7 +118,7 @@ public class HorizontalFocusSearch extends Activity { ll.setOrientation(LinearLayout.VERTICAL); ll.setLayoutParams(new LinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT)); if (atBottom) { ll.addView(filler); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java index f59e2b7038dd..41a276a1ed5b 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfEditTexts.java @@ -45,14 +45,14 @@ public class ListOfEditTexts extends Activity { mLinearLayout = new LinearLayout(this); mLinearLayout.setOrientation(LinearLayout.VERTICAL); mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); // add a button above Button buttonAbove = new Button(this); buttonAbove.setLayoutParams( new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); buttonAbove.setText("button above list"); mLinearLayout.addView(buttonAbove); @@ -60,12 +60,12 @@ public class ListOfEditTexts extends Activity { // add a list view to it mListView = new ListView(this); mListView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setDrawSelectorOnTop(false); mListView.setItemsCanFocus(true); mListView.setLayoutParams((new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f))); @@ -82,7 +82,7 @@ public class ListOfEditTexts extends Activity { Button buttonBelow = new Button(this); buttonBelow.setLayoutParams( new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); buttonBelow.setText("button below list"); mLinearLayout.addView(buttonBelow); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java index 4bbca7436000..6104068bea8e 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/ListOfInternalSelectionViews.java @@ -119,8 +119,8 @@ public class ListOfInternalSelectionViews extends Activity { mListView = new ListView(this); mListView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setDrawSelectorOnTop(false); mListView.setAdapter(new MyAdapter()); mListView.setItemsCanFocus(true); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java b/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java index d1b83a3f9ebc..a8f12d842dc6 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/focus/VerticalFocusSearch.java @@ -68,8 +68,8 @@ public class VerticalFocusSearch extends Activity { mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setHorizontalGravity(Gravity.LEFT); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mTopWide = makeWide("top wide"); mLayout.addView(mTopWide); @@ -102,7 +102,7 @@ public class VerticalFocusSearch extends Activity { Button button = new MyButton(this); button.setText(label); button.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); return button; } @@ -133,7 +133,7 @@ public class VerticalFocusSearch extends Activity { LinearLayout ll = new LinearLayout(this); ll.setOrientation(LinearLayout.HORIZONTAL); ll.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); if (atRight) { diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java index d6c11b759fb1..ceb94b7e826a 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemISVAndButton.java @@ -47,13 +47,13 @@ public class ListItemISVAndButton extends ListScenario { final InternalSelectionView isv = new InternalSelectionView(context, 8, "ISV postion " + position); isv.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, desiredHeight - 240)); ll.addView(isv); final LinearLayout.LayoutParams buttonLp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 40); final Button topButton = new Button(context); topButton.setLayoutParams( @@ -63,7 +63,7 @@ public class ListItemISVAndButton extends ListScenario { final TextView filler = new TextView(context); filler.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 200)); filler.setText("filler"); ll.addView(filler); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java index a137116e1690..b0ad5e95989a 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListItemsExpandOnSelection.java @@ -44,7 +44,7 @@ public class ListItemsExpandOnSelection extends ListScenario { result.setFocusable(mItemsFocusable); result.setText(getValueAtPosition(position)); final AbsListView.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); return result; diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java index 87888cabe3a2..45d5892c4906 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListSetSelection.java @@ -51,7 +51,7 @@ public class ListSetSelection extends ListScenario { }); getListViewContainer().addView(mButton, new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT )); } diff --git a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java index 17222d96271f..1d6d598ed293 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/listview/ListViewHeight.java @@ -70,14 +70,14 @@ public class ListViewHeight extends Activity { } }); - // Clicking this button will show the list view and set it fill_parent height + // Clicking this button will show the list view and set it match_parent height // If you then hide the views, there is an NPE when calculating the ListView height. mButton2.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { // set listview to fill screen ViewGroup.MarginLayoutParams lp; lp = (ViewGroup.MarginLayoutParams) mInnerList.getLayoutParams(); - lp.height = lp.FILL_PARENT; + lp.height = lp.MATCH_PARENT; mInnerList.setLayoutParams(lp); // enable list adapter mInnerList.setAdapter(mAdapter); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java b/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java index 4763ab1f4ba3..2d3be2e78745 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/scroll/ScrollViewButtonsAndLabels.java @@ -70,7 +70,7 @@ public class ScrollViewButtonsAndLabels extends Activity { mLinearLayout = (LinearLayout) findViewById(R.id.layout); LinearLayout.LayoutParams p = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT ); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java index f72cbe8d25f1..5aa94798381d 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ExpandableListScenario.java @@ -18,7 +18,6 @@ package com.android.frameworktest.util; import java.util.ArrayList; import java.util.List; -import java.util.Random; import android.view.Gravity; import android.view.View; @@ -256,7 +255,7 @@ public abstract class ExpandableListScenario extends ListScenario { result.setHeight(desiredHeight); result.setText(getValueAtPosition(packedPosition)); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setGravity(Gravity.CENTER_VERTICAL); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java index 746cf23f48f1..76a11011d80b 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/GridScenario.java @@ -242,8 +242,8 @@ public abstract class GridScenario extends Activity { mGridView = new GridView(this); mGridView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mGridView.setDrawSelectorOnTop(false); if (mNumColumns >= GridView.AUTO_FIT) { mGridView.setNumColumns(mNumColumns); @@ -330,7 +330,7 @@ public abstract class GridScenario extends Activity { result.setHeight(desiredHeight); result.setText(getValueAtPosition(position)); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setId(position); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java index 4327a8a61de1..2c1cf5b883d1 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ListItemFactory.java @@ -50,7 +50,7 @@ public class ListItemFactory { final LinearLayout.LayoutParams buttonLp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 50); final Button topButton = new Button(context); @@ -61,7 +61,7 @@ public class ListItemFactory { final TextView middleFiller = new TextView(context); middleFiller.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, desiredHeight - 100)); middleFiller.setText("filler"); ll.addView(middleFiller); @@ -157,7 +157,7 @@ public class ListItemFactory { result.setHeight(desiredHeight); result.setText(text); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setId(position); @@ -197,7 +197,7 @@ public class ListItemFactory { result.setHeight(desiredHeight); result.setText(text); final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); result.setLayoutParams(lp); result.setId(position); @@ -239,7 +239,7 @@ public class ListItemFactory { final AbsListView.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, desiredHeight); ll.setLayoutParams(lp); ll.setId(position); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java index 58896588fe56..a6ae1884825f 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ListScenario.java @@ -315,8 +315,8 @@ public abstract class ListScenario extends Activity { mListView = createListView(); mListView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setDrawSelectorOnTop(false); for (int i=0; i<mHeaderViewCount; i++) { @@ -375,16 +375,16 @@ public abstract class ListScenario extends Activity { mHeaderTextView = new TextView(this); mHeaderTextView.setText("hi"); mHeaderTextView.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); mLinearLayout.addView(mHeaderTextView); mLinearLayout.setOrientation(LinearLayout.VERTICAL); mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setLayoutParams((new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f))); @@ -394,10 +394,10 @@ public abstract class ListScenario extends Activity { mLinearLayout = new LinearLayout(this); mLinearLayout.setOrientation(LinearLayout.VERTICAL); mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mListView.setLayoutParams((new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f))); mLinearLayout.addView(mListView); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java b/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java index aa171940a805..daa168d04a1b 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/util/ScrollViewScenario.java @@ -174,7 +174,7 @@ public abstract class ScrollViewScenario extends Activity { // fill width, equally weighted on height final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, 0, 1f); + ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f); for (int i = 0; i < numButtons; i++) { final Button button = new Button(context); button.setText(prefix + i); @@ -240,15 +240,15 @@ public abstract class ScrollViewScenario extends Activity { // create views specified by params for (ViewFactory viewFactory : params.mViewFactories) { final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, (int) (viewFactory.getHeightRatio() * screenHeight)); mLinearLayout.addView(viewFactory.create(this), lp); } mScrollView = createScrollView(); mScrollView.addView(mLinearLayout, new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); // no animation to speed up tests mScrollView.setSmoothScrollingEnabled(false); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java b/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java index 6f5eb0085cf4..52f7a07dfab9 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/view/BigCache.java @@ -39,7 +39,7 @@ public class BigCache extends Activity { final LinearLayout testBed = new LinearLayout(this); testBed.setOrientation(LinearLayout.VERTICAL); testBed.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); final int cacheSize = ViewConfiguration.getMaximumDrawingCacheSize(); final Display display = getWindowManager().getDefaultDisplay(); @@ -60,7 +60,7 @@ public class BigCache extends Activity { final ScrollView scroller = new ScrollView(this); scroller.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); testBed.addView(tiny); testBed.addView(large); diff --git a/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java b/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java index cb456b2c7ffb..e907b2420823 100644 --- a/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java +++ b/tests/FrameworkTest/src/com/android/frameworktest/view/PreDrawListener.java @@ -60,7 +60,7 @@ public class PreDrawListener extends Activity implements OnClickListener { if (mCancelNextDraw) { Button b = new Button(this.getContext()); b.setText("Hello"); - addView(b, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, + addView(b, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); mCancelNextDraw = false; return false; diff --git a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java index fceec516a34a..a6007e1d639d 100644 --- a/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java +++ b/tests/FrameworkTest/tests/src/com/android/frameworktest/view/ViewGroupChildrenTest.java @@ -260,7 +260,7 @@ public class ViewGroupChildrenTest extends ActivityInstrumentationTestCase<ViewG TextView view = new TextView(getActivity()); view.setText(text); view.setLayoutParams(new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT )); return view; diff --git a/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml b/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml index e8ffa1ce8fc8..1a2b7eb0407e 100644 --- a/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml +++ b/tests/ImfTest/res/layout/dialog_edit_text_no_scroll.xml @@ -15,21 +15,21 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:padding="20dip" android:orientation="vertical"> <View android:id="@+id/blank" android:layout_height="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_weight="1"/> <EditText android:id="@+id/dialog_edit_text" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:scrollHorizontally="true" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/tests/ImfTest/res/layout/full_screen_edit_text.xml b/tests/ImfTest/res/layout/full_screen_edit_text.xml index f22aa2f724cb..e760ac181245 100755 --- a/tests/ImfTest/res/layout/full_screen_edit_text.xml +++ b/tests/ImfTest/res/layout/full_screen_edit_text.xml @@ -20,8 +20,8 @@ <EditText xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/data" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:minLines="15" android:gravity="top"/> diff --git a/tests/ImfTest/res/layout/one_edit_text_activity.xml b/tests/ImfTest/res/layout/one_edit_text_activity.xml index 09925e1e76cb..055822823bf5 100755 --- a/tests/ImfTest/res/layout/one_edit_text_activity.xml +++ b/tests/ImfTest/res/layout/one_edit_text_activity.xml @@ -18,32 +18,32 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:baselineAligned="false"> <View android:id="@+id/blank" android:layout_height="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_weight="1" /> <EditText android:id="@+id/dialog_edit_text" android:layout_height="wrap_content" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:scrollHorizontally="true" android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="@android:drawable/divider_horizontal_dark" /> diff --git a/tests/ImfTest/res/layout/sample_edit_text.xml b/tests/ImfTest/res/layout/sample_edit_text.xml index 99a5cf8b4821..3ff676727662 100755 --- a/tests/ImfTest/res/layout/sample_edit_text.xml +++ b/tests/ImfTest/res/layout/sample_edit_text.xml @@ -18,12 +18,12 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" @@ -46,7 +46,7 @@ </LinearLayout> <View - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="@android:drawable/divider_horizontal_dark" /> diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java index 9754381e2ce3..21734a68abab 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java @@ -7,9 +7,7 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.ScrollView; public class BigEditTextActivityNonScrollablePanScan extends Activity { @@ -25,8 +23,8 @@ public class BigEditTextActivityNonScrollablePanScan extends Activity { mRootView = new LinearLayout(this); ((LinearLayout) mRootView).setOrientation(LinearLayout.VERTICAL); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((LinearLayout) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java index 701795fe4a7b..48287fbbd205 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java @@ -7,9 +7,7 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.ScrollView; public class BigEditTextActivityNonScrollableResize extends Activity { @@ -25,8 +23,8 @@ public class BigEditTextActivityNonScrollableResize extends Activity { mRootView = new LinearLayout(this); ((LinearLayout) mRootView).setOrientation(LinearLayout.VERTICAL); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((LinearLayout) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java index bb3f7671a860..48e1359aa681 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java @@ -7,7 +7,6 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ScrollView; @@ -26,14 +25,14 @@ public class BigEditTextActivityScrollablePanScan extends Activity { mRootView = new ScrollView(this); ((ScrollView) mRootView).setFillViewport(true); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((ScrollView) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java index f2cae1cdfca7..d51e8a7e0eff 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java +++ b/tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java @@ -7,7 +7,6 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ScrollView; @@ -26,14 +25,14 @@ public class BigEditTextActivityScrollableResize extends Activity { mRootView = new ScrollView(this); ((ScrollView) mRootView).setFillViewport(true); mRootView.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); View view = getLayoutInflater().inflate( R.layout.full_screen_edit_text, ((ScrollView) mRootView), false); diff --git a/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java b/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java index e49301cd9821..f65e1fde8392 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java +++ b/tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java @@ -2,18 +2,14 @@ package com.android.imftest.samples; import android.app.Activity; import android.os.Bundle; -import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.EditText; import android.widget.Button; import android.view.LayoutInflater; import android.app.Dialog; -import com.android.internal.R; - public class DialogActivity extends Activity { private static final int DIALOG_WITHOUT_EDITTEXT = 0; @@ -34,8 +30,8 @@ public class DialogActivity extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mButton1 = new Button(this); mButton1.setText("Dialog WITHOUT EditText");//(R.string.open_dialog_scrollable); diff --git a/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java b/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java index bd1e934364f6..d4726fca5b19 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java +++ b/tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java @@ -3,7 +3,6 @@ package com.android.imftest.samples; import com.android.imftest.R; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.view.LayoutInflater; @@ -33,8 +32,8 @@ public class EditTextActivityDialog extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mButton1 = new Button(this); mButton1.setText(R.string.open_dialog_scrollable); diff --git a/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java b/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java index 17f6bdc15eb1..25ac2f028b27 100755 --- a/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java +++ b/tests/ImfTest/src/com/android/imftest/samples/InputTypeActivity.java @@ -21,17 +21,13 @@ import com.android.imftest.R; import android.app.Activity; import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.Button; import android.widget.ScrollView; import android.widget.TextView; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.ViewParent; -import android.view.ViewRoot; import android.view.inputmethod.EditorInfo; -import android.content.Context; public class InputTypeActivity extends Activity { @@ -49,8 +45,8 @@ public class InputTypeActivity extends Activity { mLayout = new LinearLayout(this); mLayout.setOrientation(LinearLayout.VERTICAL); mLayout.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, - ViewGroup.LayoutParams.FILL_PARENT)); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); mInflater = getLayoutInflater(); mParent = mLayout; diff --git a/tests/LowStorageTest/res/layout/main.xml b/tests/LowStorageTest/res/layout/main.xml index cc9910284187..f1cc6803a120 100644 --- a/tests/LowStorageTest/res/layout/main.xml +++ b/tests/LowStorageTest/res/layout/main.xml @@ -14,8 +14,8 @@ limitations under the License. --> <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:stretchColumns="1"> <TextView diff --git a/tests/StatusBar/res/layout/chrono_notification.xml b/tests/StatusBar/res/layout/chrono_notification.xml index 913a8606fd1b..98a9fdda8b3f 100644 --- a/tests/StatusBar/res/layout/chrono_notification.xml +++ b/tests/StatusBar/res/layout/chrono_notification.xml @@ -1,12 +1,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="80sp" android:orientation="horizontal" > <LinearLayout android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="0" android:orientation="vertical" > diff --git a/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml b/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml index e5c3b288f4fa..88c64886db68 100644 --- a/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml +++ b/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml @@ -16,8 +16,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent" > <TextView android:layout_width="wrap_content" @@ -26,7 +26,7 @@ /> <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" > diff --git a/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml index 0d9b983279f2..a0f9cc2ebd8b 100644 --- a/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml +++ b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml @@ -15,21 +15,21 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <TextView android:id="@+id/oh_hai_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/oh_hai" /> <EditText android:id="@+id/edit_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java index 2fb2d1dea080..bb0fa6007808 100644 --- a/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java +++ b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java @@ -129,7 +129,7 @@ public class AppWidgetHostActivity extends Activity // Add it to the list LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.FILL_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); mAppWidgetContainer.addView(view, layoutParams); diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java index b5b7ceb75e54..791e53bcfc26 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java @@ -60,6 +60,7 @@ public class BridgeConstants { public final static String REFERENCE_STYLE = RES_STYLE + "/"; public final static String REFERENCE_NULL = "@null"; + public final static String MATCH_PARENT = "match_parent"; public final static String FILL_PARENT = "fill_parent"; public final static String WRAP_CONTENT = "wrap_content"; } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java index 1fafef48d9ef..6358abb98838 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java @@ -239,8 +239,9 @@ public final class BridgeResources extends Resources { String v = value.getValue(); if (v != null) { - if (v.equals(BridgeConstants.FILL_PARENT)) { - return LayoutParams.FILL_PARENT; + if (v.equals(BridgeConstants.MATCH_PARENT) || + v.equals(BridgeConstants.FILL_PARENT)) { + return LayoutParams.MATCH_PARENT; } else if (v.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java index 6f203bab61a9..efd222e8874a 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java @@ -392,8 +392,8 @@ public final class BridgeTypedArray extends TypedArray { if (s == null) { return defValue; - } else if (s.equals(BridgeConstants.FILL_PARENT)) { - return LayoutParams.FILL_PARENT; + } else if (s.equals(BridgeConstants.MATCH_PARENT)) { + return LayoutParams.MATCH_PARENT; } else if (s.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; } @@ -460,8 +460,8 @@ public final class BridgeTypedArray extends TypedArray { if (s == null) { return defValue; - } else if (s.equals(BridgeConstants.FILL_PARENT)) { - return LayoutParams.FILL_PARENT; + } else if (s.equals(BridgeConstants.MATCH_PARENT)) { + return LayoutParams.MATCH_PARENT; } else if (s.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; } diff --git a/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml b/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml index 554f541adbcc..b8fc9472ed83 100644 --- a/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml +++ b/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata/layout1.xml @@ -17,8 +17,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <Button @@ -31,8 +31,8 @@ </Button> <View android:id="@+id/surface" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_weight="2" /> <TextView @@ -40,7 +40,7 @@ android:paddingLeft="2dip" android:layout_weight="0" android:background="@drawable/black" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:lines="1" android:gravity="center_vertical|center_horizontal" diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 9d8f730849c7..2668fe0514e4 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -616,7 +616,7 @@ public class WifiStateTracker extends NetworkStateTracker { * @return {@code true} if the operation succeeds, {@code false} otherwise, e.g., * the number of channels is invalid. */ - public boolean setNumAllowedChannels() { + public synchronized boolean setNumAllowedChannels() { try { return setNumAllowedChannels( Settings.Secure.getInt(mContext.getContentResolver(), @@ -859,7 +859,9 @@ public class WifiStateTracker extends NetworkStateTracker { // Only do this if we haven't gotten a new supplicant status since the timer // started if (mNumSupplicantStateChanges == msg.arg1) { - WifiNative.scanCommand(false); // do a passive scan + synchronized (this) { + WifiNative.scanCommand(false); // do a passive scan + } } break; @@ -1154,7 +1156,6 @@ public class WifiStateTracker extends NetworkStateTracker { // [31- 1] Reserved for future use // [ 0- 0] Interface configuration succeeded (1) or failed (0) EventLog.writeEvent(EVENTLOG_INTERFACE_CONFIGURATION_STATE_CHANGED, 0); - mHaveIpAddress = false; mWifiInfo.setIpAddress(0); mObtainingIpAddress = false; |
