diff options
125 files changed, 1516 insertions, 5500 deletions
diff --git a/api/current.txt b/api/current.txt index af61de8..118223c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2086,6 +2086,21 @@ package android { field public static final int Theme_Light_Panel = 16973914; // 0x103005a field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062 field public static final int Theme_Material = 16974372; // 0x1030224 + field public static final int Theme_Material_DayNight = 16974548; // 0x10302d4 + field public static final int Theme_Material_DayNight_DarkActionBar = 16974549; // 0x10302d5 + field public static final int Theme_Material_DayNight_Dialog = 16974550; // 0x10302d6 + field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974556; // 0x10302dc + field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974557; // 0x10302dd + field public static final int Theme_Material_DayNight_Dialog_Alert = 16974551; // 0x10302d7 + field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974552; // 0x10302d8 + field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974553; // 0x10302d9 + field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974554; // 0x10302da + field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974555; // 0x10302db + field public static final int Theme_Material_DayNight_NoActionBar = 16974558; // 0x10302de + field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974559; // 0x10302df + field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974560; // 0x10302e0 + field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974561; // 0x10302e1 + field public static final int Theme_Material_DayNight_Panel = 16974562; // 0x10302e2 field public static final int Theme_Material_Dialog = 16974373; // 0x1030225 field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c @@ -11985,8 +12000,10 @@ package android.graphics.drawable { public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback { ctor public LayerDrawable(android.graphics.drawable.Drawable[]); + method public int addLayer(android.graphics.drawable.Drawable); method public void draw(android.graphics.Canvas); method public android.graphics.drawable.Drawable findDrawableByLayerId(int); + method public int findIndexByLayerId(int); method public android.graphics.drawable.Drawable getDrawable(int); method public int getId(int); method public int getLayerGravity(int); @@ -11999,6 +12016,7 @@ package android.graphics.drawable { method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long); method public void setAlpha(int); method public void setColorFilter(android.graphics.ColorFilter); + method public void setDrawable(int, android.graphics.drawable.Drawable); method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable); method public void setId(int, int); method public void setLayerGravity(int, int); diff --git a/api/system-current.txt b/api/system-current.txt index 6b50603..903c40c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2165,6 +2165,21 @@ package android { field public static final int Theme_Light_Panel = 16973914; // 0x103005a field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062 field public static final int Theme_Material = 16974372; // 0x1030224 + field public static final int Theme_Material_DayNight = 16974548; // 0x10302d4 + field public static final int Theme_Material_DayNight_DarkActionBar = 16974549; // 0x10302d5 + field public static final int Theme_Material_DayNight_Dialog = 16974550; // 0x10302d6 + field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974556; // 0x10302dc + field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974557; // 0x10302dd + field public static final int Theme_Material_DayNight_Dialog_Alert = 16974551; // 0x10302d7 + field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974552; // 0x10302d8 + field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974553; // 0x10302d9 + field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974554; // 0x10302da + field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974555; // 0x10302db + field public static final int Theme_Material_DayNight_NoActionBar = 16974558; // 0x10302de + field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974559; // 0x10302df + field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974560; // 0x10302e0 + field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974561; // 0x10302e1 + field public static final int Theme_Material_DayNight_Panel = 16974562; // 0x10302e2 field public static final int Theme_Material_Dialog = 16974373; // 0x1030225 field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c @@ -12259,8 +12274,10 @@ package android.graphics.drawable { public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback { ctor public LayerDrawable(android.graphics.drawable.Drawable[]); + method public int addLayer(android.graphics.drawable.Drawable); method public void draw(android.graphics.Canvas); method public android.graphics.drawable.Drawable findDrawableByLayerId(int); + method public int findIndexByLayerId(int); method public android.graphics.drawable.Drawable getDrawable(int); method public int getId(int); method public int getLayerGravity(int); @@ -12273,6 +12290,7 @@ package android.graphics.drawable { method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long); method public void setAlpha(int); method public void setColorFilter(android.graphics.ColorFilter); + method public void setDrawable(int, android.graphics.drawable.Drawable); method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable); method public void setId(int, int); method public void setLayerGravity(int, int); diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 8997671..62081ee 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -1823,16 +1823,18 @@ public class Am extends BaseCommand { showError("Error: Unable to create new stack..."); } - final StackInfo newStackInfo = mAm.getStackInfo(container.getStackId()); + final int newStackId = container.getStackId(); if (intent != null) { container.startActivity(intent); } else if (currentStackInfo.taskIds != null && currentStackInfo.taskIds.length > 1) { // Move top task over to new stack mAm.moveTaskToStack(currentStackInfo.taskIds[currentStackInfo.taskIds.length - 1], - newStackInfo.stackId, true); + newStackId, true); } + final StackInfo newStackInfo = mAm.getStackInfo(newStackId); + // Make all tasks in the stacks resizeable. for (int taskId : currentStackInfo.taskIds) { mAm.setTaskResizeable(taskId, true); diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 0a255f7..0f6ce12 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -219,10 +219,9 @@ public class UiModeManager { } /** - * Returns the currently configured night mode. - * - * @return {@link #MODE_NIGHT_NO}, {@link #MODE_NIGHT_YES}, or - * {@link #MODE_NIGHT_AUTO}. When an error occurred -1 is returned. + * @return the currently configured night mode. May be one of + * {@link #MODE_NIGHT_NO}, {@link #MODE_NIGHT_YES}, + * {@link #MODE_NIGHT_AUTO}, or -1 on error. */ public int getNightMode() { if (mService != null) { diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index e9cce51..381d851 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -170,10 +170,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * lock task mode from an authorized package. The extra {@link #EXTRA_LOCK_TASK_PACKAGE} * will describe the authorized package using lock task mode. * - * @see DevicePolicyManager#isLockTaskPermitted(String) - * * <p>The calling device admin must be the device owner or profile * owner to receive this broadcast. + * + * @see DevicePolicyManager#isLockTaskPermitted(String) */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_LOCK_TASK_ENTERING @@ -183,20 +183,19 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * Action sent to a device administrator to notify that the device is exiting * lock task mode from an authorized package. * - * @see DevicePolicyManager#isLockTaskPermitted(String) - * * <p>The calling device admin must be the device owner or profile * owner to receive this broadcast. + * + * @see DevicePolicyManager#isLockTaskPermitted(String) */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_LOCK_TASK_EXITING = "android.app.action.LOCK_TASK_EXITING"; /** - * A boolean describing whether the device is currently entering or exiting - * lock task mode. + * A string containing the name of the package entering lock task mode. * - * @see #ACTION_LOCK_TASK_CHANGED + * @see #ACTION_LOCK_TASK_ENTERING */ public static final String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index dec2524..df620d0 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2149,17 +2149,21 @@ public abstract class Context { WIFI_PASSPOINT_SERVICE, WIFI_P2P_SERVICE, WIFI_SCANNING_SERVICE, + //@hide: WIFI_RTT_SERVICE, //@hide: ETHERNET_SERVICE, WIFI_RTT_SERVICE, NSD_SERVICE, AUDIO_SERVICE, + //@hide: FINGERPRINT_SERVICE, MEDIA_ROUTER_SERVICE, TELEPHONY_SERVICE, + TELEPHONY_SUBSCRIPTION_SERVICE, TELECOM_SERVICE, CLIPBOARD_SERVICE, INPUT_METHOD_SERVICE, TEXT_SERVICES_MANAGER_SERVICE, APPWIDGET_SERVICE, + //@hide: VOICE_INTERACTION_MANAGER_SERVICE, //@hide: BACKUP_SERVICE, DROPBOX_SERVICE, DEVICE_POLICY_SERVICE, @@ -2171,16 +2175,23 @@ public abstract class Context { USB_SERVICE, LAUNCHER_APPS_SERVICE, //@hide: SERIAL_SERVICE, + //@hide: HDMI_CONTROL_SERVICE, INPUT_SERVICE, DISPLAY_SERVICE, - //@hide: SCHEDULING_POLICY_SERVICE, USER_SERVICE, - //@hide: APP_OPS_SERVICE + RESTRICTIONS_SERVICE, + APP_OPS_SERVICE, CAMERA_SERVICE, PRINT_SERVICE, + CONSUMER_IR_SERVICE, + //@hide: TRUST_SERVICE, + TV_INPUT_SERVICE, + //@hide: NETWORK_SCORE_SERVICE, + USAGE_STATS_SERVICE, MEDIA_SESSION_SERVICE, BATTERY_SERVICE, JOB_SCHEDULER_SERVICE, + //@hide: PERSISTENT_DATA_BLOCK_SERVICE, MEDIA_PROJECTION_SERVICE, MIDI_SERVICE, }) diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index fa5e9d2..39f4cca 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -833,4 +833,96 @@ public final class Sensor { + ", type=" + mType + ", maxRange=" + mMaxRange + ", resolution=" + mResolution + ", power=" + mPower + ", minDelay=" + mMinDelay + "}"; } + + /** + * Sets the Type associated with the sensor. + * NOTE: to be used only by native bindings in SensorManager. + * + * This allows interned static strings to be used across all representations of the Sensor. If + * a sensor type is not referenced here, it will still be interned by the native SensorManager. + * + * @return {@code true} if the StringType was successfully set, {@code false} otherwise. + */ + private boolean setType(int value) { + mType = value; + switch (mType) { + case TYPE_ACCELEROMETER: + mStringType = STRING_TYPE_ACCELEROMETER; + return true; + case TYPE_AMBIENT_TEMPERATURE: + mStringType = STRING_TYPE_AMBIENT_TEMPERATURE; + return true; + case TYPE_GAME_ROTATION_VECTOR: + mStringType = STRING_TYPE_GAME_ROTATION_VECTOR; + return true; + case TYPE_GEOMAGNETIC_ROTATION_VECTOR: + mStringType = STRING_TYPE_GEOMAGNETIC_ROTATION_VECTOR; + return true; + case TYPE_GLANCE_GESTURE: + mStringType = STRING_TYPE_GLANCE_GESTURE; + return true; + case TYPE_GRAVITY: + mStringType = STRING_TYPE_GRAVITY; + return true; + case TYPE_GYROSCOPE: + mStringType = STRING_TYPE_GYROSCOPE; + return true; + case TYPE_GYROSCOPE_UNCALIBRATED: + mStringType = STRING_TYPE_GYROSCOPE_UNCALIBRATED; + return true; + case TYPE_HEART_RATE: + mStringType = STRING_TYPE_HEART_RATE; + return true; + case TYPE_LIGHT: + mStringType = STRING_TYPE_LIGHT; + return true; + case TYPE_LINEAR_ACCELERATION: + mStringType = STRING_TYPE_LINEAR_ACCELERATION; + return true; + case TYPE_MAGNETIC_FIELD: + mStringType = STRING_TYPE_MAGNETIC_FIELD; + return true; + case TYPE_MAGNETIC_FIELD_UNCALIBRATED: + mStringType = STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED; + return true; + case TYPE_PICK_UP_GESTURE: + mStringType = STRING_TYPE_PICK_UP_GESTURE; + return true; + case TYPE_PRESSURE: + mStringType = STRING_TYPE_PRESSURE; + return true; + case TYPE_PROXIMITY: + mStringType = STRING_TYPE_PROXIMITY; + return true; + case TYPE_RELATIVE_HUMIDITY: + mStringType = STRING_TYPE_RELATIVE_HUMIDITY; + return true; + case TYPE_ROTATION_VECTOR: + mStringType = STRING_TYPE_ROTATION_VECTOR; + return true; + case TYPE_SIGNIFICANT_MOTION: + mStringType = STRING_TYPE_SIGNIFICANT_MOTION; + return true; + case TYPE_STEP_COUNTER: + mStringType = STRING_TYPE_STEP_COUNTER; + return true; + case TYPE_STEP_DETECTOR: + mStringType = STRING_TYPE_STEP_DETECTOR; + return true; + case TYPE_TILT_DETECTOR: + mStringType = SENSOR_STRING_TYPE_TILT_DETECTOR; + return true; + case TYPE_WAKE_GESTURE: + mStringType = STRING_TYPE_WAKE_GESTURE; + return true; + case TYPE_ORIENTATION: + mStringType = STRING_TYPE_ORIENTATION; + return true; + case TYPE_TEMPERATURE: + mStringType = STRING_TYPE_TEMPERATURE; + return true; + default: + return false; + } + } } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 1a51808..808be21 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2371,6 +2371,10 @@ public class ConnectivityManager { * The lookup key for a {@link Network} object included with the intent after * successfully finding a network for the applications request. Retrieve it with * {@link android.content.Intent#getParcelableExtra(String)}. + * <p> + * Note that if you intend to invoke (@link #setProcessDefaultNetwork(Network)) or + * {@link Network#openConnection(java.net.URL)} then you must get a + * ConnectivityManager instance before doing so. */ public static final String EXTRA_NETWORK = "android.net.extra.NETWORK"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7b3eceb..c836a33 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2098,7 +2098,7 @@ public final class Settings { @Override public boolean validate(String value) { // TODO: No idea what the correct format is. - return value == null || value.length() > MAX_LENGTH; + return value == null || value.length() < MAX_LENGTH; } }; diff --git a/core/java/android/text/SpannableStringBuilder.java b/core/java/android/text/SpannableStringBuilder.java index 06df683..7ce44e1 100644 --- a/core/java/android/text/SpannableStringBuilder.java +++ b/core/java/android/text/SpannableStringBuilder.java @@ -26,6 +26,7 @@ import com.android.internal.util.GrowingArrayUtils; import libcore.util.EmptyArray; import java.lang.reflect.Array; +import java.util.IdentityHashMap; /** * This is the class for text whose content and markup can both be changed. @@ -68,6 +69,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable mSpanStarts = EmptyArray.INT; mSpanEnds = EmptyArray.INT; mSpanFlags = EmptyArray.INT; + mSpanMax = EmptyArray.INT; if (text instanceof Spanned) { Spanned sp = (Spanned) text; @@ -94,6 +96,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable setSpan(false, spans[i], st, en, fl); } + restoreInvariants(); } } @@ -147,9 +150,12 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable if (mGapLength < 1) new Exception("mGapLength < 1").printStackTrace(); - for (int i = 0; i < mSpanCount; i++) { - if (mSpanStarts[i] > mGapStart) mSpanStarts[i] += delta; - if (mSpanEnds[i] > mGapStart) mSpanEnds[i] += delta; + if (mSpanCount != 0) { + for (int i = 0; i < mSpanCount; i++) { + if (mSpanStarts[i] > mGapStart) mSpanStarts[i] += delta; + if (mSpanEnds[i] > mGapStart) mSpanEnds[i] += delta; + } + calcMax(treeRoot()); } } @@ -167,35 +173,38 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable System.arraycopy(mText, where + mGapLength - overlap, mText, mGapStart, overlap); } - // XXX be more clever - for (int i = 0; i < mSpanCount; i++) { - int start = mSpanStarts[i]; - int end = mSpanEnds[i]; - - if (start > mGapStart) - start -= mGapLength; - if (start > where) - start += mGapLength; - else if (start == where) { - int flag = (mSpanFlags[i] & START_MASK) >> START_SHIFT; + // TODO: be more clever (although the win really isn't that big) + if (mSpanCount != 0) { + for (int i = 0; i < mSpanCount; i++) { + int start = mSpanStarts[i]; + int end = mSpanEnds[i]; - if (flag == POINT || (atEnd && flag == PARAGRAPH)) + if (start > mGapStart) + start -= mGapLength; + if (start > where) start += mGapLength; - } + else if (start == where) { + int flag = (mSpanFlags[i] & START_MASK) >> START_SHIFT; - if (end > mGapStart) - end -= mGapLength; - if (end > where) - end += mGapLength; - else if (end == where) { - int flag = (mSpanFlags[i] & END_MASK); + if (flag == POINT || (atEnd && flag == PARAGRAPH)) + start += mGapLength; + } - if (flag == POINT || (atEnd && flag == PARAGRAPH)) + if (end > mGapStart) + end -= mGapLength; + if (end > where) end += mGapLength; - } + else if (end == where) { + int flag = (mSpanFlags[i] & END_MASK); + + if (flag == POINT || (atEnd && flag == PARAGRAPH)) + end += mGapLength; + } - mSpanStarts[i] = start; - mSpanEnds[i] = end; + mSpanStarts[i] = start; + mSpanEnds[i] = end; + } + calcMax(treeRoot()); } mGapStart = where; @@ -243,6 +252,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable sendSpanRemoved(what, ostart, oend); } + if (mIndexOfSpan != null) { + mIndexOfSpan.clear(); + } } // Documentation from interface @@ -277,12 +289,39 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable return append(String.valueOf(text)); } + // Returns true if a node was removed (so we can restart search from root) + private boolean removeSpansForChange(int start, int end, boolean textIsRemoved, int i) { + if ((i & 1) != 0) { + // internal tree node + if (resolveGap(mSpanMax[i]) >= start && + removeSpansForChange(start, end, textIsRemoved, leftChild(i))) { + return true; + } + } + if (i < mSpanCount) { + if ((mSpanFlags[i] & Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) == + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE && + mSpanStarts[i] >= start && mSpanStarts[i] < mGapStart + mGapLength && + mSpanEnds[i] >= start && mSpanEnds[i] < mGapStart + mGapLength && + // The following condition indicates that the span would become empty + (textIsRemoved || mSpanStarts[i] > start || mSpanEnds[i] < mGapStart)) { + mIndexOfSpan.remove(mSpans[i]); + removeSpan(i); + return true; + } + return resolveGap(mSpanStarts[i]) <= end && (i & 1) != 0 && + removeSpansForChange(start, end, textIsRemoved, rightChild(i)); + } + return false; + } + private void change(int start, int end, CharSequence cs, int csStart, int csEnd) { // Can be negative final int replacedLength = end - start; final int replacementLength = csEnd - csStart; final int nbNewChars = replacementLength - replacedLength; + boolean changed = false; for (int i = mSpanCount - 1; i >= 0; i--) { int spanStart = mSpanStarts[i]; if (spanStart > mGapStart) @@ -309,8 +348,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable break; } - if (spanStart != ost || spanEnd != oen) + if (spanStart != ost || spanEnd != oen) { setSpan(false, mSpans[i], spanStart, spanEnd, mSpanFlags[i]); + changed = true; + } } int flags = 0; @@ -320,6 +361,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable else if (spanEnd == end + nbNewChars) flags |= SPAN_END_AT_END; mSpanFlags[i] |= flags; } + if (changed) { + restoreInvariants(); + } moveGapTo(end); @@ -331,23 +375,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable // The removal pass needs to be done before the gap is updated in order to broadcast the // correct previous positions to the correct intersecting SpanWatchers if (replacedLength > 0) { // no need for span fixup on pure insertion - // A for loop will not work because the array is being modified - // Do not iterate in reverse to keep the SpanWatchers notified in ordering - // Also, a removed SpanWatcher should not get notified of removed spans located - // further in the span array. - int i = 0; - while (i < mSpanCount) { - if ((mSpanFlags[i] & Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) == - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE && - mSpanStarts[i] >= start && mSpanStarts[i] < mGapStart + mGapLength && - mSpanEnds[i] >= start && mSpanEnds[i] < mGapStart + mGapLength && - // This condition indicates that the span would become empty - (textIsRemoved || mSpanStarts[i] > start || mSpanEnds[i] < mGapStart)) { - removeSpan(i); - continue; // do not increment i, spans will be shifted left in the array - } - - i++; + while (mSpanCount > 0 && + removeSpansForChange(start, end, textIsRemoved, treeRoot())) { + // keep deleting spans as needed, and restart from root after every deletion + // because deletion can invalidate an index. } } @@ -360,6 +391,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable TextUtils.getChars(cs, csStart, csEnd, mText, start); if (replacedLength > 0) { // no need for span fixup on pure insertion + // TODO potential optimization: only update bounds on intersecting spans final boolean atEnd = (mGapStart + mGapLength == mText.length); for (int i = 0; i < mSpanCount; i++) { @@ -371,10 +403,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable mSpanEnds[i] = updatedIntervalBound(mSpanEnds[i], start, nbNewChars, endFlag, atEnd, textIsRemoved); } + // TODO potential optimization: only fix up invariants when bounds actually changed + restoreInvariants(); } - mSpanCountBeforeAdd = mSpanCount; - if (cs instanceof Spanned) { Spanned sp = (Spanned) cs; Object[] spans = sp.getSpans(csStart, csEnd, Object.class); @@ -389,9 +421,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable // Add span only if this object is not yet used as a span in this string if (getSpanStart(spans[i]) < 0) { setSpan(false, spans[i], st - csStart + start, en - csStart + start, - sp.getSpanFlags(spans[i])); + sp.getSpanFlags(spans[i]) | SPAN_ADDED); } } + restoreInvariants(); } } @@ -427,6 +460,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable return offset; } + // Note: caller is responsible for removing the mIndexOfSpan entry. private void removeSpan(int i) { Object object = mSpans[i]; @@ -444,8 +478,12 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable mSpanCount--; + invalidateIndex(i); mSpans[mSpanCount] = null; + // Invariants must be restored before sending span removed notifications. + restoreInvariants(); + sendSpanRemoved(object, start, end); } @@ -496,10 +534,12 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable change(start, end, tb, tbstart, tbend); if (adjustSelection) { + boolean changed = false; if (selectionStart > start && selectionStart < end) { final int offset = (selectionStart - start) * newLen / origLen; selectionStart = start + offset; + changed = true; setSpan(false, Selection.SELECTION_START, selectionStart, selectionStart, Spanned.SPAN_POINT_POINT); } @@ -507,9 +547,13 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable final int offset = (selectionEnd - start) * newLen / origLen; selectionEnd = start + offset; + changed = true; setSpan(false, Selection.SELECTION_END, selectionEnd, selectionEnd, Spanned.SPAN_POINT_POINT); } + if (changed) { + restoreInvariants(); + } } sendTextChanged(textWatchers, start, origLen, newLen); @@ -536,12 +580,15 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable } private void sendToSpanWatchers(int replaceStart, int replaceEnd, int nbNewChars) { - for (int i = 0; i < mSpanCountBeforeAdd; i++) { + for (int i = 0; i < mSpanCount; i++) { + int spanFlags = mSpanFlags[i]; + + // This loop handles only modified (not added) spans. + if ((spanFlags & SPAN_ADDED) != 0) continue; int spanStart = mSpanStarts[i]; int spanEnd = mSpanEnds[i]; if (spanStart > mGapStart) spanStart -= mGapLength; if (spanEnd > mGapStart) spanEnd -= mGapLength; - int spanFlags = mSpanFlags[i]; int newReplaceEnd = replaceEnd + nbNewChars; boolean spanChanged = false; @@ -588,13 +635,17 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable mSpanFlags[i] &= ~SPAN_START_END_MASK; } - // The spans starting at mIntermediateSpanCount were added from the replacement text - for (int i = mSpanCountBeforeAdd; i < mSpanCount; i++) { - int spanStart = mSpanStarts[i]; - int spanEnd = mSpanEnds[i]; - if (spanStart > mGapStart) spanStart -= mGapLength; - if (spanEnd > mGapStart) spanEnd -= mGapLength; - sendSpanAdded(mSpans[i], spanStart, spanEnd); + // Handle added spans + for (int i = 0; i < mSpanCount; i++) { + int spanFlags = mSpanFlags[i]; + if ((spanFlags & SPAN_ADDED) != 0) { + mSpanFlags[i] &= ~SPAN_ADDED; + int spanStart = mSpanStarts[i]; + int spanEnd = mSpanEnds[i]; + if (spanStart > mGapStart) spanStart -= mGapLength; + if (spanEnd > mGapStart) spanEnd -= mGapLength; + sendSpanAdded(mSpans[i], spanStart, spanEnd); + } } } @@ -607,6 +658,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable setSpan(true, what, start, end, flags); } + // Note: if send is false, then it is the caller's responsibility to restore + // invariants. If send is false and the span already exists, then this method + // will not change the index of any spans. private void setSpan(boolean send, Object what, int start, int end, int flags) { checkRange("setSpan", start, end); @@ -661,8 +715,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable int count = mSpanCount; Object[] spans = mSpans; - for (int i = 0; i < count; i++) { - if (spans[i] == what) { + if (mIndexOfSpan != null) { + Integer index = mIndexOfSpan.get(what); + if (index != null) { + int i = index; int ostart = mSpanStarts[i]; int oend = mSpanEnds[i]; @@ -675,7 +731,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable mSpanEnds[i] = end; mSpanFlags[i] = flags; - if (send) sendSpanChanged(what, ostart, oend, nstart, nend); + if (send) { + restoreInvariants(); + sendSpanChanged(what, ostart, oend, nstart, nend); + } return; } @@ -685,43 +744,48 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable mSpanStarts = GrowingArrayUtils.append(mSpanStarts, mSpanCount, start); mSpanEnds = GrowingArrayUtils.append(mSpanEnds, mSpanCount, end); mSpanFlags = GrowingArrayUtils.append(mSpanFlags, mSpanCount, flags); + invalidateIndex(mSpanCount); mSpanCount++; + // Make sure there is enough room for empty interior nodes. + // This magic formula computes the size of the smallest perfect binary + // tree no smaller than mSpanCount. + int sizeOfMax = 2 * treeRoot() + 1; + if (mSpanMax.length < sizeOfMax) { + mSpanMax = new int[sizeOfMax]; + } - if (send) sendSpanAdded(what, nstart, nend); + if (send) { + restoreInvariants(); + sendSpanAdded(what, nstart, nend); + } } /** * Remove the specified markup object from the buffer. */ public void removeSpan(Object what) { - for (int i = mSpanCount - 1; i >= 0; i--) { - if (mSpans[i] == what) { - removeSpan(i); - return; - } + if (mIndexOfSpan == null) return; + Integer i = mIndexOfSpan.remove(what); + if (i != null) { + removeSpan(i.intValue()); } } /** + * Return externally visible offset given offset into gapped buffer. + */ + private int resolveGap(int i) { + return i > mGapStart ? i - mGapLength : i; + } + + /** * Return the buffer offset of the beginning of the specified * markup object, or -1 if it is not attached to this buffer. */ public int getSpanStart(Object what) { - int count = mSpanCount; - Object[] spans = mSpans; - - for (int i = count - 1; i >= 0; i--) { - if (spans[i] == what) { - int where = mSpanStarts[i]; - - if (where > mGapStart) - where -= mGapLength; - - return where; - } - } - - return -1; + if (mIndexOfSpan == null) return -1; + Integer i = mIndexOfSpan.get(what); + return i == null ? -1 : resolveGap(mSpanStarts[i]); } /** @@ -729,21 +793,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable * markup object, or -1 if it is not attached to this buffer. */ public int getSpanEnd(Object what) { - int count = mSpanCount; - Object[] spans = mSpans; - - for (int i = count - 1; i >= 0; i--) { - if (spans[i] == what) { - int where = mSpanEnds[i]; - - if (where > mGapStart) - where -= mGapLength; - - return where; - } - } - - return -1; + if (mIndexOfSpan == null) return -1; + Integer i = mIndexOfSpan.get(what); + return i == null ? -1 : resolveGap(mSpanEnds[i]); } /** @@ -751,16 +803,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable * markup object, or 0 if it is not attached to this buffer. */ public int getSpanFlags(Object what) { - int count = mSpanCount; - Object[] spans = mSpans; - - for (int i = count - 1; i >= 0; i--) { - if (spans[i] == what) { - return mSpanFlags[i]; - } - } - - return 0; + if (mIndexOfSpan == null) return 0; + Integer i = mIndexOfSpan.get(what); + return i == null ? 0 : mSpanFlags[i]; } /** @@ -770,59 +815,84 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable */ @SuppressWarnings("unchecked") public <T> T[] getSpans(int queryStart, int queryEnd, Class<T> kind) { - if (kind == null) return ArrayUtils.emptyArray(kind); + if (kind == null || mSpanCount == 0) return ArrayUtils.emptyArray(kind); + int count = countSpans(queryStart, queryEnd, kind, treeRoot()); + if (count == 0) { + return ArrayUtils.emptyArray(kind); + } - int spanCount = mSpanCount; - Object[] spans = mSpans; - int[] starts = mSpanStarts; - int[] ends = mSpanEnds; - int[] flags = mSpanFlags; - int gapstart = mGapStart; - int gaplen = mGapLength; + // Safe conversion, but requires a suppressWarning + T[] ret = (T[]) Array.newInstance(kind, count); + getSpansRec(queryStart, queryEnd, kind, treeRoot(), ret, 0); + return ret; + } + private int countSpans(int queryStart, int queryEnd, Class kind, int i) { int count = 0; - T[] ret = null; - T ret1 = null; - - for (int i = 0; i < spanCount; i++) { - int spanStart = starts[i]; - if (spanStart > gapstart) { - spanStart -= gaplen; + if ((i & 1) != 0) { + // internal tree node + int left = leftChild(i); + int spanMax = mSpanMax[left]; + if (spanMax > mGapStart) { + spanMax -= mGapLength; } - if (spanStart > queryEnd) { - continue; + if (spanMax >= queryStart) { + count = countSpans(queryStart, queryEnd, kind, left); } - - int spanEnd = ends[i]; - if (spanEnd > gapstart) { - spanEnd -= gaplen; + } + if (i < mSpanCount) { + int spanStart = mSpanStarts[i]; + if (spanStart > mGapStart) { + spanStart -= mGapLength; } - if (spanEnd < queryStart) { - continue; + if (spanStart <= queryEnd) { + int spanEnd = mSpanEnds[i]; + if (spanEnd > mGapStart) { + spanEnd -= mGapLength; + } + if (spanEnd >= queryStart && + (spanStart == spanEnd || queryStart == queryEnd || + (spanStart != queryEnd && spanEnd != queryStart)) && + kind.isInstance(mSpans[i])) { + count++; + } + if ((i & 1) != 0) { + count += countSpans(queryStart, queryEnd, kind, rightChild(i)); + } } + } + return count; + } - if (spanStart != spanEnd && queryStart != queryEnd) { - if (spanStart == queryEnd) - continue; - if (spanEnd == queryStart) - continue; + @SuppressWarnings("unchecked") + private <T> int getSpansRec(int queryStart, int queryEnd, Class<T> kind, + int i, T[] ret, int count) { + if ((i & 1) != 0) { + // internal tree node + int left = leftChild(i); + int spanMax = mSpanMax[left]; + if (spanMax > mGapStart) { + spanMax -= mGapLength; } - - // Expensive test, should be performed after the previous tests - if (!kind.isInstance(spans[i])) continue; - - if (count == 0) { - // Safe conversion thanks to the isInstance test above - ret1 = (T) spans[i]; - count++; - } else { - if (count == 1) { - // Safe conversion, but requires a suppressWarning - ret = (T[]) Array.newInstance(kind, spanCount - i + 1); - ret[0] = ret1; - } - - int prio = flags[i] & SPAN_PRIORITY; + if (spanMax >= queryStart) { + count = getSpansRec(queryStart, queryEnd, kind, left, ret, count); + } + } + if (i >= mSpanCount) return count; + int spanStart = mSpanStarts[i]; + if (spanStart > mGapStart) { + spanStart -= mGapLength; + } + if (spanStart <= queryEnd) { + int spanEnd = mSpanEnds[i]; + if (spanEnd > mGapStart) { + spanEnd -= mGapLength; + } + if (spanEnd >= queryStart && + (spanStart == spanEnd || queryStart == queryEnd || + (spanStart != queryEnd && spanEnd != queryStart)) && + kind.isInstance(mSpans[i])) { + int prio = mSpanFlags[i] & SPAN_PRIORITY; if (prio != 0) { int j; @@ -836,32 +906,18 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable System.arraycopy(ret, j, ret, j + 1, count - j); // Safe conversion thanks to the isInstance test above - ret[j] = (T) spans[i]; - count++; + ret[j] = (T) mSpans[i]; } else { // Safe conversion thanks to the isInstance test above - ret[count++] = (T) spans[i]; + ret[count] = (T) mSpans[i]; } + count++; + } + if (count < ret.length && (i & 1) != 0) { + count = getSpansRec(queryStart, queryEnd, kind, rightChild(i), ret, count); } } - - if (count == 0) { - return ArrayUtils.emptyArray(kind); - } - if (count == 1) { - // Safe conversion, but requires a suppressWarning - ret = (T[]) Array.newInstance(kind, 1); - ret[0] = ret1; - return ret; - } - if (count == ret.length) { - return ret; - } - - // Safe conversion, but requires a suppressWarning - T[] nret = (T[]) Array.newInstance(kind, count); - System.arraycopy(ret, 0, nret, 0, count); - return nret; + return count; } /** @@ -870,30 +926,31 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable * begins or ends. */ public int nextSpanTransition(int start, int limit, Class kind) { - int count = mSpanCount; - Object[] spans = mSpans; - int[] starts = mSpanStarts; - int[] ends = mSpanEnds; - int gapstart = mGapStart; - int gaplen = mGapLength; - + if (mSpanCount == 0) return limit; if (kind == null) { kind = Object.class; } + return nextSpanTransitionRec(start, limit, kind, treeRoot()); + } - for (int i = 0; i < count; i++) { - int st = starts[i]; - int en = ends[i]; - - if (st > gapstart) - st -= gaplen; - if (en > gapstart) - en -= gaplen; - - if (st > start && st < limit && kind.isInstance(spans[i])) + private int nextSpanTransitionRec(int start, int limit, Class kind, int i) { + if ((i & 1) != 0) { + // internal tree node + int left = leftChild(i); + if (resolveGap(mSpanMax[left]) > start) { + limit = nextSpanTransitionRec(start, limit, kind, left); + } + } + if (i < mSpanCount) { + int st = resolveGap(mSpanStarts[i]); + int en = resolveGap(mSpanEnds[i]); + if (st > start && st < limit && kind.isInstance(mSpans[i])) limit = st; - if (en > start && en < limit && kind.isInstance(spans[i])) + if (en > start && en < limit && kind.isInstance(mSpans[i])) limit = en; + if (st < limit && (i & 1) != 0) { + limit = nextSpanTransitionRec(start, limit, kind, rightChild(i)); + } } return limit; @@ -1339,6 +1396,118 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable return hash; } + // Primitives for treating span list as binary tree + + // The spans (along with start and end offsets and flags) are stored in linear arrays sorted + // by start offset. For fast searching, there is a binary search structure imposed over these + // arrays. This structure is inorder traversal of a perfect binary tree, a slightly unusual + // but advantageous approach. + + // The value-containing nodes are indexed 0 <= i < n (where n = mSpanCount), thus preserving + // logic that accesses the values as a contiguous array. Other balanced binary tree approaches + // (such as a complete binary tree) would require some shuffling of node indices. + + // Basic properties of this structure: For a perfect binary tree of height m: + // The tree has 2^(m+1) - 1 total nodes. + // The root of the tree has index 2^m - 1. + // All leaf nodes have even index, all interior nodes odd. + // The height of a node of index i is the number of trailing ones in i's binary representation. + // The left child of a node i of height h is i - 2^(h - 1). + // The right child of a node i of height h is i + 2^(h - 1). + + // Note that for arbitrary n, interior nodes of this tree may be >= n. Thus, the general + // structure of a recursive traversal of node i is: + // * traverse left child if i is an interior node + // * process i if i < n + // * traverse right child if i is an interior node and i < n + + private int treeRoot() { + return Integer.highestOneBit(mSpanCount) - 1; + } + + // (i+1) & ~i is equal to 2^(the number of trailing ones in i) + private static int leftChild(int i) { + return i - (((i + 1) & ~i) >> 1); + } + + private static int rightChild(int i) { + return i + (((i + 1) & ~i) >> 1); + } + + // The span arrays are also augmented by an mSpanMax[] array that represents an interval tree + // over the binary tree structure described above. For each node, the mSpanMax[] array contains + // the maximum value of mSpanEnds of that node and its descendants. Thus, traversals can + // easily reject subtrees that contain no spans overlapping the area of interest. + + // Note that mSpanMax[] also has a valid valuefor interior nodes of index >= n, but which have + // descendants of index < n. In these cases, it simply represents the maximum span end of its + // descendants. This is a consequence of the perfect binary tree structure. + private int calcMax(int i) { + int max = 0; + if ((i & 1) != 0) { + // internal tree node + max = calcMax(leftChild(i)); + } + if (i < mSpanCount) { + max = Math.max(max, mSpanEnds[i]); + if ((i & 1) != 0) { + max = Math.max(max, calcMax(rightChild(i))); + } + } + mSpanMax[i] = max; + return max; + } + + // restores binary interval tree invariants after any mutation of span structure + private void restoreInvariants() { + if (mSpanCount == 0) return; + + // invariant 1: span starts are nondecreasing + + // This is a simple insertion sort because we expect it to be mostly sorted. + for (int i = 1; i < mSpanCount; i++) { + if (mSpanStarts[i] < mSpanStarts[i - 1]) { + Object span = mSpans[i]; + int start = mSpanStarts[i]; + int end = mSpanEnds[i]; + int flags = mSpanFlags[i]; + int j = i; + do { + mSpans[j] = mSpans[j - 1]; + mSpanStarts[j] = mSpanStarts[j - 1]; + mSpanEnds[j] = mSpanEnds[j - 1]; + mSpanFlags[j] = mSpanFlags[j - 1]; + j--; + } while (j > 0 && start < mSpanStarts[j - 1]); + mSpans[j] = span; + mSpanStarts[j] = start; + mSpanEnds[j] = end; + mSpanFlags[j] = flags; + invalidateIndex(j); + } + } + + // invariant 2: max is max span end for each node and its descendants + calcMax(treeRoot()); + + // invariant 3: mIndexOfSpan maps spans back to indices + if (mIndexOfSpan == null) { + mIndexOfSpan = new IdentityHashMap<Object, Integer>(); + } + for (int i = mLowWaterMark; i < mSpanCount; i++) { + Integer existing = mIndexOfSpan.get(mSpans[i]); + if (existing == null || existing != i) { + mIndexOfSpan.put(mSpans[i], i); + } + } + mLowWaterMark = Integer.MAX_VALUE; + } + + // Call this on any update to mSpans[], so that mIndexOfSpan can be updated + private void invalidateIndex(int i) { + mLowWaterMark = Math.min(i, mLowWaterMark); + } + private static final InputFilter[] NO_FILTERS = new InputFilter[0]; private InputFilter[] mFilters = NO_FILTERS; @@ -1349,9 +1518,11 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable private Object[] mSpans; private int[] mSpanStarts; private int[] mSpanEnds; + private int[] mSpanMax; // see calcMax() for an explanation of what this array stores private int[] mSpanFlags; private int mSpanCount; - private int mSpanCountBeforeAdd; + private IdentityHashMap<Object, Integer> mIndexOfSpan; + private int mLowWaterMark; // indices below this have not been touched // TODO These value are tightly related to the public SPAN_MARK/POINT values in {@link Spanned} private static final int MARK = 1; @@ -1363,6 +1534,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable private static final int START_SHIFT = 4; // These bits are not (currently) used by SPANNED flags + private static final int SPAN_ADDED = 0x800; private static final int SPAN_START_AT_START = 0x1000; private static final int SPAN_START_AT_END = 0x2000; private static final int SPAN_END_AT_START = 0x4000; diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index d0ed871..ac98e8a 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -28,9 +28,11 @@ import java.util.Date; import java.util.Formatter; import java.util.GregorianCalendar; import java.util.Locale; +import java.util.TimeZone; import libcore.icu.DateIntervalFormat; import libcore.icu.LocaleData; +import libcore.icu.RelativeDateTimeFormatter; /** * This class contains various date-related utilities for creating text for things like @@ -242,6 +244,8 @@ public class DateUtils /** * Returns a string describing the elapsed time since startTime. + * <p> + * The minimum timespan to report is set to {@link #MINUTE_IN_MILLIS}. * @param startTime some time in the past. * @return a String object containing the elapsed time. * @see #getRelativeTimeSpanString(long, long, long) @@ -289,69 +293,8 @@ public class DateUtils */ public static CharSequence getRelativeTimeSpanString(long time, long now, long minResolution, int flags) { - Resources r = Resources.getSystem(); - boolean abbrevRelative = (flags & (FORMAT_ABBREV_RELATIVE | FORMAT_ABBREV_ALL)) != 0; - - boolean past = (now >= time); - long duration = Math.abs(now - time); - - int resId; - long count; - if (duration < MINUTE_IN_MILLIS && minResolution < MINUTE_IN_MILLIS) { - count = duration / SECOND_IN_MILLIS; - if (past) { - if (abbrevRelative) { - resId = com.android.internal.R.plurals.abbrev_num_seconds_ago; - } else { - resId = com.android.internal.R.plurals.num_seconds_ago; - } - } else { - if (abbrevRelative) { - resId = com.android.internal.R.plurals.abbrev_in_num_seconds; - } else { - resId = com.android.internal.R.plurals.in_num_seconds; - } - } - } else if (duration < HOUR_IN_MILLIS && minResolution < HOUR_IN_MILLIS) { - count = duration / MINUTE_IN_MILLIS; - if (past) { - if (abbrevRelative) { - resId = com.android.internal.R.plurals.abbrev_num_minutes_ago; - } else { - resId = com.android.internal.R.plurals.num_minutes_ago; - } - } else { - if (abbrevRelative) { - resId = com.android.internal.R.plurals.abbrev_in_num_minutes; - } else { - resId = com.android.internal.R.plurals.in_num_minutes; - } - } - } else if (duration < DAY_IN_MILLIS && minResolution < DAY_IN_MILLIS) { - count = duration / HOUR_IN_MILLIS; - if (past) { - if (abbrevRelative) { - resId = com.android.internal.R.plurals.abbrev_num_hours_ago; - } else { - resId = com.android.internal.R.plurals.num_hours_ago; - } - } else { - if (abbrevRelative) { - resId = com.android.internal.R.plurals.abbrev_in_num_hours; - } else { - resId = com.android.internal.R.plurals.in_num_hours; - } - } - } else if (duration < WEEK_IN_MILLIS && minResolution < WEEK_IN_MILLIS) { - return getRelativeDayString(r, time, now); - } else { - // We know that we won't be showing the time, so it is safe to pass - // in a null context. - return formatDateRange(null, time, time, flags); - } - - String format = r.getQuantityString(resId, (int) count); - return String.format(format, count); + return RelativeDateTimeFormatter.getRelativeTimeSpanString(Locale.getDefault(), + TimeZone.getDefault(), time, now, minResolution, flags); } /** @@ -360,8 +303,8 @@ public class DateUtils * <p> * Example output strings for the US date format. * <ul> - * <li>3 mins ago, 10:15 AM</li> - * <li>yesterday, 12:20 PM</li> + * <li>3 min. ago, 10:15 AM</li> + * <li>Yesterday, 12:20 PM</li> * <li>Dec 12, 4:12 AM</li> * <li>11/14/2007, 8:20 AM</li> * </ul> @@ -374,86 +317,19 @@ public class DateUtils * @param transitionResolution the elapsed time (in milliseconds) at which * to stop reporting relative measurements. Elapsed times greater * than this resolution will default to normal date formatting. - * For example, will transition from "6 days ago" to "Dec 12" + * For example, will transition from "7 days ago" to "Dec 12" * when using {@link #WEEK_IN_MILLIS}. */ public static CharSequence getRelativeDateTimeString(Context c, long time, long minResolution, long transitionResolution, int flags) { - Resources r = Resources.getSystem(); - - long now = System.currentTimeMillis(); - long duration = Math.abs(now - time); - - // getRelativeTimeSpanString() doesn't correctly format relative dates - // above a week or exact dates below a day, so clamp - // transitionResolution as needed. - if (transitionResolution > WEEK_IN_MILLIS) { - transitionResolution = WEEK_IN_MILLIS; - } else if (transitionResolution < DAY_IN_MILLIS) { - transitionResolution = DAY_IN_MILLIS; - } - - CharSequence timeClause = formatDateRange(c, time, time, FORMAT_SHOW_TIME); - - String result; - if (duration < transitionResolution) { - CharSequence relativeClause = getRelativeTimeSpanString(time, now, minResolution, flags); - result = r.getString(com.android.internal.R.string.relative_time, relativeClause, timeClause); - } else { - CharSequence dateClause = getRelativeTimeSpanString(c, time, false); - result = r.getString(com.android.internal.R.string.date_time, dateClause, timeClause); - } - - return result; - } - - /** - * Returns a string describing a day relative to the current day. For example if the day is - * today this function returns "Today", if the day was a week ago it returns "7 days ago", and - * if the day is in 2 weeks it returns "in 14 days". - * - * @param r the resources - * @param day the relative day to describe in UTC milliseconds - * @param today the current time in UTC milliseconds - */ - private static final String getRelativeDayString(Resources r, long day, long today) { - Locale locale = r.getConfiguration().locale; - if (locale == null) { - locale = Locale.getDefault(); - } - - // TODO: use TimeZone.getOffset instead. - Time startTime = new Time(); - startTime.set(day); - int startDay = Time.getJulianDay(day, startTime.gmtoff); - - Time currentTime = new Time(); - currentTime.set(today); - int currentDay = Time.getJulianDay(today, currentTime.gmtoff); - - int days = Math.abs(currentDay - startDay); - boolean past = (today > day); - - // TODO: some locales name other days too, such as de_DE's "Vorgestern" (today - 2). - if (days == 1) { - if (past) { - return LocaleData.get(locale).yesterday; - } else { - return LocaleData.get(locale).tomorrow; - } - } else if (days == 0) { - return LocaleData.get(locale).today; - } - - int resId; - if (past) { - resId = com.android.internal.R.plurals.num_days_ago; - } else { - resId = com.android.internal.R.plurals.in_num_days; + // Same reason as in formatDateRange() to explicitly indicate 12- or 24-hour format. + if ((flags & (FORMAT_SHOW_TIME | FORMAT_12HOUR | FORMAT_24HOUR)) == FORMAT_SHOW_TIME) { + flags |= DateFormat.is24HourFormat(c) ? FORMAT_24HOUR : FORMAT_12HOUR; } - String format = r.getQuantityString(resId, days); - return String.format(format, days); + return RelativeDateTimeFormatter.getRelativeDateTimeString(Locale.getDefault(), + TimeZone.getDefault(), time, System.currentTimeMillis(), minResolution, + transitionResolution, flags); } private static void initFormatStrings() { diff --git a/core/java/android/transition/ArcMotion.java b/core/java/android/transition/ArcMotion.java index f95fb49..70dfe7f 100644 --- a/core/java/android/transition/ArcMotion.java +++ b/core/java/android/transition/ArcMotion.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Path; import android.util.AttributeSet; -import android.util.FloatMath; /** * A PathMotion that generates a curved path along an arc on an imaginary circle containing @@ -257,7 +256,7 @@ public class ArcMotion extends PathMotion { } if (newArcDistance2 != 0) { float ratio2 = newArcDistance2 / arcDist2; - float ratio = FloatMath.sqrt(ratio2); + float ratio = (float) Math.sqrt(ratio2); ex = dx + (ratio * (ex - dx)); ey = dy + (ratio * (ey - dy)); } diff --git a/core/java/android/transition/CircularPropagation.java b/core/java/android/transition/CircularPropagation.java index 51beb51..1e44cfa 100644 --- a/core/java/android/transition/CircularPropagation.java +++ b/core/java/android/transition/CircularPropagation.java @@ -16,7 +16,6 @@ package android.transition; import android.graphics.Rect; -import android.util.FloatMath; import android.util.Log; import android.view.View; import android.view.ViewGroup; @@ -87,9 +86,9 @@ public class CircularPropagation extends VisibilityPropagation { epicenterY = Math.round(loc[1] + (sceneRoot.getHeight() / 2) + sceneRoot.getTranslationY()); } - float distance = distance(viewCenterX, viewCenterY, epicenterX, epicenterY); - float maxDistance = distance(0, 0, sceneRoot.getWidth(), sceneRoot.getHeight()); - float distanceFraction = distance/maxDistance; + double distance = distance(viewCenterX, viewCenterY, epicenterX, epicenterY); + double maxDistance = distance(0, 0, sceneRoot.getWidth(), sceneRoot.getHeight()); + double distanceFraction = distance/maxDistance; long duration = transition.getDuration(); if (duration < 0) { @@ -99,9 +98,9 @@ public class CircularPropagation extends VisibilityPropagation { return Math.round(duration * directionMultiplier / mPropagationSpeed * distanceFraction); } - private static float distance(float x1, float y1, float x2, float y2) { - float x = x2 - x1; - float y = y2 - y1; - return FloatMath.sqrt((x * x) + (y * y)); + private static double distance(float x1, float y1, float x2, float y2) { + double x = x2 - x1; + double y = y2 - y1; + return Math.hypot(x, y); } } diff --git a/core/java/android/transition/Explode.java b/core/java/android/transition/Explode.java index 0ccdf15..788676a 100644 --- a/core/java/android/transition/Explode.java +++ b/core/java/android/transition/Explode.java @@ -22,7 +22,6 @@ import android.animation.TimeInterpolator; import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.FloatMath; import android.view.View; import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; @@ -143,32 +142,29 @@ public class Explode extends Visibility { int centerX = bounds.centerX(); int centerY = bounds.centerY(); - float xVector = centerX - focalX; - float yVector = centerY - focalY; + double xVector = centerX - focalX; + double yVector = centerY - focalY; if (xVector == 0 && yVector == 0) { // Random direction when View is centered on focal View. - xVector = (float) (Math.random() * 2) - 1; - yVector = (float) (Math.random() * 2) - 1; + xVector = (Math.random() * 2) - 1; + yVector = (Math.random() * 2) - 1; } - float vectorSize = calculateDistance(xVector, yVector); + double vectorSize = Math.hypot(xVector, yVector); xVector /= vectorSize; yVector /= vectorSize; - float maxDistance = + double maxDistance = calculateMaxDistance(sceneRoot, focalX - sceneRootX, focalY - sceneRootY); - outVector[0] = Math.round(maxDistance * xVector); - outVector[1] = Math.round(maxDistance * yVector); + outVector[0] = (int) Math.round(maxDistance * xVector); + outVector[1] = (int) Math.round(maxDistance * yVector); } - private static float calculateMaxDistance(View sceneRoot, int focalX, int focalY) { + private static double calculateMaxDistance(View sceneRoot, int focalX, int focalY) { int maxX = Math.max(focalX, sceneRoot.getWidth() - focalX); int maxY = Math.max(focalY, sceneRoot.getHeight() - focalY); - return calculateDistance(maxX, maxY); + return Math.hypot(maxX, maxY); } - private static float calculateDistance(float x, float y) { - return FloatMath.sqrt((x * x) + (y * y)); - } } diff --git a/core/java/android/transition/PatternPathMotion.java b/core/java/android/transition/PatternPathMotion.java index a609df6..773c387 100644 --- a/core/java/android/transition/PatternPathMotion.java +++ b/core/java/android/transition/PatternPathMotion.java @@ -23,7 +23,6 @@ import android.graphics.Matrix; import android.graphics.Path; import android.graphics.PathMeasure; import android.util.AttributeSet; -import android.util.FloatMath; import android.util.PathParser; /** @@ -119,7 +118,7 @@ public class PatternPathMotion extends PathMotion { mTempMatrix.setTranslate(-startX, -startY); float dx = endX - startX; float dy = endY - startY; - float distance = distance(dx, dy); + float distance = (float) Math.hypot(dx, dy); float scale = 1 / distance; mTempMatrix.postScale(scale, scale); double angle = Math.atan2(dy, dx); @@ -130,9 +129,9 @@ public class PatternPathMotion extends PathMotion { @Override public Path getPath(float startX, float startY, float endX, float endY) { - float dx = endX - startX; - float dy = endY - startY; - float length = distance(dx, dy); + double dx = endX - startX; + double dy = endY - startY; + float length = (float) Math.hypot(dx, dy); double angle = Math.atan2(dy, dx); mTempMatrix.setScale(length, length); @@ -143,7 +142,4 @@ public class PatternPathMotion extends PathMotion { return path; } - private static float distance(float x, float y) { - return FloatMath.sqrt((x * x) + (y * y)); - } } diff --git a/core/java/android/transition/SidePropagation.java b/core/java/android/transition/SidePropagation.java index ad6c2dd..5dd1fff 100644 --- a/core/java/android/transition/SidePropagation.java +++ b/core/java/android/transition/SidePropagation.java @@ -16,7 +16,6 @@ package android.transition; import android.graphics.Rect; -import android.util.FloatMath; import android.util.Log; import android.view.Gravity; import android.view.View; diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index 6925756..391347e 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -24,7 +24,6 @@ import android.graphics.Rect; import android.content.Context; import android.graphics.Canvas; -import android.util.FloatMath; import android.view.animation.AnimationUtils; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; @@ -220,8 +219,8 @@ public class EdgeEffect { if (mPullDistance == 0) { mGlowScaleY = mGlowScaleYStart = 0; } else { - final float scale = Math.max(0, 1 - 1 / - FloatMath.sqrt(Math.abs(mPullDistance) * mBounds.height()) - 0.3f) / 0.7f; + final float scale = (float) (Math.max(0, 1 - 1 / + Math.sqrt(Math.abs(mPullDistance) * mBounds.height()) - 0.3d) / 0.7d); mGlowScaleY = mGlowScaleYStart = scale; } diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index d1b1a1a..0b737a7 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -16,6 +16,8 @@ #define LOG_TAG "SensorManager" +#include <map> + #include <utils/Log.h> #include <utils/Looper.h> @@ -44,7 +46,6 @@ struct SensorOffsets jfieldID vendor; jfieldID version; jfieldID handle; - jfieldID type; jfieldID range; jfieldID resolution; jfieldID power; @@ -55,6 +56,7 @@ struct SensorOffsets jfieldID requiredPermission; jfieldID maxDelay; jfieldID flags; + jmethodID setType; } gSensorOffsets; @@ -71,7 +73,6 @@ nativeClassInit (JNIEnv *_env, jclass _this) sensorOffsets.vendor = _env->GetFieldID(sensorClass, "mVendor", "Ljava/lang/String;"); sensorOffsets.version = _env->GetFieldID(sensorClass, "mVersion", "I"); sensorOffsets.handle = _env->GetFieldID(sensorClass, "mHandle", "I"); - sensorOffsets.type = _env->GetFieldID(sensorClass, "mType", "I"); sensorOffsets.range = _env->GetFieldID(sensorClass, "mMaxRange", "F"); sensorOffsets.resolution = _env->GetFieldID(sensorClass, "mResolution","F"); sensorOffsets.power = _env->GetFieldID(sensorClass, "mPower", "F"); @@ -84,6 +85,47 @@ nativeClassInit (JNIEnv *_env, jclass _this) "Ljava/lang/String;"); sensorOffsets.maxDelay = _env->GetFieldID(sensorClass, "mMaxDelay", "I"); sensorOffsets.flags = _env->GetFieldID(sensorClass, "mFlags", "I"); + sensorOffsets.setType = _env->GetMethodID(sensorClass, "setType", "(I)Z"); +} + +/** + * A key comparator predicate. + * It is used to intern strings associated with Sensor data. + * It defines a 'Strict weak ordering' for the interned strings. + */ +class InternedStringCompare { +public: + bool operator()(const String8* string1, const String8* string2) const { + if (string1 == NULL) { + return string2 != NULL; + } + return string1->compare(*string2) < 0; + } +}; + +/** + * A localized interning mechanism for Sensor strings. + * We implement our own interning to avoid the overhead of using java.lang.String#intern(). + * It is common that Vendor, StringType, and RequirePermission data is common between many of the + * Sensors, by interning the memory usage to represent Sensors is optimized. + */ +static jstring +getInternedString(JNIEnv *env, const String8* string) { + static std::map<const String8*, jstring, InternedStringCompare> internedStrings; + + jstring internedString; + std::map<const String8*, jstring>::iterator iterator = internedStrings.find(string); + if (iterator != internedStrings.end()) { + internedString = iterator->second; + } else { + jstring localString = env->NewStringUTF(string->string()); + // we are implementing our own interning so expect these strings to be backed by global refs + internedString = (jstring) env->NewGlobalRef(localString); + internedStrings.insert(std::make_pair(string, internedString)); + env->DeleteLocalRef(localString); + } + + return internedString; } static jint @@ -93,20 +135,19 @@ nativeGetNextSensor(JNIEnv *env, jclass clazz, jobject sensor, jint next) Sensor const* const* sensorList; size_t count = mgr.getSensorList(&sensorList); - if (size_t(next) >= count) + if (size_t(next) >= count) { return -1; + } Sensor const* const list = sensorList[next]; const SensorOffsets& sensorOffsets(gSensorOffsets); - jstring name = env->NewStringUTF(list->getName().string()); - jstring vendor = env->NewStringUTF(list->getVendor().string()); - jstring stringType = env->NewStringUTF(list->getStringType().string()); - jstring requiredPermission = env->NewStringUTF(list->getRequiredPermission().string()); + jstring name = getInternedString(env, &list->getName()); + jstring vendor = getInternedString(env, &list->getVendor()); + jstring requiredPermission = getInternedString(env, &list->getRequiredPermission()); env->SetObjectField(sensor, sensorOffsets.name, name); env->SetObjectField(sensor, sensorOffsets.vendor, vendor); env->SetIntField(sensor, sensorOffsets.version, list->getVersion()); env->SetIntField(sensor, sensorOffsets.handle, list->getHandle()); - env->SetIntField(sensor, sensorOffsets.type, list->getType()); env->SetFloatField(sensor, sensorOffsets.range, list->getMaxValue()); env->SetFloatField(sensor, sensorOffsets.resolution, list->getResolution()); env->SetFloatField(sensor, sensorOffsets.power, list->getPowerUsage()); @@ -115,11 +156,14 @@ nativeGetNextSensor(JNIEnv *env, jclass clazz, jobject sensor, jint next) list->getFifoReservedEventCount()); env->SetIntField(sensor, sensorOffsets.fifoMaxEventCount, list->getFifoMaxEventCount()); - env->SetObjectField(sensor, sensorOffsets.stringType, stringType); env->SetObjectField(sensor, sensorOffsets.requiredPermission, requiredPermission); env->SetIntField(sensor, sensorOffsets.maxDelay, list->getMaxDelay()); env->SetIntField(sensor, sensorOffsets.flags, list->getFlags()); + if (env->CallBooleanMethod(sensor, sensorOffsets.setType, list->getType()) == JNI_FALSE) { + jstring stringType = getInternedString(env, &list->getStringType()); + env->SetObjectField(sensor, sensorOffsets.stringType, stringType); + } next++; return size_t(next) < count ? next : 0; } diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 7c4c2d0..13487d8 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> wil Verken-met-raak aktiveer. Wanneer Verken-met-raak aangeskakel is, kan jy beskrywings van wat onder jou vinger is hoor of sien, of jy kan gebare uitvoer om interaksie met die foon te hê ."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 maand gelede"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Voor 1 maand gelede"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 sekonde gelede"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> sekondes gelede"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minuut gelede"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minute gelede"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 uur gelede"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> uur gelede"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Verlede maand"</string> <string name="older" msgid="5211975022815554840">"Ouer"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"gister"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> dae gelede"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"oor 1 sekonde"</item> - <item quantity="other" msgid="1241926116443974687">"oor <xliff:g id="COUNT">%d</xliff:g> sekondes"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"oor 1 minuut"</item> - <item quantity="other" msgid="3330713936399448749">"oor <xliff:g id="COUNT">%d</xliff:g> minute"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"oor 1 uur"</item> - <item quantity="other" msgid="547290677353727389">"oor <xliff:g id="COUNT">%d</xliff:g> uur"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"môre"</item> - <item quantity="other" msgid="5109449375100953247">"oor <xliff:g id="COUNT">%d</xliff:g> dae"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 sek. gelede"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> sek. gelede"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 min. gelede"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> min. gelede"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 uur gelede"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> uur gelede"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"gister"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> dae gelede"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"oor 1 sek."</item> - <item quantity="other" msgid="5495880108825805108">"oor <xliff:g id="COUNT">%d</xliff:g> sek."</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"oor 1 min."</item> - <item quantity="other" msgid="4216113292706568726">"oor <xliff:g id="COUNT">%d</xliff:g> minute"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"oor 1 uur"</item> - <item quantity="other" msgid="3705373766798013406">"oor <xliff:g id="COUNT">%d</xliff:g> uur"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"môre"</item> - <item quantity="other" msgid="2973062968038355991">"oor <xliff:g id="COUNT">%d</xliff:g> dae"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"op <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"by <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"in <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index a946741..c7b5b53 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ማሰስን በንኪ ማንቃት ይፈልጋል። አስስ በንኪ በሚበራበት ጊዜ፣ ከስልኩ ጋር ለመግባባት ምን በጣትዎ ስር ወይም ምልክቶችን ማከናወን እንዳለብዎ ማብራሪያ ሊመለከቱ ወይም ሊሰሙ ይችላሉ።"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"ከ1 ወር በፊት"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"ከ1 ወር በፊት"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"ከ1 ሴኮንድ በፊት"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> ሰኮንዶች በፊት"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"ከ 1 ደቂቃ በፊት"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች በፊት"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"ከ1 ሰዓት በፊት"</item> - <item quantity="other" msgid="2467273239587587569">"ከ <xliff:g id="COUNT">%d</xliff:g> ሰዓት በፊት"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">" ያለፈው ወር"</string> <string name="older" msgid="5211975022815554840">"የድሮ"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ትላንትና"</item> - <item quantity="other" msgid="2479586466153314633">"ከ <xliff:g id="COUNT">%d</xliff:g>ቀን በፊት"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"በ1 ሴኮንድ"</item> - <item quantity="other" msgid="1241926116443974687">"በ<xliff:g id="COUNT">%d</xliff:g> ሰከንዶች ውስጥ"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"በ1 ደቂቃ ውስጥ"</item> - <item quantity="other" msgid="3330713936399448749">"በ<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች ውስጥ"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"በ 1 ሰዓት"</item> - <item quantity="other" msgid="547290677353727389">"በ <xliff:g id="COUNT">%d</xliff:g> ሰዓቶች"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ነገ"</item> - <item quantity="other" msgid="5109449375100953247">"በ<xliff:g id="COUNT">%d</xliff:g> ቀኖች"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 ሴኮንድ በፊት"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> ሰከንዶች በፊት"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"ከ 1 ደቂቃ በፊት"</item> - <item quantity="other" msgid="851164968597150710">"ከ <xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች በፊት"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"ከ1 ሰዓት በፊት"</item> - <item quantity="other" msgid="6889970745748538901">"ከ <xliff:g id="COUNT">%d</xliff:g> ሰዓት በፊት"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ትላንትና"</item> - <item quantity="other" msgid="3453342639616481191">"ከ <xliff:g id="COUNT">%d</xliff:g>ቀን በፊት"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"በ1 ሴኮንድ"</item> - <item quantity="other" msgid="5495880108825805108">"በ<xliff:g id="COUNT">%d</xliff:g> ሰከንዶች ውስጥ"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"በ1 ደቂቃ ውስጥ"</item> - <item quantity="other" msgid="4216113292706568726">"በ<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች ውስጥ"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"በ 1 ሰዓት"</item> - <item quantity="other" msgid="3705373766798013406">"በ <xliff:g id="COUNT">%d</xliff:g> ሰዓቶች"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ነገ"</item> - <item quantity="other" msgid="2973062968038355991">"በ<xliff:g id="COUNT">%d</xliff:g> ቀኖች"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"በ <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"በ <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"ውስጥ <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 860b8a0..2beadc6 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"يريد <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> تمكين ميزة Explore by Touch. عند تشغيل ميزة Explore by Touch، سيكون بإمكانك سماع أو مشاهدة أوصاف لما تحت إصبعك أو إجراء إيماءات للتفاعل مع الهاتف."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"قبل شهر واحد"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"قبل شهر واحد"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"قبل ثانية واحدة"</item> - <item quantity="other" msgid="3903706804349556379">"قبل <xliff:g id="COUNT">%d</xliff:g> ثانية"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"قبل دقيقة واحدة"</item> - <item quantity="other" msgid="2176942008915455116">"قبل <xliff:g id="COUNT">%d</xliff:g> دقيقة"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"قبل ساعة واحدة"</item> - <item quantity="other" msgid="2467273239587587569">"قبل <xliff:g id="COUNT">%d</xliff:g> ساعات"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"الشهر الماضي"</string> <string name="older" msgid="5211975022815554840">"أقدم"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"أمس"</item> - <item quantity="other" msgid="2479586466153314633">"قبل <xliff:g id="COUNT">%d</xliff:g> يوم"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"في ثانية واحدة"</item> - <item quantity="other" msgid="1241926116443974687">"في <xliff:g id="COUNT">%d</xliff:g> ثانية"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"في دقيقة واحدة"</item> - <item quantity="other" msgid="3330713936399448749">"في <xliff:g id="COUNT">%d</xliff:g> دقيقة"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"في ساعة واحدة"</item> - <item quantity="other" msgid="547290677353727389">"في <xliff:g id="COUNT">%d</xliff:g> ساعة"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"غدًا"</item> - <item quantity="other" msgid="5109449375100953247">"في <xliff:g id="COUNT">%d</xliff:g> يوم"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"قبل ثانية واحدة"</item> - <item quantity="other" msgid="3699169366650930415">"قبل <xliff:g id="COUNT">%d</xliff:g> ثانية"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"قبل دقيقة واحدة"</item> - <item quantity="other" msgid="851164968597150710">"قبل <xliff:g id="COUNT">%d</xliff:g> دقيقة"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"قبل ساعة واحدة"</item> - <item quantity="other" msgid="6889970745748538901">"قبل <xliff:g id="COUNT">%d</xliff:g> ساعة"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"أمس"</item> - <item quantity="other" msgid="3453342639616481191">"قبل <xliff:g id="COUNT">%d</xliff:g> يوم"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"في ثانية واحدة"</item> - <item quantity="other" msgid="5495880108825805108">"في <xliff:g id="COUNT">%d</xliff:g> ثانية"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"في دقيقة واحدة"</item> - <item quantity="other" msgid="4216113292706568726">"في <xliff:g id="COUNT">%d</xliff:g> دقيقة"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"في ساعة واحدة"</item> - <item quantity="other" msgid="3705373766798013406">"في <xliff:g id="COUNT">%d</xliff:g> ساعة"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"غدًا"</item> - <item quantity="other" msgid="2973062968038355991">"في <xliff:g id="COUNT">%d</xliff:g> يوم"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"في <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"في الساعة <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"في <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml index 479cfcf..b22eb7a 100644 --- a/core/res/res/values-az-rAZ/strings.xml +++ b/core/res/res/values-az-rAZ/strings.xml @@ -967,75 +967,11 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> Toxunaraq Kəşf Et rejimini aktivləşdirmək istəyir. Toxunaraq Kəşf Et açıldığı zaman, barmağınızın altında nə olduğu haqda olan təsvirləri eşidə və ya görə bilərsiniz və ya telefonda insanlarla əlaqəyə keçmək üçün jestlər həyata keçirə bilərsiniz"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 ay öncə"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 ay əvvəl"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 saniyə əvvəl"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> saniyə əvvəl"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 dəqiqə əvvəl"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> dəqiqə əvvəl"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 saat əvvəl"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> saat əvvəl"</item> - </plurals> <plurals name="last_num_days"> <item quantity="other" msgid="3069992808164318268">"Son <xliff:g id="COUNT">%d</xliff:g> gün"</item> </plurals> <string name="last_month" msgid="3959346739979055432">"Keçən ay"</string> <string name="older" msgid="5211975022815554840">"Köhnə"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"dünən"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> gün əvvəl"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 saniyə ərzində"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> saniyə içində"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 dəqiqə içində"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> dəqiqə ərzində"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 saata"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> saata"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"sabah"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> gün ərzində"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 saniyə əvvəl"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> san əvvəl"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 dəqiqə əvvəl"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> dəqiqə əvvəl"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 saat əvvəl"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> saat əvvəl"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"dünən"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> gün əvvəl"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 san ərzində"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> san ərzində"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 dəq ərzində"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> dəqiqəyə"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 saat ərzində"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> saata"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"sabah"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> günə"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> tarixində"</string> <string name="preposition_for_time" msgid="5506831244263083793">"saat <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> ilində"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 9f572cf..1c43360 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> иска да активира изследването чрез докосване. Когато услугата е включена, можете да чувате или да виждате описания на това, което е под пръста ви, или да изпълнявате жестове, за да взаимодействате с телефона."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Преди 1 месец"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Преди повече от месец"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Преди 1 секунда"</item> - <item quantity="other" msgid="3903706804349556379">"Преди <xliff:g id="COUNT">%d</xliff:g> секунди"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Преди 1 минута"</item> - <item quantity="other" msgid="2176942008915455116">"Преди <xliff:g id="COUNT">%d</xliff:g> минути"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Преди 1 час"</item> - <item quantity="other" msgid="2467273239587587569">"Преди <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Последният месец"</string> <string name="older" msgid="5211975022815554840">"По-стари"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"вчера"</item> - <item quantity="other" msgid="2479586466153314633">"Преди <xliff:g id="COUNT">%d</xliff:g> дни"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"след 1 секунда"</item> - <item quantity="other" msgid="1241926116443974687">"след <xliff:g id="COUNT">%d</xliff:g> секунди"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"след 1 минута"</item> - <item quantity="other" msgid="3330713936399448749">"след <xliff:g id="COUNT">%d</xliff:g> минути"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"след 1 час"</item> - <item quantity="other" msgid="547290677353727389">"след <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"утре"</item> - <item quantity="other" msgid="5109449375100953247">"след <xliff:g id="COUNT">%d</xliff:g> дни"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Преди 1 сек"</item> - <item quantity="other" msgid="3699169366650930415">"Преди <xliff:g id="COUNT">%d</xliff:g> сек"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"Преди 1 мин"</item> - <item quantity="other" msgid="851164968597150710">"Преди <xliff:g id="COUNT">%d</xliff:g> мин"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Преди 1 час"</item> - <item quantity="other" msgid="6889970745748538901">"Преди <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"вчера"</item> - <item quantity="other" msgid="3453342639616481191">"Преди <xliff:g id="COUNT">%d</xliff:g> дни"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"след 1 сек"</item> - <item quantity="other" msgid="5495880108825805108">"след <xliff:g id="COUNT">%d</xliff:g> сек"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"след 1 мин"</item> - <item quantity="other" msgid="4216113292706568726">"след <xliff:g id="COUNT">%d</xliff:g> мин"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"след 1 час"</item> - <item quantity="other" msgid="3705373766798013406">"след <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"утре"</item> - <item quantity="other" msgid="2973062968038355991">"след <xliff:g id="COUNT">%d</xliff:g> дни"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"на <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"в <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"през <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index 9f79384..1d389f3 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> \'স্পর্শের মাধ্যমে অন্বেষণ করুন\' সক্ষম করতে চাইছে৷ যখন \'স্পর্শের মাধ্যমে অন্বেষণ করুন\' চালু করা হবে তখন আপনার আঙ্গুলের নিয়ন্ত্রণে থাকা জিনিসের বর্ণনাগুলি শুনতে অথবা দেখতে পাবেন অথবা ফোনের সাথে ইন্টারঅ্যাক্ট করার জন্য অঙ্গভঙ্গির সাহায্য নিতে পারবেন৷"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"১ মাস আগে"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"১ মাস আগে"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"১ সেকেন্ড আগে"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> সেকেন্ড আগে"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"১ মিনিট আগে"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> মিনিট আগে"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"১ ঘন্টা আগে"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ঘন্টা আগে"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"গত মাস"</string> <string name="older" msgid="5211975022815554840">"পুরোনো"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"গতকাল"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> দিন আগে"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"১ সেকেন্ডের মধ্যে"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> সেকেন্ডের মধ্যে"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"১ মিনিটের মধ্যে"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> মিনিটের মধ্যে"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"১ ঘন্টার মধ্যে"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> ঘন্টার মধ্যে"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"আগামীকাল"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> দিনের মধ্যে"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"১ সেকেন্ড আগে"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> সেকেন্ড আগে"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"১ মিনিট আগে"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> মিনিট আগে"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"১ ঘন্টা আগে"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ঘন্টা আগে"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"গতকাল"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> দিন আগে"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"১ সেকেন্ডের মধ্যে"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> সেকেন্ডের মধ্যে"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"১ মিনিটের মধ্যে"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> মিনিটের মধ্যে"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"১ ঘন্টার মধ্যে"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> ঘন্টার মধ্যে"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"আগামীকাল"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> দিনের মধ্যে"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> এ"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> এ"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> এ"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 3f68244..b60187a 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vol activar l\'exploració tàctil. Quan l\'exploració per tàctil està activada, pots escoltar o veure les descripcions del contingut seleccionat o utilitzar gestos per interactuar amb el telèfon."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Fa 1 mes"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Fa més d\'1 mes"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Fa 1 segon"</item> - <item quantity="other" msgid="3903706804349556379">"Fa <xliff:g id="COUNT">%d</xliff:g> segons"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Fa 1 minut"</item> - <item quantity="other" msgid="2176942008915455116">"Fa <xliff:g id="COUNT">%d</xliff:g> minuts"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Fa 1 hora"</item> - <item quantity="other" msgid="2467273239587587569">"Fa <xliff:g id="COUNT">%d</xliff:g> hores"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"El mes passat"</string> <string name="older" msgid="5211975022815554840">"Més antigues"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"Ahir"</item> - <item quantity="other" msgid="2479586466153314633">"Fa <xliff:g id="COUNT">%d</xliff:g> dies"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"d\'aquí a 1 segon"</item> - <item quantity="other" msgid="1241926116443974687">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> segons"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"d\'aquí a 1 minut"</item> - <item quantity="other" msgid="3330713936399448749">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> minuts"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"d\'aquí a 1 hora"</item> - <item quantity="other" msgid="547290677353727389">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> hores"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"demà"</item> - <item quantity="other" msgid="5109449375100953247">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> dies"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Fa 1 s"</item> - <item quantity="other" msgid="3699169366650930415">"Fa <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"fa 1 min"</item> - <item quantity="other" msgid="851164968597150710">"Fa <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Fa 1 hora"</item> - <item quantity="other" msgid="6889970745748538901">"Fa <xliff:g id="COUNT">%d</xliff:g> hores"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ahir"</item> - <item quantity="other" msgid="3453342639616481191">"Fa <xliff:g id="COUNT">%d</xliff:g> dies"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"d\'aquí a 1 s"</item> - <item quantity="other" msgid="5495880108825805108">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"d\'aquí a 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> minuts"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"d\'aquí a 1 hora"</item> - <item quantity="other" msgid="3705373766798013406">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> hores"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"demà"</item> - <item quantity="other" msgid="2973062968038355991">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> dies"</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 les <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"el <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 5cd6802..7e02459 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"Služba <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> požaduje povolení funkce Prozkoumání dotykem. Pokud je funkce Prozkoumání dotykem zapnuta, můžete slyšet nebo vidět popisy objektů pod vaším prstem nebo ovládat telefon gesty."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"před 1 měsícem"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Déle než před 1 měsícem"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"před 1 sekundou"</item> - <item quantity="other" msgid="3903706804349556379">"před <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"před 1 min"</item> - <item quantity="other" msgid="2176942008915455116">"před <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"před 1 h"</item> - <item quantity="other" msgid="2467273239587587569">"před <xliff:g id="COUNT">%d</xliff:g> h"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Poslední měsíc"</string> <string name="older" msgid="5211975022815554840">"Starší"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"včera"</item> - <item quantity="other" msgid="2479586466153314633">"před <xliff:g id="COUNT">%d</xliff:g> dny"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"za 1 sekundu"</item> - <item quantity="other" msgid="1241926116443974687">"za <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"za 1 minutu"</item> - <item quantity="other" msgid="3330713936399448749">"za <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"za 1 hodinu"</item> - <item quantity="other" msgid="547290677353727389">"za <xliff:g id="COUNT">%d</xliff:g> hod."</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"zítra"</item> - <item quantity="other" msgid="5109449375100953247">"za <xliff:g id="COUNT">%d</xliff:g> dny"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"před 1 s"</item> - <item quantity="other" msgid="3699169366650930415">"před <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"před 1 min"</item> - <item quantity="other" msgid="851164968597150710">"před <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"před 1 h"</item> - <item quantity="other" msgid="6889970745748538901">"před <xliff:g id="COUNT">%d</xliff:g> h"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"včera"</item> - <item quantity="other" msgid="3453342639616481191">"před <xliff:g id="COUNT">%d</xliff:g> dny"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"za 1 s"</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 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"za <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"za 1 hodinu"</item> - <item quantity="other" msgid="3705373766798013406">"za <xliff:g id="COUNT">%d</xliff:g> hod."</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"zítra"</item> - <item quantity="other" msgid="2973062968038355991">"za <xliff:g id="COUNT">%d</xliff:g> dny"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"dne <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"v <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"roku <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 157d282..1b71828 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ønsker at aktivere Udforsk ved berøring. Når Udforsk ved berøring er aktiveret, kan du høre eller se beskrivelser af, hvad der er under din finger, eller udføre bevægelser for at interagere med telefonen."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"for 1 måned siden"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Før for 1 måned siden"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"for 1 sekund siden"</item> - <item quantity="other" msgid="3903706804349556379">"for <xliff:g id="COUNT">%d</xliff:g> sekunder siden"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"for 1 minut siden"</item> - <item quantity="other" msgid="2176942008915455116">"for <xliff:g id="COUNT">%d</xliff:g> minutter siden"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"for 1 time siden"</item> - <item quantity="other" msgid="2467273239587587569">"for <xliff:g id="COUNT">%d</xliff:g> timer siden"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Seneste måned"</string> <string name="older" msgid="5211975022815554840">"Ældre"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"i går"</item> - <item quantity="other" msgid="2479586466153314633">"for <xliff:g id="COUNT">%d</xliff:g> dage siden"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"om 1 sekund"</item> - <item quantity="other" msgid="1241926116443974687">"om <xliff:g id="COUNT">%d</xliff:g> sekunder"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"om 1 minut"</item> - <item quantity="other" msgid="3330713936399448749">"om <xliff:g id="COUNT">%d</xliff:g> minutter"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"om 1 time"</item> - <item quantity="other" msgid="547290677353727389">"om <xliff:g id="COUNT">%d</xliff:g> timer"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"i morgen"</item> - <item quantity="other" msgid="5109449375100953247">"om <xliff:g id="COUNT">%d</xliff:g> dage"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"for 1 sek. siden"</item> - <item quantity="other" msgid="3699169366650930415">"for <xliff:g id="COUNT">%d</xliff:g> sek. siden"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"for 1 min. siden"</item> - <item quantity="other" msgid="851164968597150710">"for <xliff:g id="COUNT">%d</xliff:g> min. siden"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"for 1 time siden"</item> - <item quantity="other" msgid="6889970745748538901">"for <xliff:g id="COUNT">%d</xliff:g> timer siden"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"i går"</item> - <item quantity="other" msgid="3453342639616481191">"for <xliff:g id="COUNT">%d</xliff:g> dage siden"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"om 1 sek."</item> - <item quantity="other" msgid="5495880108825805108">"om <xliff:g id="COUNT">%d</xliff:g> sekunder"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"om 1 min."</item> - <item quantity="other" msgid="4216113292706568726">"om <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"om 1 time"</item> - <item quantity="other" msgid="3705373766798013406">"om <xliff:g id="COUNT">%d</xliff:g> timer"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <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">"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> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 5605ccc..3670b67 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> fordert die Aktivierung von \"Tippen & Entdecken\". Wenn \"Tippen & Entdecken\" aktiviert ist, können Sie Beschreibungen dessen hören oder sehen, was sich unter ihren Fingern befindet, oder Gesten ausführen, um mit dem Telefon zu kommunizieren."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Vor 1 Monat"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Vor mehr als 1 Monat"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"vor 1 Sekunde"</item> - <item quantity="other" msgid="3903706804349556379">"vor <xliff:g id="COUNT">%d</xliff:g> Sekunden"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"vor 1 Minute"</item> - <item quantity="other" msgid="2176942008915455116">"vor <xliff:g id="COUNT">%d</xliff:g> Minuten"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"vor 1 Stunde"</item> - <item quantity="other" msgid="2467273239587587569">"vor <xliff:g id="COUNT">%d</xliff:g> Stunden"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Letzter Monat"</string> <string name="older" msgid="5211975022815554840">"Älter"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"gestern"</item> - <item quantity="other" msgid="2479586466153314633">"vor <xliff:g id="COUNT">%d</xliff:g> Tagen"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"in 1 Sekunde"</item> - <item quantity="other" msgid="1241926116443974687">"in <xliff:g id="COUNT">%d</xliff:g> Sekunden"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"in 1 Minute"</item> - <item quantity="other" msgid="3330713936399448749">"in <xliff:g id="COUNT">%d</xliff:g> Minuten"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"in 1 Stunde"</item> - <item quantity="other" msgid="547290677353727389">"In <xliff:g id="COUNT">%d</xliff:g> Stunden"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"morgen"</item> - <item quantity="other" msgid="5109449375100953247">"in <xliff:g id="COUNT">%d</xliff:g> Tagen"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"vor 1 Sekunde"</item> - <item quantity="other" msgid="3699169366650930415">"vor <xliff:g id="COUNT">%d</xliff:g> Sekunden"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"vor 1 Minute"</item> - <item quantity="other" msgid="851164968597150710">"vor <xliff:g id="COUNT">%d</xliff:g> Minuten"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"vor 1 Stunde"</item> - <item quantity="other" msgid="6889970745748538901">"vor <xliff:g id="COUNT">%d</xliff:g> Stunden"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"gestern"</item> - <item quantity="other" msgid="3453342639616481191">"vor <xliff:g id="COUNT">%d</xliff:g> Tagen"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"in 1 Sekunde"</item> - <item quantity="other" msgid="5495880108825805108">"in <xliff:g id="COUNT">%d</xliff:g> Sekunden"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"in 1 Minute"</item> - <item quantity="other" msgid="4216113292706568726">"in <xliff:g id="COUNT">%d</xliff:g> Minuten"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"in 1 Stunde"</item> - <item quantity="other" msgid="3705373766798013406">"In <xliff:g id="COUNT">%d</xliff:g> Stunden"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"morgen"</item> - <item quantity="other" msgid="2973062968038355991">"in <xliff:g id="COUNT">%d</xliff:g> Tagen"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"am <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"um <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"im Jahr <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 9229bc6..da33214 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"Η υπηρεσία <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> απαιτεί ενεργοποίηση της Εξερεύνησης μέσω αφής. Όταν είναι ενεργοποιημένη η Εξερεύνηση μέσω αφής, μπορείτε να δείτε ή να ακούσετε περιγραφές για τις επιλογές που βρίσκονται κάτω από το δάχτυλό σας ή να κάνετε κινήσεις αλληλεπίδρασης με το τηλέφωνό σας."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"πριν από 1 μήνα"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Παλαιότερα από 1 μήνα"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"πριν από 1 δευτερόλεπτο"</item> - <item quantity="other" msgid="3903706804349556379">"πριν από <xliff:g id="COUNT">%d</xliff:g> δευτερόλεπτα"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"πριν από 1 λεπτό"</item> - <item quantity="other" msgid="2176942008915455116">"πριν από <xliff:g id="COUNT">%d</xliff:g> λεπτά"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"πριν από 1 ώρα"</item> - <item quantity="other" msgid="2467273239587587569">"πριν από <xliff:g id="COUNT">%d</xliff:g> ώρες"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Τελευταίος μήνας"</string> <string name="older" msgid="5211975022815554840">"Παλαιότερα"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"χθες"</item> - <item quantity="other" msgid="2479586466153314633">"πριν από <xliff:g id="COUNT">%d</xliff:g> ημέρες"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"σε 1 δευτερόλεπτο"</item> - <item quantity="other" msgid="1241926116443974687">"σε <xliff:g id="COUNT">%d</xliff:g> δευτερόλεπτα"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"σε 1 λεπτό"</item> - <item quantity="other" msgid="3330713936399448749">"σε <xliff:g id="COUNT">%d</xliff:g> λεπτά"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"σε 1 ώρα"</item> - <item quantity="other" msgid="547290677353727389">"σε <xliff:g id="COUNT">%d</xliff:g> ώρες"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"αύριο"</item> - <item quantity="other" msgid="5109449375100953247">"σε <xliff:g id="COUNT">%d</xliff:g> ημέρες"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"πριν από 1 δευτερόλεπτο"</item> - <item quantity="other" msgid="3699169366650930415">"πριν από <xliff:g id="COUNT">%d</xliff:g> δευτερόλεπτα"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"πριν από 1 λεπτό"</item> - <item quantity="other" msgid="851164968597150710">"πριν από <xliff:g id="COUNT">%d</xliff:g> λεπτά"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"πριν από 1 ώρα"</item> - <item quantity="other" msgid="6889970745748538901">"πριν από <xliff:g id="COUNT">%d</xliff:g> ώρες"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"χθες"</item> - <item quantity="other" msgid="3453342639616481191">"πριν από <xliff:g id="COUNT">%d</xliff:g> ημέρες"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"σε 1 δευτερόλεπτο"</item> - <item quantity="other" msgid="5495880108825805108">"σε <xliff:g id="COUNT">%d</xliff:g> δευτερόλεπτα"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"σε 1 λεπτό"</item> - <item quantity="other" msgid="4216113292706568726">"σε <xliff:g id="COUNT">%d</xliff:g> λεπτά"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"σε 1 ώρα"</item> - <item quantity="other" msgid="3705373766798013406">"σε <xliff:g id="COUNT">%d</xliff:g> ώρες"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"αύριο"</item> - <item quantity="other" msgid="2973062968038355991">"σε <xliff:g id="COUNT">%d</xliff:g> ημέρες"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"στις <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"στις <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"το <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index f7f62e9..d4d038c 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> wants to enable Explore by Touch. When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger or perform gestures to interact with the phone."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 month ago"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Before 1 month ago"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 second ago"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> seconds ago"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minute ago"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minutes ago"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 hour ago"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> hours ago"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Last month"</string> <string name="older" msgid="5211975022815554840">"Older"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"yesterday"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> days ago"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"in 1 second"</item> - <item quantity="other" msgid="1241926116443974687">"in <xliff:g id="COUNT">%d</xliff:g> seconds"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"in 1 minute"</item> - <item quantity="other" msgid="3330713936399448749">"in <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"in 1 hour"</item> - <item quantity="other" msgid="547290677353727389">"in <xliff:g id="COUNT">%d</xliff:g> hours"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"tomorrow"</item> - <item quantity="other" msgid="5109449375100953247">"in <xliff:g id="COUNT">%d</xliff:g> days"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 sec ago"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> secs ago"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 min ago"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> mins ago"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 hour ago"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> hours ago"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"yesterday"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> days ago"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"in 1 sec"</item> - <item quantity="other" msgid="5495880108825805108">"in <xliff:g id="COUNT">%d</xliff:g> secs"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"in 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"in <xliff:g id="COUNT">%d</xliff:g> mins"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"in 1 hour"</item> - <item quantity="other" msgid="3705373766798013406">"in <xliff:g id="COUNT">%d</xliff:g> hours"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"tomorrow"</item> - <item quantity="other" msgid="2973062968038355991">"in <xliff:g id="COUNT">%d</xliff:g> days"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"on <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"at <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"in<xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index f7f62e9..d4d038c 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> wants to enable Explore by Touch. When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger or perform gestures to interact with the phone."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 month ago"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Before 1 month ago"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 second ago"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> seconds ago"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minute ago"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minutes ago"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 hour ago"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> hours ago"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Last month"</string> <string name="older" msgid="5211975022815554840">"Older"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"yesterday"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> days ago"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"in 1 second"</item> - <item quantity="other" msgid="1241926116443974687">"in <xliff:g id="COUNT">%d</xliff:g> seconds"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"in 1 minute"</item> - <item quantity="other" msgid="3330713936399448749">"in <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"in 1 hour"</item> - <item quantity="other" msgid="547290677353727389">"in <xliff:g id="COUNT">%d</xliff:g> hours"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"tomorrow"</item> - <item quantity="other" msgid="5109449375100953247">"in <xliff:g id="COUNT">%d</xliff:g> days"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 sec ago"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> secs ago"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 min ago"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> mins ago"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 hour ago"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> hours ago"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"yesterday"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> days ago"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"in 1 sec"</item> - <item quantity="other" msgid="5495880108825805108">"in <xliff:g id="COUNT">%d</xliff:g> secs"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"in 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"in <xliff:g id="COUNT">%d</xliff:g> mins"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"in 1 hour"</item> - <item quantity="other" msgid="3705373766798013406">"in <xliff:g id="COUNT">%d</xliff:g> hours"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"tomorrow"</item> - <item quantity="other" msgid="2973062968038355991">"in <xliff:g id="COUNT">%d</xliff:g> days"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"on <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"at <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"in<xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-en-rSG/strings.xml b/core/res/res/values-en-rSG/strings.xml index 09a8490..5ba1082 100644 --- a/core/res/res/values-en-rSG/strings.xml +++ b/core/res/res/values-en-rSG/strings.xml @@ -776,22 +776,6 @@ <skip /> <!-- no translation found for beforeOneMonthDurationPast (7578100953282866827) --> <skip /> - <!-- no translation found for num_seconds_ago:one (7416512229671810725) --> - <!-- no translation found for num_seconds_ago:other (8138756910300398447) --> - <!-- no translation found for num_minutes_ago:one (8620869479299420562) --> - <!-- no translation found for num_minutes_ago:other (5065488162050522741) --> - <!-- no translation found for num_hours_ago:one (853404611989669641) --> - <!-- no translation found for num_hours_ago:other (3558873784561756849) --> - <!-- no translation found for num_days_ago:one (4222479980812128212) --> - <!-- no translation found for num_days_ago:other (5445701370433601703) --> - <!-- no translation found for in_num_seconds:one (4253290037777327003) --> - <!-- no translation found for in_num_seconds:other (1280033870920841404) --> - <!-- no translation found for in_num_minutes:one (1487585791027953091) --> - <!-- no translation found for in_num_minutes:other (6274204576475209932) --> - <!-- no translation found for in_num_hours:one (6501470863235186391) --> - <!-- no translation found for in_num_hours:other (4415358752953289251) --> - <!-- no translation found for in_num_days:one (5608475533104443893) --> - <!-- no translation found for in_num_days:other (3827193006163842267) --> <!-- no translation found for preposition_for_date (2689847983632851560) --> <skip /> <!-- no translation found for preposition_for_time (2613388053493148013) --> diff --git a/core/res/res/values-en-rUS/strings.xml b/core/res/res/values-en-rUS/strings.xml index fdc0d69..adae7f4 100644 --- a/core/res/res/values-en-rUS/strings.xml +++ b/core/res/res/values-en-rUS/strings.xml @@ -777,22 +777,6 @@ <skip /> <!-- no translation found for beforeOneMonthDurationPast (7578100953282866827) --> <skip /> - <!-- no translation found for num_seconds_ago:one (7416512229671810725) --> - <!-- no translation found for num_seconds_ago:other (8138756910300398447) --> - <!-- no translation found for num_minutes_ago:one (8620869479299420562) --> - <!-- no translation found for num_minutes_ago:other (5065488162050522741) --> - <!-- no translation found for num_hours_ago:one (853404611989669641) --> - <!-- no translation found for num_hours_ago:other (3558873784561756849) --> - <!-- no translation found for num_days_ago:one (4222479980812128212) --> - <!-- no translation found for num_days_ago:other (5445701370433601703) --> - <!-- no translation found for in_num_seconds:one (4253290037777327003) --> - <!-- no translation found for in_num_seconds:other (1280033870920841404) --> - <!-- no translation found for in_num_minutes:one (1487585791027953091) --> - <!-- no translation found for in_num_minutes:other (6274204576475209932) --> - <!-- no translation found for in_num_hours:one (6501470863235186391) --> - <!-- no translation found for in_num_hours:other (4415358752953289251) --> - <!-- no translation found for in_num_days:one (5608475533104443893) --> - <!-- no translation found for in_num_days:other (3827193006163842267) --> <!-- no translation found for preposition_for_date (2689847983632851560) --> <skip /> <!-- no translation found for preposition_for_time (2613388053493148013) --> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 19c731f..65e50dc 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> desea activar la exploración táctil. Cuando esta función esté activada, podrás escuchar o ver descripciones del contenido seleccionado o usar gestos para interactuar con el dispositivo."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Hace 1 mes."</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Anterior a 1 mes atrás"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"hace 1 segundo"</item> - <item quantity="other" msgid="3903706804349556379">"hace <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Hace 1 minuto."</item> - <item quantity="other" msgid="2176942008915455116">"hace <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Hace 1 hora"</item> - <item quantity="other" msgid="2467273239587587569">"Hace <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Último mes"</string> <string name="older" msgid="5211975022815554840">"Antiguos"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ayer"</item> - <item quantity="other" msgid="2479586466153314633">"Hace <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"en 1 segundo"</item> - <item quantity="other" msgid="1241926116443974687">"en <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"en 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"en <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"en 1 hora"</item> - <item quantity="other" msgid="547290677353727389">"en <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"mañana"</item> - <item quantity="other" msgid="5109449375100953247">"en <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"hace 1 segundo"</item> - <item quantity="other" msgid="3699169366650930415">"hace <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"hace 1 min"</item> - <item quantity="other" msgid="851164968597150710">"Hace <xliff:g id="COUNT">%d</xliff:g> minutos."</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Hace 1 hora"</item> - <item quantity="other" msgid="6889970745748538901">"hace <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ayer"</item> - <item quantity="other" msgid="3453342639616481191">"Hace <xliff:g id="COUNT">%d</xliff:g> días."</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"en 1 segundo"</item> - <item quantity="other" msgid="5495880108825805108">"en <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"en 1 minuto"</item> - <item quantity="other" msgid="4216113292706568726">"en <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"en 1 hora"</item> - <item quantity="other" msgid="3705373766798013406">"en <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"mañana"</item> - <item quantity="other" msgid="2973062968038355991">"en <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"activado <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_year" msgid="5040395640711867177">"en <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index f06832d..82cd9c8 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> quiere habilitar la exploración táctil. Cuando esta función esté activada, podrás escuchar o ver descripciones del contenido seleccionado o usar gestos para interactuar con el teléfono."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Hace un mes"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Hace más de un mes"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Hace 1 segundo"</item> - <item quantity="other" msgid="3903706804349556379">"Hace <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Hace 1 minuto"</item> - <item quantity="other" msgid="2176942008915455116">"Hace <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Hace 1 hora"</item> - <item quantity="other" msgid="2467273239587587569">"Hace <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"El mes pasado"</string> <string name="older" msgid="5211975022815554840">"Anterior"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"Ayer"</item> - <item quantity="other" msgid="2479586466153314633">"Hace <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"dentro de 1 segundo"</item> - <item quantity="other" msgid="1241926116443974687">"dentro de <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"dentro de 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"dentro de <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"dentro de 1 hora"</item> - <item quantity="other" msgid="547290677353727389">"dentro de <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"mañana"</item> - <item quantity="other" msgid="5109449375100953247">"dentro de <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"hace 1 segundo"</item> - <item quantity="other" msgid="3699169366650930415">"hace <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"hace 1 minuto"</item> - <item quantity="other" msgid="851164968597150710">"hace <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"hace 1 hora"</item> - <item quantity="other" msgid="6889970745748538901">"hace <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"Ayer"</item> - <item quantity="other" msgid="3453342639616481191">"hace <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"dentro de 1 segundo"</item> - <item quantity="other" msgid="5495880108825805108">"dentro de <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"dentro de 1 minuto"</item> - <item quantity="other" msgid="4216113292706568726">"dentro de <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"dentro de 1 hora"</item> - <item quantity="other" msgid="3705373766798013406">"dentro de <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"mañana"</item> - <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_year" msgid="5040395640711867177">"en <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index 5a8e0a0..bef7626 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> soovib lubada puudutusega uurimise. Kui puudutusega uurimine on sisse lülitatud, kuulete või näete kirjeldusi asjade kohta, mis on teie sõrme all, või saate suhelda telefoniga liigutuste abil."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 kuu tagasi"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Varem kui 1 kuu tagasi"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 sekund tagasi"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> sekundit tagasi"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minut tagasi"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minutit tagasi"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 tund tagasi"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> tundi tagasi"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Eelmisel kuul"</string> <string name="older" msgid="5211975022815554840">"Vanem"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"eile"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> päeva tagasi"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 sekundi pärast"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> sekundi pärast"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 minuti pärast"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> minuti pärast"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 tunni pärast"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> tunni pärast"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"homme"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> päeva pärast"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 s tagasi"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> sekundit tagasi"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 minut tagasi"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> minutit tagasi"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 tund tagasi"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> tundi tagasi"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"eile"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> päeva tagasi"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 sekundi pärast"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> sekundi pärast"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 minuti pärast"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> minuti pärast"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 tunni pärast"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> tunni pärast"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"homme"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> päeva pärast"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"kuupäeval <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"kell <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"aastal <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index e2369ea..a37111b 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> zerbitzuak \"Arakatu ukituta\" eginbidea gaitu nahi du. Eginbide hori aktibatuta dagoenean, hatzaren azpian duzunaren azalpena ikus edo entzun dezakezu, edo telefonoarekin elkarrekintzan aritzeko keinuak egin ditzakezu."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Duela hilabete"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Duela hilabete baino gutxiago"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"duela segundo bat"</item> - <item quantity="other" msgid="3903706804349556379">"duela <xliff:g id="COUNT">%d</xliff:g> segundo"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"duela minutu bat"</item> - <item quantity="other" msgid="2176942008915455116">"duela <xliff:g id="COUNT">%d</xliff:g> minutu"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Duela ordubete"</item> - <item quantity="other" msgid="2467273239587587569">"duela <xliff:g id="COUNT">%d</xliff:g> ordu"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Azken hilabetea"</string> <string name="older" msgid="5211975022815554840">"Zaharragoa"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"atzo"</item> - <item quantity="other" msgid="2479586466153314633">"Duela <xliff:g id="COUNT">%d</xliff:g> egun"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"segundo bat barru"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> segundo barru"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"Minutu bat barru"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> minutu barru"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"Ordubete barru"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> ordu barru"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"bihar"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> egun barru"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"duela segundo bat"</item> - <item quantity="other" msgid="3699169366650930415">"duela <xliff:g id="COUNT">%d</xliff:g> segundo"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"duela minutu bat"</item> - <item quantity="other" msgid="851164968597150710">"duela <xliff:g id="COUNT">%d</xliff:g> minutu"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"duela ordubete"</item> - <item quantity="other" msgid="6889970745748538901">"duela <xliff:g id="COUNT">%d</xliff:g> ordu"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"atzo"</item> - <item quantity="other" msgid="3453342639616481191">"Duela <xliff:g id="COUNT">%d</xliff:g> egun"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"segundo bat barru"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> segundo barru"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"minutu bat barru"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> minutu barru"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"ordubete barru"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> ordu barru"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"bihar"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> egun barru"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"data: <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"ordua: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"urtea: <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 547f432..42ae410 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> میخواهد «کاوش با لمس» را فعال کند. وقتی «کاوش با لمس» فعال است، میتوانید توضیحاتی را برای آنچه که زیر انگشت شما است مشاهده کرده یا بشنوید یا برای استفاده از تلفن خود از حرکات استفاده کنید."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"۱ ماه قبل"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"قبل از ۱ ماه گذشته"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"۱ ثانیه قبل"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> ثانیه قبل"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"۱ دقیقه قبل"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> دقیقه قبل"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"۱ ساعت قبل"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ساعت قبل"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"ماه گذشته"</string> <string name="older" msgid="5211975022815554840">"قدیمی تر"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ديروز"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> روز قبل"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"در ۱ ثانیه"</item> - <item quantity="other" msgid="1241926116443974687">"در <xliff:g id="COUNT">%d</xliff:g> ثانیه"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"در ۱ دقیقه"</item> - <item quantity="other" msgid="3330713936399448749">"در <xliff:g id="COUNT">%d</xliff:g> دقیقه"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"در ۱ ساعت"</item> - <item quantity="other" msgid="547290677353727389">"در <xliff:g id="COUNT">%d</xliff:g> ساعت"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"فردا"</item> - <item quantity="other" msgid="5109449375100953247">"در <xliff:g id="COUNT">%d</xliff:g> روز"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"۱ ثانیه قبل"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> ثانیه قبل"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"۱ دقیقه قبل"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> دقیقه قبل"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"۱ ساعت قبل"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ساعت قبل"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ديروز"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> روز قبل"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"در ۱ ثانیه"</item> - <item quantity="other" msgid="5495880108825805108">"در <xliff:g id="COUNT">%d</xliff:g> ثانیه"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"در ۱ دقیقه"</item> - <item quantity="other" msgid="4216113292706568726">"در <xliff:g id="COUNT">%d</xliff:g> دقیقه"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"در ۱ ساعت"</item> - <item quantity="other" msgid="3705373766798013406">"در <xliff:g id="COUNT">%d</xliff:g> ساعت"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"فردا"</item> - <item quantity="other" msgid="2973062968038355991">"در <xliff:g id="COUNT">%d</xliff:g> روز"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"در <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"در <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"در <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index e262015..0798424 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> haluaa ottaa Tutustu koskettamalla -ominaisuuden käyttöön. Kun Tutustu koskettamalla on käytössä, näet tai kuulet kuvauksen sormen alla olevista kohteista ja voit käyttää puhelinta sormieleiden avulla."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"kuukausi sitten"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Yli kuukausi sitten"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 sekunti sitten"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> sekuntia sitten"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minuutti sitten"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minuuttia sitten"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 tunti sitten"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> tuntia sitten"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Viime kuussa"</string> <string name="older" msgid="5211975022815554840">"Vanhemmat"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"eilen"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> päivää sitten"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 sekunnin kuluttua"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> sekunnin kuluttua"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 minuutin kuluttua"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> minuutin kuluttua"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 tunnin kuluttua"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> tunnin kuluttua"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"huomenna"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> päivän kuluttua"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 s sitten"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> s sitten"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 min sitten"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> min sitten"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 tunti sitten"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> tuntia sitten"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"eilen"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> päivää sitten"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 s kuluttua"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> sekunnin kuluttua"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 min kuluttua"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> min kuluttua"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 tunnin kuluttua"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> tunnin kuluttua"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"huomenna"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> päivän kuluttua"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"päivä: <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"klo <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"vuonna <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 9a9ab32..52f3e48 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> souhaite activer la fonctionnalité \"Explorer au toucher\". Lorsque celle-ci est activée, vous pouvez entendre ou voir les descriptions des éléments que vous sélectionnez, ou bien interagir avec le téléphone en effectuant certains gestes."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Il y a 1 mois"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Il y a plus d\'un mois"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"il y a 1 seconde"</item> - <item quantity="other" msgid="3903706804349556379">"Il y a <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Il y a 1 minute"</item> - <item quantity="other" msgid="2176942008915455116">"Il y a <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Il y a 1 heure"</item> - <item quantity="other" msgid="2467273239587587569">"il y a <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Le mois dernier"</string> <string name="older" msgid="5211975022815554840">"Précédent"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"hier"</item> - <item quantity="other" msgid="2479586466153314633">"il y a <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"dans 1 seconde"</item> - <item quantity="other" msgid="1241926116443974687">"dans <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"dans 1 minute"</item> - <item quantity="other" msgid="3330713936399448749">"dans <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"dans 1 heure"</item> - <item quantity="other" msgid="547290677353727389">"dans <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"demain"</item> - <item quantity="other" msgid="5109449375100953247">"dans <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"il y a 1 seconde"</item> - <item quantity="other" msgid="3699169366650930415">"il y a <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"il y a 1 min"</item> - <item quantity="other" msgid="851164968597150710">"il y a <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Il y a 1 h"</item> - <item quantity="other" msgid="6889970745748538901">"il y a <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"hier"</item> - <item quantity="other" msgid="3453342639616481191">"il y a <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"dans 1 seconde"</item> - <item quantity="other" msgid="5495880108825805108">"dans <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"dans 1 minute"</item> - <item quantity="other" msgid="4216113292706568726">"dans <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"dans 1 heure"</item> - <item quantity="other" msgid="3705373766798013406">"dans <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"demain"</item> - <item quantity="other" msgid="2973062968038355991">"dans <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"le <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"à <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"en <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 4ba1aae..667c7cb 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> souhaite activer la fonctionnalité \"Explorer au toucher\". Lorsque celle-ci est activée, vous pouvez entendre ou voir les descriptions des éléments que vous sélectionnez, ou bien interagir avec le téléphone en effectuant certains gestes."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Il y a 1 mois"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Il y a plus d\'un mois"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Il y a 1 seconde"</item> - <item quantity="other" msgid="3903706804349556379">"Il y a <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Il y a 1 minute"</item> - <item quantity="other" msgid="2176942008915455116">"Il y a <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"il y a 1 heure"</item> - <item quantity="other" msgid="2467273239587587569">"Il y a <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Le mois dernier"</string> <string name="older" msgid="5211975022815554840">"Préc."</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"hier"</item> - <item quantity="other" msgid="2479586466153314633">"Il y a <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"dans 1 seconde"</item> - <item quantity="other" msgid="1241926116443974687">"dans <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"dans 1 minute"</item> - <item quantity="other" msgid="3330713936399448749">"dans <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"dans 1 heure"</item> - <item quantity="other" msgid="547290677353727389">"dans <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"demain"</item> - <item quantity="other" msgid="5109449375100953247">"dans <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"il y a 1 seconde"</item> - <item quantity="other" msgid="3699169366650930415">"il y a <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"il y a 1 minute"</item> - <item quantity="other" msgid="851164968597150710">"il y a <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"il y a 1 heure"</item> - <item quantity="other" msgid="6889970745748538901">"Il y a <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"hier"</item> - <item quantity="other" msgid="3453342639616481191">"Il y a <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"dans 1 seconde"</item> - <item quantity="other" msgid="5495880108825805108">"dans <xliff:g id="COUNT">%d</xliff:g> secondes"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"dans 1 minute"</item> - <item quantity="other" msgid="4216113292706568726">"dans <xliff:g id="COUNT">%d</xliff:g> minutes"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"dans 1 heure"</item> - <item quantity="other" msgid="3705373766798013406">"dans <xliff:g id="COUNT">%d</xliff:g> heures"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"demain"</item> - <item quantity="other" msgid="2973062968038355991">"dans <xliff:g id="COUNT">%d</xliff:g> jours"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"le <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"à <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"en <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index 26629c1..220fec7 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> quere activar a exploración táctil. Cando a exploración táctil estea activada, poderás escoitar ou ver descricións do contido seleccionado ou realizar xestos para interactuar co teléfono."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Hai 1 mes"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Hai máis de 1 mes"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"hai 1 segundo"</item> - <item quantity="other" msgid="3903706804349556379">"hai <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"hai 1 minuto"</item> - <item quantity="other" msgid="2176942008915455116">"hai <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Hai 1 hora"</item> - <item quantity="other" msgid="2467273239587587569">"hai <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"O mes pasado"</string> <string name="older" msgid="5211975022815554840">"Antes"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"onte"</item> - <item quantity="other" msgid="2479586466153314633">"Hai <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"en 1 segundo"</item> - <item quantity="other" msgid="1241926116443974687">"en <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"En 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"en <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"En 1 hora"</item> - <item quantity="other" msgid="547290677353727389">"En <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"mañá"</item> - <item quantity="other" msgid="5109449375100953247">"en <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"hai 1 s"</item> - <item quantity="other" msgid="3699169366650930415">"hai <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"hai 1 min"</item> - <item quantity="other" msgid="851164968597150710">"hai <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"hai 1 hora"</item> - <item quantity="other" msgid="6889970745748538901">"hai <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"onte"</item> - <item quantity="other" msgid="3453342639616481191">"Hai <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"en 1 s"</item> - <item quantity="other" msgid="5495880108825805108">"en <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"en 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"en <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"en 1 hora"</item> - <item quantity="other" msgid="3705373766798013406">"en <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"mañá"</item> - <item quantity="other" msgid="2973062968038355991">"en <xliff:g id="COUNT">%d</xliff:g> días"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"o <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"ás <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"no <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 2ebee8f..14c1710 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> स्पर्श के द्वारा अन्वेषण करें सक्षम करना चाहती है. स्पर्श के द्वारा अन्वेष करें चालू होने पर, आप अपनी अंगुली के नीचे क्या है उसका विवरण सुन सकते हैं या देख सकते हैं या फ़ोन से डॉयलॉग करने के लिए जेस्चर निष्पादित कर सकते हैं."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 माह पहले"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 माह से पहले"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 सेकंड पहले"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> सेकंड पहले"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 मिनट पहले"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> मिनट पहले"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 घंटे पहले"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> घंटे पहले"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"पिछला माह"</string> <string name="older" msgid="5211975022815554840">"इससे पुराना"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"बीता कल"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> दिन पहले"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 सेकंड में"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> सेकंड में"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 मिनट में"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> मिनट में"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 घंटे में"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> घंटे में"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"आने वाला कल"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> दिन में"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 सेकंड पहले"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> सेकंड पहले"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 मिनट पहले"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> मिनट पहले"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 घंटे पहले"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> घंटे पहले"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"बीता कल"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> दिन पहले"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 सेकंड में"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> सेकंड में"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 मिनट में"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> मिनट में"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 घंटे में"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> घंटे में"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"आने वाला कल"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> दिन में"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> को"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> पर"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> में"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index af4a687..919466d 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"Usluga <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> želi omogućiti značajku Istraživanje dodirom. Kad je značajka Istraživanje dodirom uključena, možete čuti ili vidjeti opise onoga što je pod vašim prstom ili izvršiti pokrete za interakciju s telefonom."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Prije 1 mjesec"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Prije 1 mjesec"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Prije 1 sekundu"</item> - <item quantity="other" msgid="3903706804349556379">"prije <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"prije 1 minutu"</item> - <item quantity="other" msgid="2176942008915455116">"Prije <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Prije 1 sata"</item> - <item quantity="other" msgid="2467273239587587569">"Prije <xliff:g id="COUNT">%d</xliff:g> h"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Prošli mjesec"</string> <string name="older" msgid="5211975022815554840">"Starije"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"jučer"</item> - <item quantity="other" msgid="2479586466153314633">"Prije <xliff:g id="COUNT">%d</xliff:g> dana"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"za 1 sekundu"</item> - <item quantity="other" msgid="1241926116443974687">"za <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"za 1 minutu"</item> - <item quantity="other" msgid="3330713936399448749">"za sljedeći broj minuta: <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"za 1 sat"</item> - <item quantity="other" msgid="547290677353727389">"za <xliff:g id="COUNT">%d</xliff:g> h"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"sutra"</item> - <item quantity="other" msgid="5109449375100953247">"za sljedeći broj dana: <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Prije 1 s"</item> - <item quantity="other" msgid="3699169366650930415">"Prije <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"Prije 1 min"</item> - <item quantity="other" msgid="851164968597150710">"Prije <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Prije 1 sat"</item> - <item quantity="other" msgid="6889970745748538901">"Prije <xliff:g id="COUNT">%d</xliff:g> h"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"jučer"</item> - <item quantity="other" msgid="3453342639616481191">"Prije <xliff:g id="COUNT">%d</xliff:g> dana"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"za 1 s"</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 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"za <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"za 1 sat"</item> - <item quantity="other" msgid="3705373766798013406">"za sljedeći broj sati: <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"sutra"</item> - <item quantity="other" msgid="2973062968038355991">"za sljedeći broj dana: <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"dana <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"u <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>."</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 2a993cd..3bcdb52 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> aktiválni szeretné a Felfedezés érintéssel funkciót. Amikor be van kapcsolva a Felfedezés érintéssel, akkor hallhatja vagy láthatja annak leírását, ami az ujja alatt van, illetve végrehajthat kézmozdulatokat a telefon kezeléséhez."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 hónapja"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Több mint 1 hónapja"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 másodperce"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> másodperce"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 perce"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> perce"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 órája"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> órája"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Múlt hónapban"</string> <string name="older" msgid="5211975022815554840">"Régebbi"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"tegnap"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> napja"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 másodperc múlva"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> másodperc múlva"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 perc múlva"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> perc múlva"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 óra múlva"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> óra múlva"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"holnap"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> nap múlva"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 másodperce"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> másodperce"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 perce"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> perce"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 órája"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> órája"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"tegnap"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> napja"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 másodperc múlva"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> másodperc múlva"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 perc múlva"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> perc múlva"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 óra múlva"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> óra múlva"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"holnap"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> nap múlva"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"e napon: <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"év: <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index c48571e..69621ad 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել «Հետազոտում հպման միջոցով» ռեժիմը: Երբ միացված է «Հետազոտում հպման միջոցով» ռեժիմը, դուք կարող եք լսել կամ տեսնել նկարագրությունը, թե ինչ է ձեր մատի տակ, կամ կատարել ժեստեր` հեռախոսի հետ փոխգործակցելու համար:"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 ամիս առաջ"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Ավելի շուտ քան 1 ամիս"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 վայրկյան առաջ"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> վայրկյան առաջ"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 րոպե առաջ"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> րոպե առաջ"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 ժամ առաջ"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ժամ առաջ"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Անցյալ ամիս"</string> <string name="older" msgid="5211975022815554840">"Ավելի հին"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"երեկ"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> օր առաջ"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 վայրկյանից"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> վայրկյանից"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 րոպեից"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> րոպեից"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 ժամից"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> ժամից"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"վաղը"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> օրից"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 վրկ առաջ"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> վրկ. առաջ"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 րոպե առաջ"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> րոպե առաջ"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 ժամ առաջ"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ժամ առաջ"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"երեկ"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> օր առաջ"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 վրկ-ից"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> վրկ-ից"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 րոպեից"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> րոպեից"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 ժամից"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> ժամից"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"վաղը"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> օրից"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>-ին"</string> <string name="preposition_for_time" msgid="5506831244263083793">"ժամը <xliff:g id="TIME">%s</xliff:g>-ին"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> թվականին"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 3eba049..c07a78d 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ingin mengaktifkan Menjelajah dengan Sentuhan. Saat Menjelajah dengan Sentuhan diaktifkan, Anda dapat mendengar atau melihat deskripsi dari apa yang ada di bawah jari Anda atau melakukan gerakan untuk berinteraksi dengan ponsel."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 bulan yang lalu"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Sebelum 1 bulan yang lalu"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 detik lalu"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> detik yang lalu"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 menit yang lalu"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> menit yang lalu"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 jam yang lalu"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> jam yang lalu"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Bulan lalu"</string> <string name="older" msgid="5211975022815554840">"Lawas"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"kemarin"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> hari yang lalu"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"dalam 1 detik"</item> - <item quantity="other" msgid="1241926116443974687">"dalam <xliff:g id="COUNT">%d</xliff:g> detik"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"dalam 1 menit"</item> - <item quantity="other" msgid="3330713936399448749">"dalam <xliff:g id="COUNT">%d</xliff:g> menit"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"dalam 1 jam"</item> - <item quantity="other" msgid="547290677353727389">"dalam <xliff:g id="COUNT">%d</xliff:g> jam"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"besok"</item> - <item quantity="other" msgid="5109449375100953247">"dalam <xliff:g id="COUNT">%d</xliff:g> hari"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 detik yang lalu"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> detik yang lalu"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 menit yang lalu"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> menit yang lalu"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 jam yang lalu"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> jam yang lalu"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"kemarin"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> hari yang lalu"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"dalam 1 detik"</item> - <item quantity="other" msgid="5495880108825805108">"dalam <xliff:g id="COUNT">%d</xliff:g> detik"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"dalam 1 menit"</item> - <item quantity="other" msgid="4216113292706568726">"dalam <xliff:g id="COUNT">%d</xliff:g> menit"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"dalam 1 jam"</item> - <item quantity="other" msgid="3705373766798013406">"dalam <xliff:g id="COUNT">%d</xliff:g> jam"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"besok"</item> - <item quantity="other" msgid="2973062968038355991">"dalam <xliff:g id="COUNT">%d</xliff:g> hari"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"pada <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"pada <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"dalam <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index 690d6e5..c5bf5d2 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vill kveikja á snertikönnun. Þegar kveikt er á snertikönnun geturðu heyrt eða séð lýsingu á því sem er á skjánum undir fingrinum hverju sinni eða notað bendingar til að stjórna símanum."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Fyrir mánuði"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Fyrir meira en mánuði"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"fyrir sekúndu"</item> - <item quantity="other" msgid="3903706804349556379">"fyrir <xliff:g id="COUNT">%d</xliff:g> sekúndum"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"fyrir mínútu"</item> - <item quantity="other" msgid="2176942008915455116">"fyrir <xliff:g id="COUNT">%d</xliff:g> mínútum"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"fyrir klukkustund"</item> - <item quantity="other" msgid="2467273239587587569">"fyrir <xliff:g id="COUNT">%d</xliff:g> klukkustundum"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Í síðasta mánuði"</string> <string name="older" msgid="5211975022815554840">"Eldra"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"í gær"</item> - <item quantity="other" msgid="2479586466153314633">"fyrir <xliff:g id="COUNT">%d</xliff:g> dögum"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"eftir sekúndu"</item> - <item quantity="other" msgid="1241926116443974687">"eftir <xliff:g id="COUNT">%d</xliff:g> sekúndur"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"eftir mínútu"</item> - <item quantity="other" msgid="3330713936399448749">"eftir <xliff:g id="COUNT">%d</xliff:g> mínútur"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"eftir klukkustund"</item> - <item quantity="other" msgid="547290677353727389">"eftir <xliff:g id="COUNT">%d</xliff:g> klukkustundir"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"á morgun"</item> - <item quantity="other" msgid="5109449375100953247">"eftir <xliff:g id="COUNT">%d</xliff:g> daga"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"fyrir sekúndu"</item> - <item quantity="other" msgid="3699169366650930415">"fyrir <xliff:g id="COUNT">%d</xliff:g> sekúndum"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"fyrir mínútu"</item> - <item quantity="other" msgid="851164968597150710">"fyrir <xliff:g id="COUNT">%d</xliff:g> mínútum"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"fyrir klukkustund"</item> - <item quantity="other" msgid="6889970745748538901">"fyrir <xliff:g id="COUNT">%d</xliff:g> klukkustundum"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"í gær"</item> - <item quantity="other" msgid="3453342639616481191">"fyrir <xliff:g id="COUNT">%d</xliff:g> dögum"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"eftir sekúndu"</item> - <item quantity="other" msgid="5495880108825805108">"eftir <xliff:g id="COUNT">%d</xliff:g> sekúndur"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"eftir mínútu"</item> - <item quantity="other" msgid="4216113292706568726">"eftir <xliff:g id="COUNT">%d</xliff:g> mínútur"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"eftir klukkustund"</item> - <item quantity="other" msgid="3705373766798013406">"eftir <xliff:g id="COUNT">%d</xliff:g> klukkustundir"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"á morgun"</item> - <item quantity="other" msgid="2973062968038355991">"eftir <xliff:g id="COUNT">%d</xliff:g> daga"</item> - </plurals> <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">"<xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index bea0c13..1bdc1ff 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vuole attivare la funzione Esplora al tocco. Quando la funzione Esplora al tocco è attiva, puoi ascoltare o visualizzare le descrizioni di ciò che stai toccando oppure interagire con il telefono tramite gesti."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 mese fa"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Oltre 1 mese fa"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 secondo fa"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> secondi fa"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minuto fa"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minuti fa"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 ora fa"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ore fa"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Ultimo mese"</string> <string name="older" msgid="5211975022815554840">"Precedente"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ieri"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> giorni fa"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"tra 1 secondo"</item> - <item quantity="other" msgid="1241926116443974687">"tra <xliff:g id="COUNT">%d</xliff:g> secondi"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"tra 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"tra <xliff:g id="COUNT">%d</xliff:g> minuti"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"tra 1 ora"</item> - <item quantity="other" msgid="547290677353727389">"tra <xliff:g id="COUNT">%d</xliff:g> ore"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"domani"</item> - <item quantity="other" msgid="5109449375100953247">"tra <xliff:g id="COUNT">%d</xliff:g> giorni"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 sec fa"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> sec fa"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 min fa"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> min fa"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 ora fa"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ore fa"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ieri"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> giorni fa"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"tra 1 sec"</item> - <item quantity="other" msgid="5495880108825805108">"tra <xliff:g id="COUNT">%d</xliff:g> sec"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"tra 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"tra <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"tra 1 ora"</item> - <item quantity="other" msgid="3705373766798013406">"tra <xliff:g id="COUNT">%d</xliff:g> ore"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"domani"</item> - <item quantity="other" msgid="2973062968038355991">"tra <xliff:g id="COUNT">%d</xliff:g> giorni"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"in data <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"alle ore <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"nel <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index edf5dd8..7b6d979 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> רוצה להפעיל את התכונה \'חקור על ידי מגע\'. כאשר התכונה \'חקור על ידי מגע\' מופעלת, אתה יכול לשמוע או לראות תיאורים של הפריטים שעליהם אצבעך מונחת או לקיים אינטראקציה עם הטלפון באמצעות תנועות אצבע."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"לפני חודש אחד"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"לפני חודש אחד"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"לפני שנייה אחת"</item> - <item quantity="other" msgid="3903706804349556379">"לפני <xliff:g id="COUNT">%d</xliff:g> שניות"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"לפני דקה אחת"</item> - <item quantity="other" msgid="2176942008915455116">"לפני <xliff:g id="COUNT">%d</xliff:g> דקות"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"לפני שעה"</item> - <item quantity="other" msgid="2467273239587587569">"לפני <xliff:g id="COUNT">%d</xliff:g> שעות"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"בחודש שעבר"</string> <string name="older" msgid="5211975022815554840">"ישן יותר"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"אתמול"</item> - <item quantity="other" msgid="2479586466153314633">"לפני <xliff:g id="COUNT">%d</xliff:g> ימים"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"בעוד שנייה אחת"</item> - <item quantity="other" msgid="1241926116443974687">"תוך <xliff:g id="COUNT">%d</xliff:g> שניות"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"בעוד דקה אחת"</item> - <item quantity="other" msgid="3330713936399448749">"תוך <xliff:g id="COUNT">%d</xliff:g> דקות"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"תוך שעה אחת"</item> - <item quantity="other" msgid="547290677353727389">"תוך <xliff:g id="COUNT">%d</xliff:g> שעות"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"מחר"</item> - <item quantity="other" msgid="5109449375100953247">"בעוד <xliff:g id="COUNT">%d</xliff:g> ימים"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"לפני שנייה אחת"</item> - <item quantity="other" msgid="3699169366650930415">"לפני <xliff:g id="COUNT">%d</xliff:g> שניות"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"לפני דקה"</item> - <item quantity="other" msgid="851164968597150710">"לפני <xliff:g id="COUNT">%d</xliff:g> דקות"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"לפני שעה"</item> - <item quantity="other" msgid="6889970745748538901">"לפני <xliff:g id="COUNT">%d</xliff:g> שעות"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"אתמול"</item> - <item quantity="other" msgid="3453342639616481191">"לפני <xliff:g id="COUNT">%d</xliff:g> ימים"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"תוך שנייה אחת"</item> - <item quantity="other" msgid="5495880108825805108">"תוך <xliff:g id="COUNT">%d</xliff:g> שניות"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"תוך דקה אחת"</item> - <item quantity="other" msgid="4216113292706568726">"תוך <xliff:g id="COUNT">%d</xliff:g> דקות"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"תוך שעה אחת"</item> - <item quantity="other" msgid="3705373766798013406">"תוך <xliff:g id="COUNT">%d</xliff:g> שעות"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"מחר"</item> - <item quantity="other" msgid="2973062968038355991">"בעוד <xliff:g id="COUNT">%d</xliff:g> ימים"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"בתאריך <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"בשעה <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"בשנת <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 27cce45..ca4ccda 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>がタッチガイドをONにしようとしています。タッチガイドをONにすると、指の位置にあるアイテムの説明を読み上げたり表示したりできます。また、携帯端末を通常とは違うジェスチャーで操作できます。"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1か月前"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1か月前"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1秒前"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g>秒前"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1分前"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g>分前"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1時間前"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g>時間前"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"先月"</string> <string name="older" msgid="5211975022815554840">"もっと前"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"昨日"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g>日前"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1秒後"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g>秒後"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1分後"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g>分後"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1時間後"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g>時間後"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"明日"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g>日後"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1秒前"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g>秒前"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1分前"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g>分前"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1時間前"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g>時間前"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"昨日"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g>日前"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1秒後"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g>秒後"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1分後"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g>分後"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1時間後"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g>時間後"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"明日"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g>日後"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>年"</string> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index 421c3e2..b3ab0e4 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>-ს სურს „შეხებით შესწავლის“ რეჟიმის ჩრთვა. ეს ტელეფონის ჟესტებით მართვისა და იმ ელემენტების აღწერის მოსმენის შესაძლებლობას მოგცემთ, რომელსაც შეეხებით."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"ერთი თვის წინ"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"უფრო ადრე, ვიდრე ერთი თვის წინ"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 წამის წინ"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> წამის წინ"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 წუთის უკან"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> წუთის წინ"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 საათის წინ"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> საათის წინ"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"გასული თვე"</string> <string name="older" msgid="5211975022815554840">"უფრო ძველი"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"გუშინ"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> დღის წინ"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 წამში"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> წამში"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 წუთში"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> წუთში"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 საათში"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> საათში"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ხვალ"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> დღეში"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 წმ. წინ"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> წამის წინ"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 წუთის წინ"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> წუთის წინ"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 საათის წინ"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> საათის წინ"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"გუშინ"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> დღის წინ"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 წამში"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> წამის წინ"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 წუთში"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> წუთში"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 საათში"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> საათში"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ხვალ"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> დღეში"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"თარიღი: <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>-ზე"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> წელს"</string> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index 7fad880..be1007d 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> Сенсор арқылы шолу функциясын іске қосуды қалайды. Сенсор арқылы шолу функциясы қосылғанда саусақ астындағы нысан сипаттарын естуге немесе көруге болады немесе телефонмен қатынасу қимылдарын орындауға болады."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 ай бұрын"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Осыған дейін 1 ай бұрын"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 секунд бұрын"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> секунд бұрын"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 минут бұрын"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> минут бұрын"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 сағат бұрын"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> сағат бұрын"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Соңғы ай"</string> <string name="older" msgid="5211975022815554840">"Ескілеу"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"кеше"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> күн бұрын"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 секундта"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> секундта"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 минутта"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> минутта"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 сағатта"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> сағатта"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ертең"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> күнде"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 секунд бұрын"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> секунд бұрын"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 минут бұрын"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> минут бұрын"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 сағат бұрын"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> сағат бұрын"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"кеше"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> күн бұрын"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 секундта"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> секундта"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 минутта"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> минутта"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 сағатта"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> сағатта"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ертең"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> күнде"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> күні"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> уақытында"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> жылда"</string> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index 6f38aec..6e06b33 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ចង់បើកការរុករកដោយប៉ះ។ ពេលរុករកដោយប៉ះត្រូវបានបើក អ្នកអាចស្ដាប់ឮ ឬឃើញការពណ៌នាអ្វីដែលនៅក្រោមម្រាមដៃរបស់អ្នក ឬអនុវត្តកាយវិការដើម្បីមានអន្តរកម្មជាមួយទូរស័ព្ទ។"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 ខែមុន"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"មុនពេល ១ ខែមុន"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"១ វិនាទីមុន"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> វិនាទីមុន"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"១ នាទីមុន"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> នាទីមុន"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"១ ម៉ោងមុន"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ម៉ោងមុន"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"ខែមុន"</string> <string name="older" msgid="5211975022815554840">"ចាស់ជាង"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ម្សិលមិញ"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> ថ្ងៃមុន"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"ក្នុងរយៈពេល ១ វិនាទី"</item> - <item quantity="other" msgid="1241926116443974687">"ក្នុងរយៈពេល <xliff:g id="COUNT">%d</xliff:g> វិនាទី"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"ក្នុងរយៈពេល ១ នាទី"</item> - <item quantity="other" msgid="3330713936399448749">"រយៈពេល <xliff:g id="COUNT">%d</xliff:g> នាទី"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"រយៈពេល ១ ម៉ោង"</item> - <item quantity="other" msgid="547290677353727389">"រយៈពេល <xliff:g id="COUNT">%d</xliff:g> ម៉ោង"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ថ្ងៃស្អែក"</item> - <item quantity="other" msgid="5109449375100953247">"រយៈពេល <xliff:g id="COUNT">%d</xliff:g> ថ្ងៃ"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"១ វិនាទីមុន"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> វិនាទីមុន"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"១ នាទីមុន"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> នាទីមុន"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"១ ម៉ោងមុន"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ម៉ោងមុន"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ម្សិលមិញ"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> ថ្ងៃមុន"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"ក្នុងពេល 1 វិនាទី"</item> - <item quantity="other" msgid="5495880108825805108">"ក្នុងពេល <xliff:g id="COUNT">%d</xliff:g> វិនាទី"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"ក្នុងពេល 1 នាទី"</item> - <item quantity="other" msgid="4216113292706568726">"នៅរយៈពេល <xliff:g id="COUNT">%d</xliff:g> នាទី"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"ក្នុងរយៈពេល ១ ម៉ោង"</item> - <item quantity="other" msgid="3705373766798013406">"ក្នុងរយៈពេល <xliff:g id="COUNT">%d</xliff:g> ម៉ោង"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ថ្ងៃស្អែក"</item> - <item quantity="other" msgid="2973062968038355991">"ក្នុងរយៈពេល <xliff:g id="COUNT">%d</xliff:g> ថ្ងៃ"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"នៅ <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"នៅម៉ោង <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"ក្នុងឆ្នាំ <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index 421c103..8bb3083 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"ಸ್ಪರ್ಶದ ಮೂಲಕ ಎಕ್ಸ್ಪ್ಲೋರ್ ಸಕ್ರಿಯಗೊಳಿಸಲು <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ಬಯಸುತ್ತದೆ. ಸ್ಪರ್ಶದ ಮೂಲಕ ಎಕ್ಸ್ಪ್ಲೋರ್ ಆನ್ ಮಾಡಿದಾಗ, ಫೋನ್ ಜೊತೆ ಸಂವಹನ ನಡೆಸಲು ನಿಮ್ಮ ಬೆರಳಿನ ಅಡಿಯಲ್ಲಿರುವ ವಿವರಣೆಗಳನ್ನು ನೀವು ಆಲಿಸಬಹುದು ಅಥವಾ ವೀಕ್ಷಿಸಬಹುದು ಇಲ್ಲವೇ ಗೆಶ್ಚರ್ ಮಾಡಬಹುದು."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 ತಿಂಗಳ ಹಿಂದೆ"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 ತಿಂಗಳ ಹಿಂದಕ್ಕೂ ಮೊದಲು"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 ಸೆಕೆಂಡಿನ ಹಿಂದೆ"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> ಸೆಕೆಂಡುಗಳ ಹಿಂದೆ"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 ನಿಮಿಷದ ಹಿಂದೆ"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 ಗಂಟೆ ಹಿಂದೆ"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ಗಂಟೆಗಳ ಹಿಂದೆ"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"ಕಳೆದ ತಿಂಗಳು"</string> <string name="older" msgid="5211975022815554840">"ಹಳೆಯದು"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ನಿನ್ನೆ"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> ದಿನಗಳ ಹಿಂದೆ"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 ಸೆಕೆಂಡಿನಲ್ಲಿ"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 ನಿಮಿಷದಲ್ಲಿ"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> ನಿಮಿಷಗಳಲ್ಲಿ"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 ಗಂಟೆಯಲ್ಲಿ"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> ಗಂಟೆಗಳಲ್ಲಿ"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ನಾಳೆ"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> ದಿನಗಳಲ್ಲಿ"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 ಸೆಕೆಂಡಿನ ಹಿಂದೆ"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> ಸೆಕೆಂಡುಗಳ ಹಿಂದೆ"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 ನಿಮಿಷದ ಹಿಂದೆ"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 ಗಂಟೆ ಹಿಂದೆ"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ಗಂಟೆಗಳ ಹಿಂದೆ"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ನಿನ್ನೆ"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> ದಿನಗಳ ಹಿಂದೆ"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 ಸೆಕೆಂಡಿನಲ್ಲಿ"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 ನಿಮಿಷದಲ್ಲಿ"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> ನಿಮಿಷಗಳಲ್ಲಿ"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 ಗಂಟೆಯಲ್ಲಿ"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> ಗಂಟೆಗಳಲ್ಲಿ"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ನಾಳೆ"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> ದಿನಗಳಲ್ಲಿ"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> ರಂದು"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> ರಲ್ಲಿ"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> ರಲ್ಲಿ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 94c60d9..afa99f3 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>을(를) 사용하려면 \'터치하여 탐색\' 기능을 사용하도록 설정해야 합니다. \'터치하여 탐색\'을 사용하도록 설정하면, 화면을 터치하여 손가락 아래에 표시된 항목에 대한 설명을 듣고 보거나 휴대전화로 상호작용하기 위한 동작을 수행할 수 있습니다."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"한 달 전"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"한 달 전"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1초 전"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g>초 전"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1분 전"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g>분 전"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1시간 전"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g>시간 전"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"지난 달"</string> <string name="older" msgid="5211975022815554840">"이전"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"어제"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g>일 전"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1초 내"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g>초 후"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1분 후"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g>분 후"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1시간 후"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g>시간 후"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"내일"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g>일 후"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1초 전"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g>초 전"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1분 전"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g>분 전"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1시간 전"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g>시간 전"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"어제"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g>일 전"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1초 후"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g>초 후"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1분 후"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g>분 후"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1시간 후"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g>시간 후"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"내일"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g>일 후"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>년"</string> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index 898b226..f4586e1 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -1474,44 +1474,11 @@ <skip /> <!-- no translation found for beforeOneMonthDurationPast (909134546836499826) --> <skip /> - <!-- no translation found for num_seconds_ago:one (4869870056547896011) --> - <!-- no translation found for num_seconds_ago:other (3903706804349556379) --> - <!-- no translation found for num_minutes_ago:one (3306787433088810191) --> - <!-- no translation found for num_minutes_ago:other (2176942008915455116) --> - <!-- no translation found for num_hours_ago:one (9150797944610821849) --> - <!-- no translation found for num_hours_ago:other (2467273239587587569) --> - <!-- no translation found for last_num_days:one (7555846096746489821) --> <!-- no translation found for last_num_days:other (3069992808164318268) --> <!-- no translation found for last_month (3959346739979055432) --> <skip /> <!-- no translation found for older (5211975022815554840) --> <skip /> - <!-- no translation found for num_days_ago:one (861358534398115820) --> - <!-- no translation found for num_days_ago:other (2479586466153314633) --> - <!-- no translation found for in_num_seconds:one (2729745560954905102) --> - <!-- no translation found for in_num_seconds:other (1241926116443974687) --> - <!-- no translation found for in_num_minutes:one (8793095251325200395) --> - <!-- no translation found for in_num_minutes:other (3330713936399448749) --> - <!-- no translation found for in_num_hours:one (7164353342477769999) --> - <!-- no translation found for in_num_hours:other (547290677353727389) --> - <!-- no translation found for in_num_days:one (5413088743009839518) --> - <!-- no translation found for in_num_days:other (5109449375100953247) --> - <!-- no translation found for abbrev_num_seconds_ago:one (1849036840200069118) --> - <!-- no translation found for abbrev_num_seconds_ago:other (3699169366650930415) --> - <!-- no translation found for abbrev_num_minutes_ago:one (6361490147113871545) --> - <!-- no translation found for abbrev_num_minutes_ago:other (851164968597150710) --> - <!-- no translation found for abbrev_num_hours_ago:one (4796212039724722116) --> - <!-- no translation found for abbrev_num_hours_ago:other (6889970745748538901) --> - <!-- no translation found for abbrev_num_days_ago:one (8463161711492680309) --> - <!-- no translation found for abbrev_num_days_ago:other (3453342639616481191) --> - <!-- no translation found for abbrev_in_num_seconds:one (5842225370795066299) --> - <!-- no translation found for abbrev_in_num_seconds:other (5495880108825805108) --> - <!-- no translation found for abbrev_in_num_minutes:one (562786149928284878) --> - <!-- no translation found for abbrev_in_num_minutes:other (4216113292706568726) --> - <!-- no translation found for abbrev_in_num_hours:one (3274708118124045246) --> - <!-- no translation found for abbrev_in_num_hours:other (3705373766798013406) --> - <!-- no translation found for abbrev_in_num_days:one (2178576254385739855) --> - <!-- no translation found for abbrev_in_num_days:other (2973062968038355991) --> <!-- no translation found for preposition_for_date (9093949757757445117) --> <skip /> <!-- no translation found for preposition_for_time (5506831244263083793) --> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index 086a9e5..ec70266 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ \"ການສຳຫຼວດໂດຍສຳພັດ\". ເມື່ອເປີດ \"ການສຳຫຼວດໂດຍສຳພັດ\" ແລ້ວ ທ່ານຈະສາມາດໄດ້ຍິນ ຫຼືເຫັນຄຳບັນຍາຍວ່າມີຫຍັງຢູ່ກ້ອງນິ້ວມືຂອງທ່ານ ຫຼືໃຊ້ຮູບແບບການເຄື່ອນໄຫວເພື່ອໂຕ້ຕອບກັບໂທລະສັບ."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 ເດືອນກ່ອນຫນ້ານີ້"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"ຫຼາຍກວ່າ 1 ເດືອນກ່ອນ"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 ວິນາທີກ່ອນ"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> ວິນາທີກ່ອນໜ້ານີ້"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 ນາທີກ່ອນໜ້ານີ້"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> ນາທີທີ່ຜ່ານມາ"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 ຊົ່ວໂມງກ່ອນໜ້ານີ້"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ຊົ່ວໂມງທີ່ຜ່ານມາ"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"ເດືອນແລ້ວ"</string> <string name="older" msgid="5211975022815554840">"ເກົ່າກວ່າ"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ມື້ວານນີ້"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> ມື້ກ່ອນ"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"ໃນອີກ 1 ວິນາທີ"</item> - <item quantity="other" msgid="1241926116443974687">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ວິນາທີ"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"ໃນ 1 ນາທີ"</item> - <item quantity="other" msgid="3330713936399448749">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ນາທີ"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"ໃນ 1 ຊົ່ວໂມງ"</item> - <item quantity="other" msgid="547290677353727389">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ຊົ່ວໂມງ"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ມື້ອື່ນ"</item> - <item quantity="other" msgid="5109449375100953247">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ມື້"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 ວິນາທີກ່ອນ"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> ວິ ກ່ອນໜ້ານີ້"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 ນທ ກ່ອນ"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> ນທ ກ່ອນໜ້ານີ້"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 ຊົ່ວໂມງກ່ອນ"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ຊົ່ວໂມງກ່ອນໜ້ານີ້"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ມື້ວານນີ້"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> ມື້ກ່ອນໜ້ານີ້"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"ໃນ 1 ວິ"</item> - <item quantity="other" msgid="5495880108825805108">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ວິ"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"ໃນ 1 ນາທີ"</item> - <item quantity="other" msgid="4216113292706568726">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ນທ"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"ໃນ 1 ຊົ່ວໂມງ"</item> - <item quantity="other" msgid="3705373766798013406">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ຊົ່ວໂມງ"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ມື້ອື່ນ"</item> - <item quantity="other" msgid="2973062968038355991">"ໃນ <xliff:g id="COUNT">%d</xliff:g> ມື້"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"ວັນທີ <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"ເວລາ <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"ໃນ <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index d7a93ac..8e8d436 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"„<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>“ nori įgalinti naršymą liečiant. Kai naršymas liečiant bus įjungtas, galėsite išgirsti ar peržiūrėti pirštu liečiamų elementų aprašus arba atlikdami gestus naudoti telefoną."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Prieš 1 mėn."</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Prieš maždaug 1 mėnesį"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Prieš 1 sek."</item> - <item quantity="other" msgid="3903706804349556379">"Prieš <xliff:g id="COUNT">%d</xliff:g> sek."</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Prieš 1 minutę"</item> - <item quantity="other" msgid="2176942008915455116">"Prieš <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Prieš 1 valandą"</item> - <item quantity="other" msgid="2467273239587587569">"Prieš <xliff:g id="COUNT">%d</xliff:g> val."</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Paskutinį mėnesį"</string> <string name="older" msgid="5211975022815554840">"Senesni"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"vakar"</item> - <item quantity="other" msgid="2479586466153314633">"Prieš <xliff:g id="COUNT">%d</xliff:g> d."</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"po 1 sek."</item> - <item quantity="other" msgid="1241926116443974687">"po <xliff:g id="COUNT">%d</xliff:g> sek."</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"po 1 min."</item> - <item quantity="other" msgid="3330713936399448749">"po <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"po 1 val."</item> - <item quantity="other" msgid="547290677353727389">"po <xliff:g id="COUNT">%d</xliff:g> val."</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"rytoj"</item> - <item quantity="other" msgid="5109449375100953247">"po <xliff:g id="COUNT">%d</xliff:g> d."</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Prieš 1 sek."</item> - <item quantity="other" msgid="3699169366650930415">"Prieš <xliff:g id="COUNT">%d</xliff:g> sek."</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"Prieš 1 min."</item> - <item quantity="other" msgid="851164968597150710">"Prieš <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Prieš 1 valandą"</item> - <item quantity="other" msgid="6889970745748538901">"Prieš <xliff:g id="COUNT">%d</xliff:g> val."</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"vakar"</item> - <item quantity="other" msgid="3453342639616481191">"Prieš <xliff:g id="COUNT">%d</xliff:g> d."</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"po 1 sek."</item> - <item quantity="other" msgid="5495880108825805108">"po <xliff:g id="COUNT">%d</xliff:g> sek."</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"po 1 min."</item> - <item quantity="other" msgid="4216113292706568726">"po <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"po 1 val."</item> - <item quantity="other" msgid="3705373766798013406">"po <xliff:g id="COUNT">%d</xliff:g> val."</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"rytoj"</item> - <item quantity="other" msgid="2973062968038355991">"po <xliff:g id="COUNT">%d</xliff:g> d."</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> m."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 1989b55..2c74c82 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vēlas iespējot funkciju “Atklāt pieskaroties”. Kad ir ieslēgta funkcija “Atklāt pieskaroties”, var dzirdēt vai redzēt tā vienuma aprakstu, virs kura atrodas pirksts, vai veikt žestus, lai mijiedarbotos ar tālruni."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Pirms 1 mēneša"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Vairāk nekā pirms 1 mēneša"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Pirms 1 sekundes"</item> - <item quantity="other" msgid="3903706804349556379">"Pirms <xliff:g id="COUNT">%d</xliff:g> sekundes(-ēm)"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Pirms 1 minūtes"</item> - <item quantity="other" msgid="2176942008915455116">"Pirms <xliff:g id="COUNT">%d</xliff:g> minūtes(-ēm)"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Pirms 1 stundas"</item> - <item quantity="other" msgid="2467273239587587569">"Pirms <xliff:g id="COUNT">%d</xliff:g> stundas(-ām)"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Iepriekšējā mēnesī"</string> <string name="older" msgid="5211975022815554840">"Vecāks"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"vakar"</item> - <item quantity="other" msgid="2479586466153314633">"Pirms <xliff:g id="COUNT">%d</xliff:g> dienas(-ām)"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"pēc 1 sekundes"</item> - <item quantity="other" msgid="1241926116443974687">"pēc <xliff:g id="COUNT">%d</xliff:g> sekundes(-ēm)"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"pēc 1 minūtes"</item> - <item quantity="other" msgid="3330713936399448749">"pēc <xliff:g id="COUNT">%d</xliff:g> minūtes(-ēm)"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"pēc 1 stundas"</item> - <item quantity="other" msgid="547290677353727389">"pēc <xliff:g id="COUNT">%d</xliff:g> stundas(-ām)"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"rītdien"</item> - <item quantity="other" msgid="5109449375100953247">"pēc <xliff:g id="COUNT">%d</xliff:g> dienas(-ām)"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Pirms 1 sekundes"</item> - <item quantity="other" msgid="3699169366650930415">"Pirms <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"Pirms 1 min"</item> - <item quantity="other" msgid="851164968597150710">"Pirms <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Pirms 1 stundas"</item> - <item quantity="other" msgid="6889970745748538901">"Pirms <xliff:g id="COUNT">%d</xliff:g> stundas(-ām)"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"vakar"</item> - <item quantity="other" msgid="3453342639616481191">"Pirms <xliff:g id="COUNT">%d</xliff:g> dienas(-ām)"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"pēc 1 s"</item> - <item quantity="other" msgid="5495880108825805108">"pēc <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"pēc 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"pēc <xliff:g id="COUNT">%d</xliff:g> minūtes(-ēm)"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"pēc 1 stundas"</item> - <item quantity="other" msgid="3705373766798013406">"pēc <xliff:g id="COUNT">%d</xliff:g> stundas(-ām)"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"rītdien"</item> - <item quantity="other" msgid="2973062968038355991">"pēc <xliff:g id="COUNT">%d</xliff:g> dienas(-ām)"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"šādā datumā: <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"plkst. <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"šādā gadā: <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index a3d0386..a6ec56c 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> сака да овозможи „Истражувај со допир“. Кога е вклучено „Истражувај со допир“, може да се слушнат или да се видат описи на она што е под вашиот прст или да се прават движења за комуницирање со телефонот."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Пред 1 месец"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Пред повеќе од 1 месец"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"пред 1 секунда"</item> - <item quantity="other" msgid="3903706804349556379">"пред <xliff:g id="COUNT">%d</xliff:g> секунди"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"пред 1 минута"</item> - <item quantity="other" msgid="2176942008915455116">"пред <xliff:g id="COUNT">%d</xliff:g> минути"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Пред 1 час"</item> - <item quantity="other" msgid="2467273239587587569">"пред <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Минатиот месец"</string> <string name="older" msgid="5211975022815554840">"Постари"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"вчера"</item> - <item quantity="other" msgid="2479586466153314633">"Пред <xliff:g id="COUNT">%d</xliff:g> дена"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"за 1 секунда"</item> - <item quantity="other" msgid="1241926116443974687">"за <xliff:g id="COUNT">%d</xliff:g> секунди"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"за 1 минута"</item> - <item quantity="other" msgid="3330713936399448749">"за <xliff:g id="COUNT">%d</xliff:g> минути"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"за 1 час"</item> - <item quantity="other" msgid="547290677353727389">"за <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"утре"</item> - <item quantity="other" msgid="5109449375100953247">"за <xliff:g id="COUNT">%d</xliff:g> дена"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"пред 1 сек"</item> - <item quantity="other" msgid="3699169366650930415">"пред <xliff:g id="COUNT">%d</xliff:g> секунди"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"пред 1 мин"</item> - <item quantity="other" msgid="851164968597150710">"пред <xliff:g id="COUNT">%d</xliff:g> минути"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"пред 1 час"</item> - <item quantity="other" msgid="6889970745748538901">"пред <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"вчера"</item> - <item quantity="other" msgid="3453342639616481191">"Пред <xliff:g id="COUNT">%d</xliff:g> дена"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"за 1 сек"</item> - <item quantity="other" msgid="5495880108825805108">"за <xliff:g id="COUNT">%d</xliff:g> секунди"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"за 1 мин"</item> - <item quantity="other" msgid="4216113292706568726">"за <xliff:g id="COUNT">%d</xliff:g> минути"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"за 1 час"</item> - <item quantity="other" msgid="3705373766798013406">"за <xliff:g id="COUNT">%d</xliff:g> часа"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"утре"</item> - <item quantity="other" msgid="2973062968038355991">"за <xliff:g id="COUNT">%d</xliff:g> дена"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"на <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"во <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"во <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index 49f86e8..a2e36ac 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"ടച്ച് വഴി പര്യവേക്ഷണം ചെയ്യൽ പ്രവർത്തനക്ഷമമാക്കാൻ <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു. ടച്ച് വഴി പര്യവേക്ഷണം ചെയ്യൽ ഓൺ ചെയ്യുമ്പോൾ, നിങ്ങളുടെ വിരലിനടിയിലുള്ളവയുടെ വിവരണം കേൾക്കാനോ കാണാനോ അല്ലെങ്കിൽ ഫോണുമായി സംവദിക്കുന്ന ജെസ്റ്ററുകൾ നിർവഹിക്കാനോ കഴിയും."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 മാസം മുമ്പുള്ളത്"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"ഒരു മാസം മുമ്പ്"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 നിമിഷം മുമ്പ്"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> നിമിഷം മുമ്പ്"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 മിനിറ്റ് മുമ്പ്"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> മിനിറ്റ് മുമ്പ്"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 മണിക്കൂര് മുമ്പ്"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> മണിക്കൂർ മുമ്പ്"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"കഴിഞ്ഞ മാസം"</string> <string name="older" msgid="5211975022815554840">"പഴയത്"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ഇന്നലെ"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> ദിവസം മുമ്പ്"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"ഒരു നിമിഷത്തിനുള്ളിൽ"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> നിമിഷത്തിനുള്ളിൽ"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"ഒരു മിനിറ്റിൽ"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> മിനിറ്റിനുള്ളിൽ"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"ഒരു മണിക്കൂറിനുള്ളിൽ"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> മണിക്കൂറിനുള്ളിൽ"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"നാളെ"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> ദിവസത്തിനുള്ളിൽ"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"ഒരു നിമിഷം മുമ്പ്"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> നിമിഷം മുമ്പ്"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"ഒരു മിനിറ്റ് മുമ്പ്"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> മിനിറ്റ് മുമ്പ്"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 മണിക്കൂര് മുമ്പ്"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> മണിക്കൂർ മുമ്പ്"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ഇന്നലെ"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> ദിവസം മുമ്പ്"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"ഒരു നിമിഷത്തിനുള്ളിൽ"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> നിമിഷത്തിനുള്ളിൽ"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"ഒരു മിനിറ്റിനുള്ളിൽ"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> മിനിറ്റിനുള്ളിൽ"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"ഒരു മണിക്കൂറിനുള്ളിൽ"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> മണിക്കൂറിനുള്ളിൽ"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"നാളെ"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> ദിവസത്തിനുള്ളിൽ"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>-ന്"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>-ന്"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>-ൽ"</string> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index e714570..d91363a 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> нь Хүрч танихыг идэвхжүүлэхийг шаардаж байна. Хүрч таних идэвхжсэн тохиолдолд та хуруун доороо юу байгааг сонсох, тайлбарыг харах боломжтой ба утастайгаа дохиогоор харилцах боломжтой."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 сарын өмнө"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 сарын өмнө"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 секундын өмнө"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> секундын өмнө"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 минутын өмнө"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> минутын өмнө"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 цагийн өмнө"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> цагийн өмнө"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Сүүлийн сар"</string> <string name="older" msgid="5211975022815554840">"Хуучин"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"өчигдөр"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> өдрийн өмнө"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 секундын дараа"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> секундын дараа"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 минутын дараа"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> минутын дараа"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 цагийн дараа"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> цагийн дараа"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"маргааш"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> өдрийн дараа"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 секундын өмнө"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> сек дараа"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 мин өмнө"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> минутын өмнө"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 цагийн өмнө"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> цагийн өмнө"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"өчигдөр"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> өдрийн өмнө"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 сек дараа"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> сек дараа"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 мин дараа"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> минутын дараа"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 цагийн дараа"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> цагийн дараа"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"маргааш"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> өдрийн дараа"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index 763c18e..646a29d 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> स्पर्श करून एक्सप्लोर करा सक्षम करू इच्छिते. स्पर्श करून एक्सप्लोर करा चालू असते, तेव्हा आपण आपल्या बोटाखाली काय आहे त्याचे वर्णन ऐकू किंवा पाहू शकता किंवा फोनसह संवाद साधण्यासाठी जेश्चर करू शकता."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 महिन्यापूर्वी"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 महिन्यापूर्वी"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 सेकंदापूर्वी"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> सेकंदांपूर्वी"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 मिनिटापूर्वी"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> मिनिटांपूर्वी"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 तासापूर्वी"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> तासांपूर्वी"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"अंतिम महिना"</string> <string name="older" msgid="5211975022815554840">"अधिक जुने"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"काल"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> दिवसांपूर्वी"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 सेकंदात"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> सेकंदांमध्ये"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 मिनिटात"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> मिनिटांमध्ये"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 तासात"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> तासांमध्ये"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"उद्या"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> दिवसांमध्ये"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 सेकंदापूर्वी"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> सेकंदांपूर्वी"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 मिनिटापूर्वी"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> मिनिटांपूर्वी"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 तासापूर्वी"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> तासांपूर्वी"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"काल"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> दिवसांपूर्वी"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 सेकंदामध्ये"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> सेकंदांमध्ये"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 मिनिटामध्ये"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> मिनिटांमध्ये"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 तासात"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> तासांमध्ये"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"उद्या"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> दिवसांमध्ये"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> रोजी"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> वाजता"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> मध्ये"</string> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index 21be5b1..069a6c0 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ingin mendayakan Jelajah melalui Sentuhan. Apabila Jelajah melalui Sentuhan didayakan, anda boleh mendengar atau melihat penerangan tentang apa di bawah jari anda atau melakukan gerak isyarat untuk berinteraksi dengan telefon."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 bulan yang lalu"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Sebelum 1 bulan yang lalu"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 saat yang lalu"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> saat yang lalu"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minit yang lalu"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minit yang lalu"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 jam yang lalu"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> jam yang lalu"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Bulan lepas"</string> <string name="older" msgid="5211975022815554840">"Lebih lama"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"semalam"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> hari yang lalu"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"dalam 1 saat"</item> - <item quantity="other" msgid="1241926116443974687">"dalam <xliff:g id="COUNT">%d</xliff:g> saat"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"dalam 1 minit"</item> - <item quantity="other" msgid="3330713936399448749">"dalam <xliff:g id="COUNT">%d</xliff:g> minit"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"dalam 1 jam"</item> - <item quantity="other" msgid="547290677353727389">"dalam <xliff:g id="COUNT">%d</xliff:g> jam"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"esok"</item> - <item quantity="other" msgid="5109449375100953247">"dalam <xliff:g id="COUNT">%d</xliff:g> hari"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 saat yang lalu"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> saat yang lalu"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 minit yang lalu"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> minit yang lalu"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 jam yang lalu"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> jam yang lalu"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"semalam"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> hari yang lalu"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"dalam 1 saat"</item> - <item quantity="other" msgid="5495880108825805108">"dalam <xliff:g id="COUNT">%d</xliff:g> saat"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"dalam 1 minit"</item> - <item quantity="other" msgid="4216113292706568726">"dalam <xliff:g id="COUNT">%d</xliff:g> minit"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"dalam 1 jam"</item> - <item quantity="other" msgid="3705373766798013406">"dalam <xliff:g id="COUNT">%d</xliff:g> jam"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"esok"</item> - <item quantity="other" msgid="2973062968038355991">"dalam <xliff:g id="COUNT">%d</xliff:g> hari"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"pada <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"pada <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"dalam <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index a8e95b5..c0bea1f 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> က ထိတွေ့ပြီး ရှာဖွေခြင်းကို လုပ်ချင်ပါသည်။ ထိတွေ့ရှာဖွေခြင်း ဖွင့်ထားလျှင် သင့်လက်ဖျားအောက်မှ အရာကို ကြားနိုင် သို့ ရှင်းလင်းချက်ကို မြင်နိုင်တဲ့ အပြင် လက် အနေအထားဖြင့် ဖုန်းကို ဆက်သွယ်ပြုလုပ်စေခိုင်းနိုင်ပါသည်"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"လွန်ခဲ့သော၁လက"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"လွန်ခဲ့သော၁လမတိုင်မီက"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"လွန်ခဲ့သော ၁စက္ကန့်က"</item> - <item quantity="other" msgid="3903706804349556379">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်က"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"လွန်ခဲ့သော ၁မိနစ်က"</item> - <item quantity="other" msgid="2176942008915455116">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> မိနစ်က"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"လွနခဲ့သော ၁နာရီက"</item> - <item quantity="other" msgid="2467273239587587569">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> နာရီက"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"ပြီးခဲ့သောလ"</string> <string name="older" msgid="5211975022815554840">"ယခင်က"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"မနေ့က"</item> - <item quantity="other" msgid="2479586466153314633">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> ရက်တွင်"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"နောက် ၁စက္ကန့်တွင်"</item> - <item quantity="other" msgid="1241926116443974687">"နောက် <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်တွင်"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"နောက်၁မီနစ်တွင်"</item> - <item quantity="other" msgid="3330713936399448749">"နောက် <xliff:g id="COUNT">%d</xliff:g> မိနစ်တွင်"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"နောက်၁နာရီတွင်"</item> - <item quantity="other" msgid="547290677353727389">"နောက် <xliff:g id="COUNT">%d</xliff:g> နာရီတွင်"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"မနက်ဖြန်"</item> - <item quantity="other" msgid="5109449375100953247">"နောက် <xliff:g id="COUNT">%d</xliff:g> ရက်တွင်"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"လွန်ခဲ့သော ၁စက္ကန့်က"</item> - <item quantity="other" msgid="3699169366650930415">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်က"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"လွန်ခဲ့သော ၁မိနစ်က"</item> - <item quantity="other" msgid="851164968597150710">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> မိနစ်က"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"လွန်ခဲ့သော ၁နာရီက"</item> - <item quantity="other" msgid="6889970745748538901">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> နာရီက"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"မနေ့က"</item> - <item quantity="other" msgid="3453342639616481191">"လွန်ခဲ့သော <xliff:g id="COUNT">%d</xliff:g> ရက်တွင်"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"နောက် ၁စက္ကန့်တွင်"</item> - <item quantity="other" msgid="5495880108825805108">"နောက် <xliff:g id="COUNT">%d</xliff:g> စက္ကန့်တွင်"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"နောက်၁မိနစ်တွင်"</item> - <item quantity="other" msgid="4216113292706568726">"နောက် <xliff:g id="COUNT">%d</xliff:g> မိနစ်တွင်"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"နောက်၁နာရီတွင်"</item> - <item quantity="other" msgid="3705373766798013406">"နောက် <xliff:g id="COUNT">%d</xliff:g> နာရီတွင်"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"မနက်ဖြန်"</item> - <item quantity="other" msgid="2973062968038355991">"နောက် <xliff:g id="COUNT">%d</xliff:g> ရက်တွင်"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> တွင်"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>မှာ"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>တွင်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 35147e4..1b14de1 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ber om aktivering av Utforsk ved å trykke. Når Utforsk ved å trykke er slått på, kan du høre eller se beskrivelser av det som er under fingrene dine. Du kan også utføre handlinger på nettbrettet ved hjelp av bevegelser."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"For én måned siden"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"For over en måned siden"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"for et sekund siden"</item> - <item quantity="other" msgid="3903706804349556379">"for <xliff:g id="COUNT">%d</xliff:g> sekunder siden"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"for et minutt siden"</item> - <item quantity="other" msgid="2176942008915455116">"for <xliff:g id="COUNT">%d</xliff:g> minutter siden"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"for en time siden"</item> - <item quantity="other" msgid="2467273239587587569">"for <xliff:g id="COUNT">%d</xliff:g> timer siden"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Forrige måned"</string> <string name="older" msgid="5211975022815554840">"Eldre"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"i går"</item> - <item quantity="other" msgid="2479586466153314633">"for <xliff:g id="COUNT">%d</xliff:g> dager siden"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"om et sekund"</item> - <item quantity="other" msgid="1241926116443974687">"om <xliff:g id="COUNT">%d</xliff:g> sekunder"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"om et minutt"</item> - <item quantity="other" msgid="3330713936399448749">"om <xliff:g id="COUNT">%d</xliff:g> minutter"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"om et minutt"</item> - <item quantity="other" msgid="547290677353727389">"om <xliff:g id="COUNT">%d</xliff:g> timer"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"i morgen"</item> - <item quantity="other" msgid="5109449375100953247">"om <xliff:g id="COUNT">%d</xliff:g> dager"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 sek siden"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> sek siden"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 min siden"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> min siden"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 t siden"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> t siden"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"i går"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> d siden"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"om 1 sek"</item> - <item quantity="other" msgid="5495880108825805108">"om <xliff:g id="COUNT">%d</xliff:g> sek"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"om 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"om <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"om 1 t"</item> - <item quantity="other" msgid="3705373766798013406">"om <xliff:g id="COUNT">%d</xliff:g> t"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <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">"<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> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index 093f3c9..da70149 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>ले स्पर्षद्वारा अन्वेषण सक्षम गर्न चाहन्छ। स्पर्षद्वारा अन्वेषण सक्षम भएको बेला तपाईँ आफ्नो औँलाको मुनि भएका विषयवस्तुहरू बारे सुन्न वा विवरण हेर्न सक्नुहुन्छ वा फोनसँग अन्तर्क्रिया गर्न इशारा गर्नुहोस्।"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"१ महिना अघि"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"१ महिना अघि"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"१ सेकेन्ड अघि"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> सेकेन्ड अघि"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"१ मिनेट अघि"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> मिनेट अघि"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"१ घन्टा अघि"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> घन्टा अघि"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"अन्तिम महिना"</string> <string name="older" msgid="5211975022815554840">"पुरानो"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"हिजो"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> दिन अघि"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"१ सेकेन्डमा"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> सेकेन्डमा"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"१ मिनेटमा"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g>मिनेटमा"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"१ घन्टामा"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> घन्टामा"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"भोलि"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> दिनमा"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"१ सेकेन्ड अघि"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> सेकेन्ड अगाडि"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"१ मिनेट अघि"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> मिनेट अघि"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"१ घन्टा अघि"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> घन्टा अघि"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"हिजो"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> दिन अघि"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"१ सेकन्ड"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> सेकेन्डमा"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"१ मिनेटमा"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> मिनेटमा"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"१ घन्टामा"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> घन्टामा"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"भोलि"</item> - <item quantity="other" msgid="2973062968038355991">"दिन<xliff:g id="COUNT">%d</xliff:g> मा"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> मा"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> मा"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> मा"</string> diff --git a/core/res/res/values-night/themes_material_daynight.xml b/core/res/res/values-night/themes_material_daynight.xml new file mode 100644 index 0000000..da870b7 --- /dev/null +++ b/core/res/res/values-night/themes_material_daynight.xml @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<!-- +=============================================================== + PLEASE READ +=============================================================== + +The Material themes must not be modified in order to pass CTS. +Many related themes and styles depend on other values defined in this file. +If you would like to provide custom themes and styles for your device, +please see themes_device_defaults.xml. + +=============================================================== + PLEASE READ +=============================================================== + --> +<resources> + + <!-- Material theme (day/night version) for activities. --> + <style name="Theme.Material.DayNight" parent="Theme.Material" /> + + <!-- Variant of Material.DayNight that has a solid (opaque) action bar + with an inverse color profile. The dark action bar sharply stands out against + the light content (when applicable). --> + <style name="Theme.Material.DayNight.DarkActionBar" parent="Theme.Material" /> + + <!-- Variant of Material.DayNight with no action bar. --> + <style name="Theme.Material.DayNight.NoActionBar" parent="Theme.Material.NoActionBar" /> + + <!-- Variant of Material.DayNight that has no title bar and fills + the entire screen. This theme + sets {@link android.R.attr#windowFullscreen} to true. --> + <style name="Theme.Material.DayNight.NoActionBar.Fullscreen" parent="Theme.Material.NoActionBar.Fullscreen" /> + + <!-- Variant of Material.DayNight that has no title bar and fills + the entire screen and extends into the display overscan region. This theme + sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan} + to true. --> + <style name="Theme.Material.DayNight.NoActionBar.Overscan" parent="Theme.Material.NoActionBar.Overscan" /> + + <!-- Variant of Material.DayNight that has no title bar and translucent + system decor. This theme sets {@link android.R.attr#windowTranslucentStatus} and + {@link android.R.attr#windowTranslucentNavigation} to true. --> + <style name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" parent="Theme.Material.NoActionBar.TranslucentDecor" /> + + <!-- Default Material.DayNight theme for panel windows. This removes all extraneous + window decorations, so you basically have an empty rectangle in which + to place your content. It makes the window floating, with a transparent + background, and turns off dimming behind the window. --> + <style name="Theme.Material.DayNight.Panel" parent="Theme.Material.Panel" /> + + <!-- Material theme (day/night version) for dialog windows and activities, + which is used by the {@link android.app.Dialog} class. This changes + the window to be floating (not fill the entire screen), and puts a + frame around its contents. You can set this theme on an activity if + you would like to make an activity that looks like a Dialog. --> + <style name="Theme.Material.DayNight.Dialog" parent="Theme.Material.DayNight.BaseDialog" /> + <style name="Theme.Material.DayNight.BaseDialog" parent="Theme.Material.BaseDialog" /> + + <!-- Variant of Theme.Material.DayNight.Dialog that has a nice minimum width for + a regular dialog. --> + <style name="Theme.Material.DayNight.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth" /> + + <!-- Variant of Theme.Material.DayNight.Dialog that does not include a title bar. --> + <style name="Theme.Material.DayNight.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar" /> + + <!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a nice minimum width for + a regular dialog. --> + <style name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth" /> + + <!-- Variant of Theme.Material.DayNight.Dialog that has a fixed size. --> + <style name="Theme.Material.DayNight.Dialog.FixedSize" parent="Theme.Material.Dialog.FixedSize" /> + + <!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a fixed size. --> + <style name="Theme.Material.DayNight.Dialog.NoActionBar.FixedSize" parent="Theme.Material.Dialog.NoActionBar.FixedSize" /> + + <!-- Theme for a window that will be displayed either full-screen on + smaller screens (small, normal) or as a dialog on larger screens + (large, xlarge). --> + <style name="Theme.Material.DayNight.DialogWhenLarge" parent="Theme.Material.DialogWhenLarge" /> + + <!-- Theme for a window without an action bar that will be displayed either full-screen + on smaller screens (small, normal) or as a dialog on larger screens + (large, xlarge). --> + <style name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" parent="Theme.Material.DialogWhenLarge.NoActionBar" /> + + <!-- Theme for a presentation window on a secondary display. --> + <style name="Theme.Material.DayNight.Dialog.Presentation" parent="Theme.Material.Dialog.Presentation" /> + + <!-- Material user theme for alert dialog windows, which is used by the + {@link android.app.AlertDialog} class. --> + <style name="Theme.Material.DayNight.Dialog.Alert" parent="Theme.Material.DayNight.Dialog.BaseAlert" /> + <style name="Theme.Material.DayNight.Dialog.BaseAlert" parent="Theme.Material.Dialog.BaseAlert" /> + + <style name="Theme.Material.DayNight.SearchBar" parent="Theme.Material.SearchBar" /> + <style name="Theme.Material.DayNight.CompactMenu" parent="Theme.Material.CompactMenu" /> + +</resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 0aff860..c4bb334 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> wil \'Verkennen via aanraking\' inschakelen. Wanneer \'Verkennen via aanraking\' is ingeschakeld, kunt u beschrijvingen beluisteren of bekijken van wat er onder uw vinger staat of aanraakbewerkingen uitvoeren op de telefoon."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 maand geleden"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Meer dan 1 maand geleden"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 seconde geleden"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> seconden geleden"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minuut geleden"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minuten geleden"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 uur geleden"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> uur geleden"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Afgelopen maand"</string> <string name="older" msgid="5211975022815554840">"Ouder"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"gisteren"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> dagen geleden"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"over 1 seconde"</item> - <item quantity="other" msgid="1241926116443974687">"over <xliff:g id="COUNT">%d</xliff:g> seconden"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"over 1 minuut"</item> - <item quantity="other" msgid="3330713936399448749">"over <xliff:g id="COUNT">%d</xliff:g> minuten"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"over 1 uur"</item> - <item quantity="other" msgid="547290677353727389">"over <xliff:g id="COUNT">%d</xliff:g> uur"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"morgen"</item> - <item quantity="other" msgid="5109449375100953247">"over <xliff:g id="COUNT">%d</xliff:g> dagen"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 seconde geleden"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> seconden geleden"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 minuut geleden"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> minuten geleden"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 uur geleden"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> uur geleden"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"gisteren"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> dagen geleden"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"over 1 seconde"</item> - <item quantity="other" msgid="5495880108825805108">"over <xliff:g id="COUNT">%d</xliff:g> seconden"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"over 1 minuut"</item> - <item quantity="other" msgid="4216113292706568726">"over <xliff:g id="COUNT">%d</xliff:g> minuten"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"over 1 uur"</item> - <item quantity="other" msgid="3705373766798013406">"over <xliff:g id="COUNT">%d</xliff:g> uur"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"morgen"</item> - <item quantity="other" msgid="2973062968038355991">"over <xliff:g id="COUNT">%d</xliff:g> dagen"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"op <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"om <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"in <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 2b25918..ac14db8 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> chce włączyć Czytanie dotykiem. Gdy ta funkcja jest włączona, słyszysz i widzisz opisy elementów, które są pod Twoim palcem, oraz możesz obsługiwać telefon gestami."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 miesiąc temu"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Ponad 1 miesiąc temu"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"sekundę temu"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> sek. temu"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minutę temu"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> min temu"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"godzinę temu"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> godz. temu"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Ostatni miesiąc"</string> <string name="older" msgid="5211975022815554840">"Starsze"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"wczoraj"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> dni temu"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"za sekundę"</item> - <item quantity="other" msgid="1241926116443974687">"za <xliff:g id="COUNT">%d</xliff:g> sek."</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"za minutę"</item> - <item quantity="other" msgid="3330713936399448749">"za <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"za godzinę"</item> - <item quantity="other" msgid="547290677353727389">"za <xliff:g id="COUNT">%d</xliff:g> godzin"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"jutro"</item> - <item quantity="other" msgid="5109449375100953247">"za <xliff:g id="COUNT">%d</xliff:g> dni"</item> - </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> s temu"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"minutę temu"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> min temu"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"godzinę temu"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> godz. temu"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"wczoraj"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> dni temu"</item> - </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> s"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"za minutę"</item> - <item quantity="other" msgid="4216113292706568726">"za <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"za godzinę"</item> - <item quantity="other" msgid="3705373766798013406">"za <xliff:g id="COUNT">%d</xliff:g> godz."</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"jutro"</item> - <item quantity="other" msgid="2973062968038355991">"za <xliff:g id="COUNT">%d</xliff:g> dni"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"w dniu <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"o godzinie <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"w <xliff:g id="YEAR">%s</xliff:g> r."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 041847d..87c4dcc 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pretende ativar a funcionalidade Explorar Através do Toque. Quando a funcionalidade Explorar Através do Toque estiver ativada, pode ouvir ou visualizar descrições sobre o que está por baixo do seu dedo ou executar gestos para interagir com o telemóvel."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Há 1 mês"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Há mais de 1 mês"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Há 1 segundo"</item> - <item quantity="other" msgid="3903706804349556379">"Há <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Há 1 minuto"</item> - <item quantity="other" msgid="2176942008915455116">"Há <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Há 1 hora"</item> - <item quantity="other" msgid="2467273239587587569">"Há <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Último mês"</string> <string name="older" msgid="5211975022815554840">"Mais antiga"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ontem"</item> - <item quantity="other" msgid="2479586466153314633">"Há <xliff:g id="COUNT">%d</xliff:g> dias"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"daqui a 1 segundo"</item> - <item quantity="other" msgid="1241926116443974687">"daqui a <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"daqui a 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"daqui a <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"daqui a 1 hora"</item> - <item quantity="other" msgid="547290677353727389">"daqui a <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"amanhã"</item> - <item quantity="other" msgid="5109449375100953247">"daqui a <xliff:g id="COUNT">%d</xliff:g> dias"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Há 1 seg"</item> - <item quantity="other" msgid="3699169366650930415">"Há <xliff:g id="COUNT">%d</xliff:g> seg"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"há 1 min"</item> - <item quantity="other" msgid="851164968597150710">"Há <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Há 1 hora"</item> - <item quantity="other" msgid="6889970745748538901">"Há <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ontem"</item> - <item quantity="other" msgid="3453342639616481191">"Há <xliff:g id="COUNT">%d</xliff:g> dias"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"daqui a 1 seg"</item> - <item quantity="other" msgid="5495880108825805108">"daqui a <xliff:g id="COUNT">%d</xliff:g> seg"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"daqui a 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"daqui a <xliff:g id="COUNT">%d</xliff:g> min"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"daqui a 1 hora"</item> - <item quantity="other" msgid="3705373766798013406">"em <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"amanhã"</item> - <item quantity="other" msgid="2973062968038355991">"daqui a <xliff:g id="COUNT">%d</xliff:g> dias"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"a <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"às <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"em <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 4ea2f18..f65b088 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> quer ativar a exploração pelo toque. Com ela, você pode ouvir ou ver descrições do que está sob seu dedo e interagir com o telefone através de gestos."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 mês atrás"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Antes de 1 mês atrás"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 segundo atrás"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> segundos atrás"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minuto atrás"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> minutos atrás"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 hora atrás"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> horas atrás"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Mês passado"</string> <string name="older" msgid="5211975022815554840">"Mais antigos"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ontem"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> dias atrás"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"em 1 segundo"</item> - <item quantity="other" msgid="1241926116443974687">"em <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"em 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"em <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"em 1 hora"</item> - <item quantity="other" msgid="547290677353727389">"Em <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"amanhã"</item> - <item quantity="other" msgid="5109449375100953247">"em <xliff:g id="COUNT">%d</xliff:g> dias"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 seg. atrás"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> segundos atrás"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 minuto atrás"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> minutos atrás"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 hora atrás"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> horas atrás"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ontem"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> dias atrás"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"em 1 segundo"</item> - <item quantity="other" msgid="5495880108825805108">"em <xliff:g id="COUNT">%d</xliff:g> segundos"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"em 1 minuto"</item> - <item quantity="other" msgid="4216113292706568726">"em <xliff:g id="COUNT">%d</xliff:g> minutos"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"em 1 hora"</item> - <item quantity="other" msgid="3705373766798013406">"em <xliff:g id="COUNT">%d</xliff:g> horas"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"amanhã"</item> - <item quantity="other" msgid="2973062968038355991">"em <xliff:g id="COUNT">%d</xliff:g> dias"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"em <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"às <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"em <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 29bd05e..018d3b0 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> doreşte să activeze funcţia Exploraţi prin atingere. Când această funcţie este activată, puteţi auzi sau vedea descrieri pentru ceea ce se află sub degetul dvs. sau puteţi efectua gesturi pentru a interacţiona cu telefonul."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"cu 1 lună în urmă"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Cu mai mult de 1 lună în urmă"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"cu 1 secundă în urmă"</item> - <item quantity="other" msgid="3903706804349556379">"cu <xliff:g id="COUNT">%d</xliff:g> (de) secunde în urmă"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"cu 1 minut în urmă"</item> - <item quantity="other" msgid="2176942008915455116">"cu <xliff:g id="COUNT">%d</xliff:g> (de) minute în urmă"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"cu 1 oră în urmă"</item> - <item quantity="other" msgid="2467273239587587569">"cu <xliff:g id="COUNT">%d</xliff:g> (de) ore în urmă"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Luna trecută"</string> <string name="older" msgid="5211975022815554840">"Mai vechi"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ieri"</item> - <item quantity="other" msgid="2479586466153314633">"cu <xliff:g id="COUNT">%d</xliff:g> (de) zile în urmă"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"într-o secundă"</item> - <item quantity="other" msgid="1241926116443974687">"în <xliff:g id="COUNT">%d</xliff:g> (de) secunde"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"în 1 minut"</item> - <item quantity="other" msgid="3330713936399448749">"în <xliff:g id="COUNT">%d</xliff:g> (de) minute"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"în 1 oră"</item> - <item quantity="other" msgid="547290677353727389">"în <xliff:g id="COUNT">%d</xliff:g> (de) ore"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"mâine"</item> - <item quantity="other" msgid="5109449375100953247">"în <xliff:g id="COUNT">%d</xliff:g> (de) zile"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"cu 1 sec. în urmă"</item> - <item quantity="other" msgid="3699169366650930415">"cu <xliff:g id="COUNT">%d</xliff:g> (de) secunde în urmă"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"cu 1 min. în urmă"</item> - <item quantity="other" msgid="851164968597150710">"cu <xliff:g id="COUNT">%d</xliff:g> (de) min. în urmă"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"cu 1 oră în urmă"</item> - <item quantity="other" msgid="6889970745748538901">"cu <xliff:g id="COUNT">%d</xliff:g> (de) ore în urmă"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ieri"</item> - <item quantity="other" msgid="3453342639616481191">"cu <xliff:g id="COUNT">%d</xliff:g> (de) zile în urmă"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"în 1 sec."</item> - <item quantity="other" msgid="5495880108825805108">"în <xliff:g id="COUNT">%d</xliff:g> (de) sec."</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"în 1 min."</item> - <item quantity="other" msgid="4216113292706568726">"în <xliff:g id="COUNT">%d</xliff:g> (de) min."</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"în 1 oră"</item> - <item quantity="other" msgid="3705373766798013406">"în <xliff:g id="COUNT">%d</xliff:g> (de) ore"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"mâine"</item> - <item quantity="other" msgid="2973062968038355991">"în <xliff:g id="COUNT">%d</xliff:g> (de) zile"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"pe <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"la <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"în <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index a7882b8..c613d55 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> хочет включить функцию \"Аудиоподсказки\". Она позволяет прослушивать или просматривать описание элементов, которых вы касаетесь, и управлять телефоном с помощью жестов."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 месяц назад"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Более месяца назад"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 секунду назад"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> с. назад"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 минуту назад"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> мин. назад"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 час назад"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ч. назад"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Прошлый месяц"</string> <string name="older" msgid="5211975022815554840">"Еще раньше"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"вчера"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> дн. назад"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"через 1 секунду"</item> - <item quantity="other" msgid="1241926116443974687">"через <xliff:g id="COUNT">%d</xliff:g> с."</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"через 1 минуту"</item> - <item quantity="other" msgid="3330713936399448749">"через <xliff:g id="COUNT">%d</xliff:g> мин."</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"через 1 час"</item> - <item quantity="other" msgid="547290677353727389">"через <xliff:g id="COUNT">%d</xliff:g> ч."</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"завтра"</item> - <item quantity="other" msgid="5109449375100953247">"через <xliff:g id="COUNT">%d</xliff:g> дн."</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 сек. назад"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> сек. назад"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 мин. назад"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> мин. назад"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 час назад"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ч. назад"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"вчера"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> дн. назад"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"через 1 с."</item> - <item quantity="other" msgid="5495880108825805108">"через <xliff:g id="COUNT">%d</xliff:g> с."</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"через 1 мин."</item> - <item quantity="other" msgid="4216113292706568726">"через <xliff:g id="COUNT">%d</xliff:g> мин."</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"через 1 час"</item> - <item quantity="other" msgid="3705373766798013406">"через <xliff:g id="COUNT">%d</xliff:g> ч."</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"завтра"</item> - <item quantity="other" msgid="2973062968038355991">"через <xliff:g id="COUNT">%d</xliff:g> дн."</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"в <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"в <xliff:g id="YEAR">%s</xliff:g> г."</string> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index b7ccd99..af55f75 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -1133,73 +1133,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"ස්පර්ශය වෙතින් ගවේෂණය සක්රිය කිරීමට <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ට අවශ්යයි. ස්පර්ශය වෙතින් ගවේෂණය සක්රිය විට, ඔබගේ ඇඟිලිවලට පහළ විස්තර ඇසිය හෝ බැලිය හැක හෝ දුරකථනය සමග අන්තර් ක්රියාකාරී වීමට ඉංගිති සිදු කළ හැක."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"මාස 1 කට පෙර"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"මාස 1 කට පෙර"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"තත්පර 1 කට පෙර"</item> - <item quantity="other" msgid="3903706804349556379">"තත්පර <xliff:g id="COUNT">%d</xliff:g> ට පෙර"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"මිනිත්තු 1 ට පෙර"</item> - <item quantity="other" msgid="2176942008915455116">"මිනිත්තු <xliff:g id="COUNT">%d</xliff:g> කට පෙර"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"පැය 1 කට පෙර"</item> - <item quantity="other" msgid="2467273239587587569">"පැය <xliff:g id="COUNT">%d</xliff:g> කට පෙර"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"අවසාන මාසය"</string> <string name="older" msgid="5211975022815554840">"පරණ"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"ඊයේ"</item> - <item quantity="other" msgid="2479586466153314633">"දින <xliff:g id="COUNT">%d</xliff:g> කට පෙර"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"තත්පර 1 කින්"</item> - <item quantity="other" msgid="1241926116443974687">"තත්පර <xliff:g id="COUNT">%d</xliff:g> කදී"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"මිනිත්තු 1 කදී"</item> - <item quantity="other" msgid="3330713936399448749">"මිනිත්තු <xliff:g id="COUNT">%d</xliff:g> ක් තුළ"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"පැය 1 ක් තුළ"</item> - <item quantity="other" msgid="547290677353727389">"පැය <xliff:g id="COUNT">%d</xliff:g> ක් තුළ"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"හෙට"</item> - <item quantity="other" msgid="5109449375100953247">"දින <xliff:g id="COUNT">%d</xliff:g> ක් තුළ"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"තත්පර 1 කට පෙර"</item> - <item quantity="other" msgid="3699169366650930415">"තත්පර <xliff:g id="COUNT">%d</xliff:g> කට පෙර"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"මිනිත්තු 1 කට පෙර"</item> - <item quantity="other" msgid="851164968597150710">"මිනිත්තු <xliff:g id="COUNT">%d</xliff:g> ට පෙර"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"පැය 1 කට පෙර"</item> - <item quantity="other" msgid="6889970745748538901">"පැය <xliff:g id="COUNT">%d</xliff:g> ට පෙර"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"ඊයේ"</item> - <item quantity="other" msgid="3453342639616481191">"දින <xliff:g id="COUNT">%d</xliff:g> ට පෙර"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"තත්පර 1 ක් තුළ"</item> - <item quantity="other" msgid="5495880108825805108">"තත්පර <xliff:g id="COUNT">%d</xliff:g> ක් තුළ"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"මිනිත්තු 1 ක් තුළ"</item> - <item quantity="other" msgid="4216113292706568726">"මිනිත්තු <xliff:g id="COUNT">%d</xliff:g> ක් තුළ"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"පැය 1 ක් තුළ"</item> - <item quantity="other" msgid="3705373766798013406">"පැය <xliff:g id="COUNT">%d</xliff:g> ක් තුළ"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"හෙට"</item> - <item quantity="other" msgid="2973062968038355991">"දින <xliff:g id="COUNT">%d</xliff:g> ක් තුළ"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> වන දා"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> ට"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> තුළ"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 2a73770..312791b 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"Služba <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> požaduje povolenie funkcie Preskúmanie dotykom. Ak je funkcia Preskúmanie dotykom zapnutá, môžete počuť alebo vidieť popisy objektov pod vaším prstom alebo ovládať telefón gestami."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"pred 1 mesiacom"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Viac ako pred 1 mesiacom"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"pred 1 sekundou"</item> - <item quantity="other" msgid="3903706804349556379">"pred <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Pred minútou"</item> - <item quantity="other" msgid="2176942008915455116">"pred <xliff:g id="COUNT">%d</xliff:g> minútami"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"pred 1 hodinou"</item> - <item quantity="other" msgid="2467273239587587569">"pred <xliff:g id="COUNT">%d</xliff:g> hodinami"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Minulý mesiac"</string> <string name="older" msgid="5211975022815554840">"Staršie"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"včera"</item> - <item quantity="other" msgid="2479586466153314633">"pred <xliff:g id="COUNT">%d</xliff:g> dňami"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"o 1 sekundu"</item> - <item quantity="other" msgid="1241926116443974687">"o <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"o 1 minútu"</item> - <item quantity="other" msgid="3330713936399448749">"o <xliff:g id="COUNT">%d</xliff:g> minút"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"o 1 hodinu"</item> - <item quantity="other" msgid="547290677353727389">"o <xliff:g id="COUNT">%d</xliff:g> hodín"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"zajtra"</item> - <item quantity="other" msgid="5109449375100953247">"o <xliff:g id="COUNT">%d</xliff:g> dní"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"pred 1 s"</item> - <item quantity="other" msgid="3699169366650930415">"pred <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"pred 1 min."</item> - <item quantity="other" msgid="851164968597150710">"pred <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"pred 1 hodinou"</item> - <item quantity="other" msgid="6889970745748538901">"pred <xliff:g id="COUNT">%d</xliff:g> hodinami"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"včera"</item> - <item quantity="other" msgid="3453342639616481191">"pred <xliff:g id="COUNT">%d</xliff:g> dňami"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"o 1 s"</item> - <item quantity="other" msgid="5495880108825805108">"o <xliff:g id="COUNT">%d</xliff:g> s"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"o 1 min."</item> - <item quantity="other" msgid="4216113292706568726">"o <xliff:g id="COUNT">%d</xliff:g> min."</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"o 1 hodinu"</item> - <item quantity="other" msgid="3705373766798013406">"o <xliff:g id="COUNT">%d</xliff:g> hodín"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"zajtra"</item> - <item quantity="other" msgid="2973062968038355991">"o <xliff:g id="COUNT">%d</xliff:g> dní"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"dňa <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"o <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"z <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index bc8a851..df365fd 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"Storitev <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> želi omogočiti raziskovanje z dotikom. Ko je raziskovanje z dotikom vklopljeno, lahko slišite ali vidite opise tega, kar je pod vašim prstom, ali izvajate poteze za interakcijo s telefonom."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Pred 1 mesecem"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Pred več kot 1 mesecem"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Pred 1 sekundo"</item> - <item quantity="other" msgid="3903706804349556379">"pred toliko sekundami: <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"pred 1 minuto"</item> - <item quantity="other" msgid="2176942008915455116">"Pred <xliff:g id="COUNT">%d</xliff:g> minutami"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"pred 1 uro"</item> - <item quantity="other" msgid="2467273239587587569">"Pred <xliff:g id="COUNT">%d</xliff:g> urami"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Pretekli mesec"</string> <string name="older" msgid="5211975022815554840">"Starejše"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"včeraj"</item> - <item quantity="other" msgid="2479586466153314633">"Pred <xliff:g id="COUNT">%d</xliff:g> dnevi"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"čez 1 sekundo"</item> - <item quantity="other" msgid="1241926116443974687">"Čez <xliff:g id="COUNT">%d</xliff:g> sekund"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"čez 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"Čez toliko minut: <xliff:g id="COUNT">%d</xliff:g>."</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"čez 1 uro"</item> - <item quantity="other" msgid="547290677353727389">"čez <xliff:g id="COUNT">%d</xliff:g> ur"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"jutri"</item> - <item quantity="other" msgid="5109449375100953247">"čez <xliff:g id="COUNT">%d</xliff:g> dni"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"pred 1 sekundo"</item> - <item quantity="other" msgid="3699169366650930415">"Pred toliko sekundami: <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"pred 1 minuto"</item> - <item quantity="other" msgid="851164968597150710">"Pred <xliff:g id="COUNT">%d</xliff:g> minutami"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"pred 1 uro"</item> - <item quantity="other" msgid="6889970745748538901">"Pred <xliff:g id="COUNT">%d</xliff:g> urami"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"včeraj"</item> - <item quantity="other" msgid="3453342639616481191">"Pred <xliff:g id="COUNT">%d</xliff:g> dnevi"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"čez 1 sekundo"</item> - <item quantity="other" msgid="5495880108825805108">"čez toliko sekund: <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"čez 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"čez <xliff:g id="COUNT">%d</xliff:g> minut"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"čez 1 uro"</item> - <item quantity="other" msgid="3705373766798013406">"čez <xliff:g id="COUNT">%d</xliff:g> ur"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"jutri"</item> - <item quantity="other" msgid="2973062968038355991">"čez <xliff:g id="COUNT">%d</xliff:g> dni"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"vsak <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"ob <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"leta <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 6d1e793..8277f33 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> жели да омогући Истраживање додиром. Када је Истраживање додиром укључено, можете да чујете или видите описе ставке на коју сте ставили прст или да комуницирате са телефоном помоћу покрета."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Пре месец дана"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Пре месец дана"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Пре 1 секунде"</item> - <item quantity="other" msgid="3903706804349556379">"пре <xliff:g id="COUNT">%d</xliff:g> секунде(и)"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Пре једног минута"</item> - <item quantity="other" msgid="2176942008915455116">"пре <xliff:g id="COUNT">%d</xliff:g> минута"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Пре сат времена"</item> - <item quantity="other" msgid="2467273239587587569">"пре <xliff:g id="COUNT">%d</xliff:g> сата(и)"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Прошлог месеца"</string> <string name="older" msgid="5211975022815554840">"Старије"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"јуче"</item> - <item quantity="other" msgid="2479586466153314633">"пре <xliff:g id="COUNT">%d</xliff:g> дана"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"за 1 секунду"</item> - <item quantity="other" msgid="1241926116443974687">"за <xliff:g id="COUNT">%d</xliff:g> секунде(и)"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"за 1 минут"</item> - <item quantity="other" msgid="3330713936399448749">"за <xliff:g id="COUNT">%d</xliff:g> минута"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"за 1 сат"</item> - <item quantity="other" msgid="547290677353727389">"за <xliff:g id="COUNT">%d</xliff:g> сата(и)"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"сутра"</item> - <item quantity="other" msgid="5109449375100953247">"за <xliff:g id="COUNT">%d</xliff:g> дана"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Пре једне сек"</item> - <item quantity="other" msgid="3699169366650930415">"пре <xliff:g id="COUNT">%d</xliff:g> сек"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"Пре један мин"</item> - <item quantity="other" msgid="851164968597150710">"пре <xliff:g id="COUNT">%d</xliff:g> мин"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Пре сат времена"</item> - <item quantity="other" msgid="6889970745748538901">"пре <xliff:g id="COUNT">%d</xliff:g> сата(и)"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"јуче"</item> - <item quantity="other" msgid="3453342639616481191">"пре <xliff:g id="COUNT">%d</xliff:g> дана"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"за 1 сек"</item> - <item quantity="other" msgid="5495880108825805108">"за <xliff:g id="COUNT">%d</xliff:g> сек"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"за 1 мин"</item> - <item quantity="other" msgid="4216113292706568726">"за <xliff:g id="COUNT">%d</xliff:g> мин"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"за 1 сат"</item> - <item quantity="other" msgid="3705373766798013406">"за <xliff:g id="COUNT">%d</xliff:g> сата(и)"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"сутра"</item> - <item quantity="other" msgid="2973062968038355991">"за <xliff:g id="COUNT">%d</xliff:g> дана"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"дана <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"у <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"у <xliff:g id="YEAR">%s</xliff:g>."</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 61b0a3d..f31ba4d 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vill aktivera Explore by Touch. När funktionen är aktiv kan du höra eller se beskrivningar av vad du har under fingret eller utföra gester för att göra saker med telefonen."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"för 1 månad sedan"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"För mer än en månad sedan"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"för 1 sekund sedan"</item> - <item quantity="other" msgid="3903706804349556379">"för <xliff:g id="COUNT">%d</xliff:g> sekunder sedan"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"för 1 minut sedan"</item> - <item quantity="other" msgid="2176942008915455116">"för <xliff:g id="COUNT">%d</xliff:g> minuter sedan"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"för 1 timme sedan"</item> - <item quantity="other" msgid="2467273239587587569">"för <xliff:g id="COUNT">%d</xliff:g> timmar sedan"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Föregående månad"</string> <string name="older" msgid="5211975022815554840">"Äldre"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"igår"</item> - <item quantity="other" msgid="2479586466153314633">"för <xliff:g id="COUNT">%d</xliff:g> dagar sedan"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"om 1 sekund"</item> - <item quantity="other" msgid="1241926116443974687">"om <xliff:g id="COUNT">%d</xliff:g> sekunder"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"om 1 minut"</item> - <item quantity="other" msgid="3330713936399448749">"om <xliff:g id="COUNT">%d</xliff:g> minuter"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"om 1 timme"</item> - <item quantity="other" msgid="547290677353727389">"om <xliff:g id="COUNT">%d</xliff:g> timmar"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"imorgon"</item> - <item quantity="other" msgid="5109449375100953247">"om <xliff:g id="COUNT">%d</xliff:g> dagar"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"för 1 sek sedan"</item> - <item quantity="other" msgid="3699169366650930415">"för <xliff:g id="COUNT">%d</xliff:g> sekunder sedan"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"för 1 minut sedan"</item> - <item quantity="other" msgid="851164968597150710">"för <xliff:g id="COUNT">%d</xliff:g> minuter sedan"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"för 1 timme sedan"</item> - <item quantity="other" msgid="6889970745748538901">"för <xliff:g id="COUNT">%d</xliff:g> timmar sedan"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"igår"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> dagar sedan"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"om 1 sekund"</item> - <item quantity="other" msgid="5495880108825805108">"om <xliff:g id="COUNT">%d</xliff:g> sek"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"om 1 minut"</item> - <item quantity="other" msgid="4216113292706568726">"om <xliff:g id="COUNT">%d</xliff:g> minuter"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"om 1 timme"</item> - <item quantity="other" msgid="3705373766798013406">"om <xliff:g id="COUNT">%d</xliff:g> timmar"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"imorgon"</item> - <item quantity="other" msgid="2973062968038355991">"om <xliff:g id="COUNT">%d</xliff:g> dagar"</item> - </plurals> <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">"<xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 9a97e24..5e57cc1 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> inataka kuwezesha Kuchunguza kwa Kugusa. Wakati Kuchunguza kwa Kugusa kumewezeshwa, unaweza kusikia au kuona maelezo ya kilicho chini ya kidole chako au kutumia ishara ili kuingiliana na simu."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Mwezi 1 uliopita"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Kabla ya mwezi 1 uliopita"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Sekunde 1 iliopita"</item> - <item quantity="other" msgid="3903706804349556379">"sekunde <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"Dakika 1 iliyopita"</item> - <item quantity="other" msgid="2176942008915455116">"Dakika <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"Saa 1 iliyopita"</item> - <item quantity="other" msgid="2467273239587587569">"Saa <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Mwezi uliopita"</string> <string name="older" msgid="5211975022815554840">"Kuukuu zaidi"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"jana"</item> - <item quantity="other" msgid="2479586466153314633">"siku <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"kati ya sekunde 1"</item> - <item quantity="other" msgid="1241926116443974687">"kati ya sekunde <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"kati ya dakika 1"</item> - <item quantity="other" msgid="3330713936399448749">"baada ya dakika <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"kati ya saa 1"</item> - <item quantity="other" msgid="547290677353727389">"kati ya saa <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"kesho"</item> - <item quantity="other" msgid="5109449375100953247">"katika siku <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"Sekunde 1 iliyopita"</item> - <item quantity="other" msgid="3699169366650930415">"Sekunde <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"Dakika 1 iliyopita"</item> - <item quantity="other" msgid="851164968597150710">"Dakika <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"Saa 1 iliyopita"</item> - <item quantity="other" msgid="6889970745748538901">"Saa <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"jana"</item> - <item quantity="other" msgid="3453342639616481191">"siku <xliff:g id="COUNT">%d</xliff:g> zilizopita"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"kati ya sekunde 1"</item> - <item quantity="other" msgid="5495880108825805108">"kati ya sekunde <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"baada ya dakika 1"</item> - <item quantity="other" msgid="4216113292706568726">"kati ya dakika<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"kati ya saa 1"</item> - <item quantity="other" msgid="3705373766798013406">"katika saa <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"kesho"</item> - <item quantity="other" msgid="2973062968038355991">"kati ya siku <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"tarehe <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"Saa <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"ndani ya <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index 03ffc98..14a0e67 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"தொடுவதன் மூலம் அறிக என்பதை இயக்க <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> விரும்புகிறது. தொடுவதன் மூலம் அறிக என்பது இயக்கப்பட்டிருக்கும்போது, உங்கள் விரலுக்கு அடியில் இருப்பவையின் விளக்கங்களை நீங்கள் கேட்கவோ, பார்க்கவோ செய்யலாம் அல்லது மொபைலுடன் ஊடாட சைகைகளை மேற்கொள்ளலாம்."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 மாதத்திற்கு முன்பு"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 மாதத்திற்கு முன்பு"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 வினாடிக்கு முன்பு"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> வினாடிகளுக்கு முன்பு"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 நிமிடம் முன்பு"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> நிமிடத்திற்கு முன்"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 மணிநேரம் முன்பு"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> மணிநேரத்திற்கு முன்பு"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"சென்ற மாதம்"</string> <string name="older" msgid="5211975022815554840">"பழையது"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"நேற்று"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> நாட்களுக்கு முன்பு"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 வினாடியில்"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> வினாடிகளில்"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 நிமிடத்தில்"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> நிமிடங்களில்"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 மணிநேரத்தில்"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> மணிநேரத்தில்"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"நாளை"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> நாட்களில்"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 வினாடி முன்பு"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> வினாடிகளுக்கு முன்பு"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 நிமிடம் முன்பு"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> நிமிடத்திற்கு முன்"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 மணிநேரம் முன்பு"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> மணிநேரத்திற்கு முன்பு"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"நேற்று"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> நாட்களுக்கு முன்பு"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 வினாடியில்"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> வினாடிகளில்"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 நிமிடத்தில்"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> நிமிடங்களில்"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 மணிநேரத்தில்"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> மணிநேரத்தில்"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"நாளை"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> நாட்களில்"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> அன்று"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g> இல்"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> இல்"</string> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index 2c80adb..72df68b 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> తాకడం ద్వారా విశ్లేషణను ప్రారంభించాలనుకుంటోంది. తాకడం ద్వారా విశ్లేషణ ఆన్ చేయబడినప్పుడు, మీరు మీ వేలి క్రింద ఉన్నవాటి యొక్క వివరణలను వినవచ్చు లేదా చూడవచ్చు లేదా ఫోన్తో పరస్పర చర్య చేయడానికి సంజ్ఞలు చేయవచ్చు."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 నెల క్రితం"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 నెలకు ముందు"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 సెకను క్రితం"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> సెకన్ల క్రితం"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 నిమిషం క్రితం"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> నిమిషాల క్రితం"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 గంట క్రితం"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> గంటల క్రితం"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"గత నెల"</string> <string name="older" msgid="5211975022815554840">"పాతది"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"నిన్న"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> రోజుల క్రితం"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 సెకనులో"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> సెకన్లలో"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 నిమిషంలో"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> నిమిషాల్లో"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 గంటలో"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> గంటల్లో"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"రేపు"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> రోజుల్లో"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 సెక క్రితం"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> సెక క్రితం"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 నిమి క్రితం"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> నిమి క్రితం"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 గంట క్రితం"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> గంటల క్రితం"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"నిన్న"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> రోజుల క్రితం"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 సెకనులో"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> సెకన్లలో"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 నిమిషంలో"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> నిమిషాల్లో"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 గంటలో"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> గంటల్లో"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"రేపు"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> రోజుల్లో"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>న"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>కి"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>లో"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index bb972e4..eaf0827 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ต้องการเปิดใช้งาน \"สำรวจโดยการแตะ\" เมื่อเปิดใช้งานแล้ว คุณสามารถฟังหรือดูคำอธิบายของสิ่งที่อยู่ใต้นิ้วของคุณ หรือใช้ท่าทางสัมผัสต่างๆ เพื่อโต้ตอบกับโทรศัพท์ได้"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 เดือนที่ผ่านมา"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"ก่อน 1 เดือนที่แล้ว"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 วินาทีที่แล้ว"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> วินาทีที่แล้ว"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 นาทีที่ผ่านมา"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> นาทีที่ผ่านมา"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 ชั่วโมงที่ผ่านมา"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> ชั่วโมงที่ผ่านมา"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"เดือนที่แล้ว"</string> <string name="older" msgid="5211975022815554840">"เก่ากว่า"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"เมื่อวาน"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> วันที่ผ่านมา"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"ใน 1 วินาที"</item> - <item quantity="other" msgid="1241926116443974687">"ใน <xliff:g id="COUNT">%d</xliff:g> วินาที"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"ใน 1 นาที"</item> - <item quantity="other" msgid="3330713936399448749">"ใน <xliff:g id="COUNT">%d</xliff:g> นาที"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"ใน 1 ชั่วโมง"</item> - <item quantity="other" msgid="547290677353727389">"ใน <xliff:g id="COUNT">%d</xliff:g> ชั่วโมง"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"พรุ่งนี้"</item> - <item quantity="other" msgid="5109449375100953247">"ใน <xliff:g id="COUNT">%d</xliff:g> วัน"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 วินาทีที่แล้ว"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> วินาทีที่ผ่านมา"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 นาทีที่ผ่านมา"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> นาทีที่ผ่านมา"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 ชั่วโมงที่ผ่านมา"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> ชั่วโมงที่ผ่านมา"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"เมื่อวาน"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> วันที่ผ่านมา"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"ใน 1 วินาที"</item> - <item quantity="other" msgid="5495880108825805108">"ใน <xliff:g id="COUNT">%d</xliff:g> วินาที"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"ใน 1 นาที"</item> - <item quantity="other" msgid="4216113292706568726">"ใน <xliff:g id="COUNT">%d</xliff:g> นาที"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"ใน 1 ชั่วโมง"</item> - <item quantity="other" msgid="3705373766798013406">"ใน <xliff:g id="COUNT">%d</xliff:g> ชั่วโมง"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"พรุ่งนี้"</item> - <item quantity="other" msgid="2973062968038355991">"ใน <xliff:g id="COUNT">%d</xliff:g> วัน"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"ในวันที่ <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"ที่ <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"ใน <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 97dda67..707402d 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"Nais paganahin ng <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ang Galugarin sa pamamagitan ng pagpindot. Kapag naka-on ang Galugarin sa pamamagitan ng pagpindot, maaari mong marinig o makita ang mga paglalarawan ng nasa ilalim ng iyong daliri o maaari kang magsagawa ng mga galaw upang makipag-ugnayan sa telepono."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 buwan ang nakalipas"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Bago ang nakalipas na 1 buwan"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 segundo ang nakakalipas"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> (na) segundo ang nakalipas"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 minuto ang nakalipas"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> (na) minuto ang nakalipas"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 oras ang nakalipas"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> (na) oras ang nakalipas"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Nakaraang buwan"</string> <string name="older" msgid="5211975022815554840">"Mas luma"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"kahapon"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> (na) araw ang nakalipas"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"sa 1 segundo"</item> - <item quantity="other" msgid="1241926116443974687">"sa <xliff:g id="COUNT">%d</xliff:g> (na) segundo"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"sa 1 minuto"</item> - <item quantity="other" msgid="3330713936399448749">"sa <xliff:g id="COUNT">%d</xliff:g> (na) minuto"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"sa 1 oras"</item> - <item quantity="other" msgid="547290677353727389">"sa <xliff:g id="COUNT">%d</xliff:g> (na) oras"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"bukas"</item> - <item quantity="other" msgid="5109449375100953247">"sa <xliff:g id="COUNT">%d</xliff:g> (na) araw"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 segundo ang nakalipas"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> (na) segundo ang nakalipas"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 minuto ang nakalipas"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> (na) minuto ang nakalipas"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 oras ang nakalipas"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> (na) oras ang nakalipas"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"kahapon"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> (na) araw ang nakalipas"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"sa 1 seg"</item> - <item quantity="other" msgid="5495880108825805108">"sa <xliff:g id="COUNT">%d</xliff:g> (na) segundo"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"sa 1 min"</item> - <item quantity="other" msgid="4216113292706568726">"sa <xliff:g id="COUNT">%d</xliff:g> (na) minuto"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"sa 1 oras"</item> - <item quantity="other" msgid="3705373766798013406">"sa <xliff:g id="COUNT">%d</xliff:g> (na) oras"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"bukas"</item> - <item quantity="other" msgid="2973062968038355991">"sa <xliff:g id="COUNT">%d</xliff:g> (na) araw"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"sa <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"nang <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"sa <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index c0fd411..36f6f8f 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>, Dokunarak Keşfet özelliğini etkinleştirmek istiyor. Dokunarak Keşfet açık olduğunda parmağınızın altındaki öğelere ait açıklamaları duyabilir veya görebilir ya da telefonla etkileşimde bulunmak için birtakım hareketler yapabilirsiniz."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 ay önce"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 ay önce"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 saniye önce"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> saniye önce"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 dakika önce"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> dakika önce"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 saat önce"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> saat önce"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Son ay"</string> <string name="older" msgid="5211975022815554840">"Daha eski"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"dün"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> gün önce"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 saniye içinde"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> saniye içinde"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 dakika içinde"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> dakika içinde"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 saat içinde"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> saat içinde"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"yarın"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> gün içinde"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 saniye önce"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> saniye önce"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 dak. önce"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> dakika önce"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 saat önce"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> saat önce"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"dün"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> gün önce"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 san. içinde"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> saniye içinde"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 dak. içinde"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> dakika içinde"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 saat içinde"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> saat içinde"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"yarın"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> gün içinde"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> tarihinde"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> yılında"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 664976a..1768942 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> хоче ввімкнути функцію дослідження дотиком. Увімкнувши функцію дослідження дотиком, можна чути або бачити опис елемента, розташованого під вашим пальцем, або виконувати жести для взаємодії з телефоном."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 міс. тому"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Раніше 1 місяця тому"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 сек. тому"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> сек. тому"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 хвилину тому"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> хв. тому"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 год. тому"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> год. тому"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Останній міс."</string> <string name="older" msgid="5211975022815554840">"Давніше"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"учора"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> дн. тому"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"через 1 сек."</item> - <item quantity="other" msgid="1241926116443974687">"через <xliff:g id="COUNT">%d</xliff:g> сек."</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"через 1 хв."</item> - <item quantity="other" msgid="3330713936399448749">"через <xliff:g id="COUNT">%d</xliff:g> хв."</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"через 1 год."</item> - <item quantity="other" msgid="547290677353727389">"через <xliff:g id="COUNT">%d</xliff:g> год."</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"завтра"</item> - <item quantity="other" msgid="5109449375100953247">"через <xliff:g id="COUNT">%d</xliff:g> дн."</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 сек. тому"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> сек. тому"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 хв. тому"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> хв. тому"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 годину тому"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> год. тому"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"учора"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> дн. тому"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"через 1 с."</item> - <item quantity="other" msgid="5495880108825805108">"через <xliff:g id="COUNT">%d</xliff:g> сек."</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"через 1 хв."</item> - <item quantity="other" msgid="4216113292706568726">"через <xliff:g id="COUNT">%d</xliff:g> хв."</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"через 1 год."</item> - <item quantity="other" msgid="3705373766798013406">"через <xliff:g id="COUNT">%d</xliff:g> год."</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"завтра"</item> - <item quantity="other" msgid="2973062968038355991">"через <xliff:g id="COUNT">%d</xliff:g> дн."</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"о <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"у <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index 76cfe76..feecb77 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ٹچ کرکے دریافت کریں کو فعال کرنا چاہتی ہے۔ ٹچ کرکے دریافت کریں کے آن ہو جانے پر، آپ کو اپنی انگلی کے نیچے موجود چیزوں کی تفصیلات دکھائی یا سنائی دے سکتی ہیں یا آپ فون کے ساتھ تعامل کرنے کیلئے اشارے انجام دے سکتے ہیں۔"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 مہینہ پہلے"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 مہینہ سے زیادہ پہلے"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 سیکنڈ پہلے"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> سیکنڈ پہلے"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 منٹ پہلے"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> منٹ پہلے"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 گھنٹہ پہلے"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> گھنٹے پہلے"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"پچھلے مہینے"</string> <string name="older" msgid="5211975022815554840">"پرانا"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"گزشتہ کل"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> دن پہلے"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 سیکنڈ میں"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> سیکنڈ میں"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 منٹ میں"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> منٹ میں"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 گھنٹہ میں"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> گھنٹے میں"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"آنے والا کل"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> دن میں"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 سیکنڈ پہلے"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> سیکنڈ پہلے"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 منٹ پہلے"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> منٹ پہلے"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 گھنٹہ پہلے"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> گھنٹے پہلے"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"گزشتہ کل"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> دن پہلے"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 سیکنڈ میں"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> سیکنڈ میں"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 منٹ میں"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> منٹ میں"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 گھنٹہ میں"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> گھنٹے میں"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"آنے والا کل"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> دن میں"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g> کو"</string> <string name="preposition_for_time" msgid="5506831244263083793">"بوقت <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g> میں"</string> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index 30164e1..721e9bc 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> teginib o‘rganish xususiyatini yoqishni xohlamoqda. Bu xususiyat yoqilganda, barmog‘ingiz ostidagi elementlar ta‘rifini ko‘rishingiz yoki eshitishingiz mumkin yoki telefon bilan o‘zaro bog‘lanish uchun barmog‘ingiz bilan imo-ishorali harakatlarni bajaring."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 oy oldin"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 oydan oldinroq"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 soniya oldin"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> soniya oldin"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 daqiqa oldin"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> daqiqa oldin"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 soat oldin"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> soat oldin"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"O‘tgan oy"</string> <string name="older" msgid="5211975022815554840">"Eskiroq"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"kecha"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> kun oldin"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 soniyada"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> soniyada"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 daqiqada"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> daqiqada"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 soatda"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> soatda"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ertaga"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> kunda"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 soniya oldin"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> soniya oldin"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 daq. oldin"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> daq. oldin"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 soat oldin"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> soat oldin"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"kecha"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> kun oldin"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 soniya da"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> soniya da"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 daq. da"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> daq. da"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 soatda"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> soatda"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ertaga"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> kunda"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>da"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>da"</string> <string name="preposition_for_year" msgid="5040395640711867177">"<xliff:g id="YEAR">%s</xliff:g>da"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 2bf3819..9f7118e 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> muốn bật Khám phá bằng cách chạm. Khi Khám phá bằng cách chạm được bật, bạn có thể nghe hoặc xem mô tả dưới ngón tay bạn hoặc thực hiện cử chỉ để tương tác với điện thoại."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 tháng trước"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Trước 1 tháng trước"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 giây trước"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> giây trước"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 phút trước"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> phút trước"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 giờ trước"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> giờ trước"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Tháng trước"</string> <string name="older" msgid="5211975022815554840">"Cũ hơn"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"hôm qua"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> ngày trước"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"trong 1 giây"</item> - <item quantity="other" msgid="1241926116443974687">"trong <xliff:g id="COUNT">%d</xliff:g> giây"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"trong 1 phút"</item> - <item quantity="other" msgid="3330713936399448749">"trong <xliff:g id="COUNT">%d</xliff:g> phút"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"trong 1 giờ"</item> - <item quantity="other" msgid="547290677353727389">"trong <xliff:g id="COUNT">%d</xliff:g> giờ"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"ngày mai"</item> - <item quantity="other" msgid="5109449375100953247">"trong <xliff:g id="COUNT">%d</xliff:g> ngày"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 giây trước"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> giây trước"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 phút trước"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> phút trước"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 giờ trước"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> giờ trước"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"hôm qua"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> ngày trước"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"trong 1 giây"</item> - <item quantity="other" msgid="5495880108825805108">"trong <xliff:g id="COUNT">%d</xliff:g> giây"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"trong 1 phút"</item> - <item quantity="other" msgid="4216113292706568726">"trong <xliff:g id="COUNT">%d</xliff:g> phút"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"trong 1 giờ"</item> - <item quantity="other" msgid="3705373766798013406">"trong <xliff:g id="COUNT">%d</xliff:g> giờ"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"ngày mai"</item> - <item quantity="other" msgid="2973062968038355991">"trong <xliff:g id="COUNT">%d</xliff:g> ngày"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"vào <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"vào lúc <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"trong <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index e280503..4d8db93 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>想要启用“触摸浏览”。“触摸浏览”启用后，您可以听到或看到所触摸内容的说明，还可以通过手势操作与手机互动。"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 个月前"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 个月前"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1秒前"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g>秒前"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1分钟前"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g>分钟前"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1小时前"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g>小时前"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"上个月"</string> <string name="older" msgid="5211975022815554840">"往前"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"昨天"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g>天前"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1秒后"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g>秒后"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1分钟后"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g>分钟后"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1小时后"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g>小时后"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"明天"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> 天后"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1秒前"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g>秒前"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1分钟前"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g>分钟前"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1小时前"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g>小时前"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"昨天"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g>天前"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1秒后"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g>秒后"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1分钟后"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g>分钟后"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1小时后"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g>小时后"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"明天"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> 天后"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"日期：<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"年份：<xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 83ae8f3..d08a416 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> 需要啟用「輕觸探索」。開啟這項功能時，系統會在您的手指輕觸螢幕上的物件時顯示或朗讀說明，您也可以執行手勢來與手機互動。"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 個月前"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 個月前"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 秒前"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> 秒前"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 分鐘前"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> 分鐘前"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 小時前"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> 小時前"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"上個月"</string> <string name="older" msgid="5211975022815554840">"較舊"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"昨天"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> 天前"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 秒後"</item> - <item quantity="other" msgid="1241926116443974687">"<xliff:g id="COUNT">%d</xliff:g> 秒後"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 分鐘後"</item> - <item quantity="other" msgid="3330713936399448749">"<xliff:g id="COUNT">%d</xliff:g> 分鐘後"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 小時後"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> 小時後"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"明天"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> 天後"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 秒前"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> 秒前"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 分鐘前"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> 分鐘前"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 小時前"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> 小時前"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"昨天"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> 天前"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 秒後"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> 秒後"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 分鐘後"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> 分鐘後"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 小時後"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> 小時後"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"明天"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> 天後"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"於 <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"在 <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"於 <xliff:g id="YEAR">%s</xliff:g> 年"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index c9e5364..24ccc9a 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> 需要啟用「輕觸探索」。開啟這項功能時，系統會在您的手指輕觸螢幕上的物件時顯示或朗讀說明，您也可以執行手勢來與手機互動。"</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 個月以前"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"1 個月前"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 秒以前"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> 秒前"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 分鐘以前"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> 分鐘前"</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 小時以前"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> 小時前"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"上個月"</string> <string name="older" msgid="5211975022815554840">"較舊"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"昨天"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> 天前"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"1 秒內"</item> - <item quantity="other" msgid="1241926116443974687">"在 <xliff:g id="COUNT">%d</xliff:g> 秒內"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"1 分鐘內"</item> - <item quantity="other" msgid="3330713936399448749">"在 <xliff:g id="COUNT">%d</xliff:g> 分鐘內"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"1 小時內"</item> - <item quantity="other" msgid="547290677353727389">"<xliff:g id="COUNT">%d</xliff:g> 小時內"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"明天"</item> - <item quantity="other" msgid="5109449375100953247">"<xliff:g id="COUNT">%d</xliff:g> 天內"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 秒以前"</item> - <item quantity="other" msgid="3699169366650930415">"<xliff:g id="COUNT">%d</xliff:g> 秒以前"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 分鐘以前"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> 分鐘以前"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 小時以前"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> 小時前"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"昨天"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> 天前"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"1 秒內"</item> - <item quantity="other" msgid="5495880108825805108">"<xliff:g id="COUNT">%d</xliff:g> 秒內"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"1 分鐘內"</item> - <item quantity="other" msgid="4216113292706568726">"<xliff:g id="COUNT">%d</xliff:g> 分鐘內"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"1 小時內"</item> - <item quantity="other" msgid="3705373766798013406">"<xliff:g id="COUNT">%d</xliff:g> 小時內"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"明天"</item> - <item quantity="other" msgid="2973062968038355991">"<xliff:g id="COUNT">%d</xliff:g> 天內"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"於 <xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"於<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"於 <xliff:g id="YEAR">%s</xliff:g> 年"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 77cfdde..881b544 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1131,73 +1131,9 @@ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"I-<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ifuna ukunika amandla i-Explore by Touch. Uma i-Explore by Touch ikhanya, ungezwa noma ubone izincazelo ezingaphansi komunwe wakho noma wenze izenzo zomzimba ukuze uxhumane nefoni."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"inyanga engu-1 edlule"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Ngaphambi kwenyanga engu-1 edlule"</string> - <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"1 isekhondi eledlule"</item> - <item quantity="other" msgid="3903706804349556379">"<xliff:g id="COUNT">%d</xliff:g> amasekhondi adlule"</item> - </plurals> - <plurals name="num_minutes_ago"> - <item quantity="one" msgid="3306787433088810191">"1 iminithi elidlule"</item> - <item quantity="other" msgid="2176942008915455116">"<xliff:g id="COUNT">%d</xliff:g> amaminithi adlule.."</item> - </plurals> - <plurals name="num_hours_ago"> - <item quantity="one" msgid="9150797944610821849">"1 ihora eledlule"</item> - <item quantity="other" msgid="2467273239587587569">"<xliff:g id="COUNT">%d</xliff:g> amahora adlule"</item> - </plurals> <!-- no translation found for last_num_days:one (7555846096746489821) --> <string name="last_month" msgid="3959346739979055432">"Inyanga edlule"</string> <string name="older" msgid="5211975022815554840">"Okudala kakhulu"</string> - <plurals name="num_days_ago"> - <item quantity="one" msgid="861358534398115820">"Izolo"</item> - <item quantity="other" msgid="2479586466153314633">"<xliff:g id="COUNT">%d</xliff:g> izinsuku ezedlule"</item> - </plurals> - <plurals name="in_num_seconds"> - <item quantity="one" msgid="2729745560954905102">"esekhondini elingu-1"</item> - <item quantity="other" msgid="1241926116443974687">"emasekhondini angu-<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="in_num_minutes"> - <item quantity="one" msgid="8793095251325200395">"eminithini engu-1"</item> - <item quantity="other" msgid="3330713936399448749">"emaminithini angu-<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="in_num_hours"> - <item quantity="one" msgid="7164353342477769999">"ehoreni elingu-1"</item> - <item quantity="other" msgid="547290677353727389">"emahoreni angu- <xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="in_num_days"> - <item quantity="one" msgid="5413088743009839518">"Kusasa"</item> - <item quantity="other" msgid="5109449375100953247">"ezinsukwini ezingu-<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one" msgid="1849036840200069118">"1 isekhondi edlule"</item> - <item quantity="other" msgid="3699169366650930415">"amasekhondi angu-<xliff:g id="COUNT">%d</xliff:g> edlule"</item> - </plurals> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one" msgid="6361490147113871545">"1 iminithi eledlule"</item> - <item quantity="other" msgid="851164968597150710">"<xliff:g id="COUNT">%d</xliff:g> amaminithi adlule"</item> - </plurals> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one" msgid="4796212039724722116">"1 ihora eledlule"</item> - <item quantity="other" msgid="6889970745748538901">"<xliff:g id="COUNT">%d</xliff:g> amahora adlule"</item> - </plurals> - <plurals name="abbrev_num_days_ago"> - <item quantity="one" msgid="8463161711492680309">"Izolo"</item> - <item quantity="other" msgid="3453342639616481191">"<xliff:g id="COUNT">%d</xliff:g> izinsuku ezedlule"</item> - </plurals> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one" msgid="5842225370795066299">"esekhondini elingu-1"</item> - <item quantity="other" msgid="5495880108825805108">"emasekhondini angu-<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one" msgid="562786149928284878">"eminithini engu-1"</item> - <item quantity="other" msgid="4216113292706568726">"emaminithini angu-<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_hours"> - <item quantity="one" msgid="3274708118124045246">"ehoreni elingu-1"</item> - <item quantity="other" msgid="3705373766798013406">"emahoreni angu-<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> - <plurals name="abbrev_in_num_days"> - <item quantity="one" msgid="2178576254385739855">"Kusasa"</item> - <item quantity="other" msgid="2973062968038355991">"ezinsukwini ezing-<xliff:g id="COUNT">%d</xliff:g>"</item> - </plurals> <string name="preposition_for_date" msgid="9093949757757445117">"ngo-<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"e-<xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"phakathi- <xliff:g id="YEAR">%s</xliff:g>"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f2d9de8..4c25e7d 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -632,6 +632,14 @@ Any other values will have surprising consequences. --> <integer name="config_defaultUiModeType">1</integer> + <!-- Control the default night mode to use when there is no other mode override set. + One of the following values (see UiModeManager.java): + 0 - MODE_NIGHT_AUTO + 1 - MODE_NIGHT_NO + 2 - MODE_NIGHT_YES + --> + <integer name="config_defaultNightMode">1</integer> + <!-- Indicate whether to allow the device to suspend when the screen is off due to the proximity sensor. This resource should only be set to true if the sensor HAL correctly handles the proximity sensor as a wake-up source. diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index e2a0ec9..3ac7374 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2617,4 +2617,20 @@ <public type="style" name="Widget.Material.Button.Colored" /> + <public type="style" name="Theme.Material.DayNight" /> + <public type="style" name="Theme.Material.DayNight.DarkActionBar" /> + <public type="style" name="Theme.Material.DayNight.Dialog" /> + <public type="style" name="Theme.Material.DayNight.Dialog.Alert" /> + <public type="style" name="Theme.Material.DayNight.Dialog.MinWidth" /> + <public type="style" name="Theme.Material.DayNight.Dialog.NoActionBar" /> + <public type="style" name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" /> + <public type="style" name="Theme.Material.DayNight.Dialog.Presentation" /> + <public type="style" name="Theme.Material.DayNight.DialogWhenLarge" /> + <public type="style" name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" /> + <public type="style" name="Theme.Material.DayNight.NoActionBar" /> + <public type="style" name="Theme.Material.DayNight.NoActionBar.Fullscreen" /> + <public type="style" name="Theme.Material.DayNight.NoActionBar.Overscan" /> + <public type="style" name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" /> + <public type="style" name="Theme.Material.DayNight.Panel" /> + </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9946ce8..ff03ca9 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3380,24 +3380,6 @@ <!-- String used to display the date. This is the string to say something happened more than 1 month ago. --> <string name="beforeOneMonthDurationPast">Before 1 month ago</string> - <!-- This is used to express that something occurred some number of seconds in the past (e.g., 5 seconds ago). --> - <plurals name="num_seconds_ago"> - <item quantity="one">1 second ago</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> seconds ago</item> - </plurals> - - <!-- This is used to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). --> - <plurals name="num_minutes_ago"> - <item quantity="one">1 minute ago</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> minutes ago</item> - </plurals> - - <!-- This is used to express that something occurred some number of hours in the past (e.g., 5 hours ago). --> - <plurals name="num_hours_ago"> - <item quantity="one">1 hour ago</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> hours ago</item> - </plurals> - <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). --> <plurals name="last_num_days"> <item quantity="one">Last <xliff:g id="count">%d</xliff:g> day</item> @@ -3410,84 +3392,6 @@ <!-- This is used to express that something happened longer ago than the previous options --> <string name="older">Older</string> - <!-- This is used to express that something occurred some number of days in the past (e.g., 5 days ago). --> - <plurals name="num_days_ago"> - <item quantity="one">yesterday</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> days ago</item> - </plurals> - - <!-- This is used to express that something will occur some number of seconds in the future (e.g., in 5 seconds). --> - <plurals name="in_num_seconds"> - <item quantity="one">in 1 second</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> seconds</item> - </plurals> - - <!-- This is used to express that something will occur some number of minutes in the future (e.g., in 5 minutes). --> - <plurals name="in_num_minutes"> - <item quantity="one">in 1 minute</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> minutes</item> - </plurals> - - <!-- This is used to express that something will occur some number of hours in the future (e.g., in 5 hours). --> - <plurals name="in_num_hours"> - <item quantity="one">in 1 hour</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> hours</item> - </plurals> - - <!-- This is used to express that something will occur some number of days in the future (e.g., in 5 days). --> - <plurals name="in_num_days"> - <item quantity="one">tomorrow</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> days</item> - </plurals> - - <!-- This is used to express that something occurred some number of abbreviated seconds in the past (e.g., 5 secs ago). --> - <plurals name="abbrev_num_seconds_ago"> - <item quantity="one">1 sec ago</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> secs ago</item> - </plurals> - - <!-- This is used to express that something occurred some number of abbreviated minutes in the past (e.g., 5 mins ago). --> - <plurals name="abbrev_num_minutes_ago"> - <item quantity="one">1 min ago</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> mins ago</item> - </plurals> - - <!-- This is used to express that something occurred some number of abbreviated hours in the past (e.g., 5 hrs ago). --> - <plurals name="abbrev_num_hours_ago"> - <item quantity="one">1 hour ago</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> hours ago</item> - </plurals> - - <!-- This is used to express that something occurred some number of abbreviated days in the past (e.g., 5 days ago). --> - <plurals name="abbrev_num_days_ago"> - <item quantity="one">yesterday</item> - <item quantity="other"><xliff:g id="count">%d</xliff:g> days ago</item> - </plurals> - - <!-- This is used to express that something will occur some number of abbreviated seconds in the future (e.g., in 5 secs). --> - <plurals name="abbrev_in_num_seconds"> - <item quantity="one">in 1 sec</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> secs</item> - </plurals> - - <!-- This is used to express that something will occur some number of abbreviated minutes in the future (e.g., in 5 mins). --> - <plurals name="abbrev_in_num_minutes"> - <item quantity="one">in 1 min</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> mins</item> - </plurals> - - <!-- This is used to express that something will occur some number of abbreviated hours in the future (e.g., in 5 hrs). --> - <plurals name="abbrev_in_num_hours"> - <item quantity="one">in 1 hour</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> hours</item> - </plurals> - - <!-- This is used to express that something will occur some number of abbreviated days in the future (e.g., in 5 days). --> - <plurals name="abbrev_in_num_days"> - <item quantity="one">tomorrow</item> - <item quantity="other">in <xliff:g id="count">%d</xliff:g> days</item> - </plurals> - <!-- String used to display the date. Preposition for date display ("on May 29") --> <string name="preposition_for_date">on <xliff:g id="date" example="May 29">%s</xliff:g></string> <!-- String used to display the date. Preposition for time display ("at 2:33am") --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f149cf9..85fd448 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1057,27 +1057,11 @@ <java-symbol type="string" name="config_ethernet_tcp_buffers" /> <java-symbol type="string" name="config_wifi_tcp_buffers" /> - <java-symbol type="plurals" name="abbrev_in_num_days" /> - <java-symbol type="plurals" name="abbrev_in_num_hours" /> - <java-symbol type="plurals" name="abbrev_in_num_minutes" /> - <java-symbol type="plurals" name="abbrev_in_num_seconds" /> - <java-symbol type="plurals" name="abbrev_num_days_ago" /> - <java-symbol type="plurals" name="abbrev_num_hours_ago" /> - <java-symbol type="plurals" name="abbrev_num_minutes_ago" /> - <java-symbol type="plurals" name="abbrev_num_seconds_ago" /> <java-symbol type="plurals" name="duration_hours" /> <java-symbol type="plurals" name="duration_minutes" /> <java-symbol type="plurals" name="duration_seconds" /> - <java-symbol type="plurals" name="in_num_days" /> - <java-symbol type="plurals" name="in_num_hours" /> - <java-symbol type="plurals" name="in_num_minutes" /> - <java-symbol type="plurals" name="in_num_seconds" /> <java-symbol type="plurals" name="last_num_days" /> <java-symbol type="plurals" name="matches_found" /> - <java-symbol type="plurals" name="num_days_ago" /> - <java-symbol type="plurals" name="num_hours_ago" /> - <java-symbol type="plurals" name="num_minutes_ago" /> - <java-symbol type="plurals" name="num_seconds_ago" /> <java-symbol type="plurals" name="restr_pin_countdown" /> <java-symbol type="plurals" name="pinpuk_attempts" /> @@ -2167,4 +2151,5 @@ <java-symbol type="xml" name="bookmarks" /> + <java-symbol type="integer" name="config_defaultNightMode" /> </resources> diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index 2b8ed5f..57041fd 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -1238,8 +1238,7 @@ please see themes_device_defaults.xml. </style> <!-- Default theme for Settings and activities launched from Settings. --> - <style name="Theme.Material.Settings" parent="Theme.Material.Light.DarkActionBar"> - <item name="colorBackground">@color/white</item> + <style name="Theme.Material.Settings" parent="Theme.Material.DayNight.DarkActionBar"> <item name="colorPrimary">@color/material_blue_grey_900</item> <item name="colorPrimaryDark">@color/material_blue_grey_950</item> <item name="colorAccent">@color/material_deep_teal_500</item> @@ -1251,8 +1250,7 @@ please see themes_device_defaults.xml. <item name="panelMenuListTheme">@style/Theme.Material.Settings.CompactMenu</item> </style> - <style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.Light.BaseDialog"> - <item name="colorBackground">@color/white</item> + <style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.DayNight.BaseDialog"> <item name="colorPrimary">@color/material_blue_grey_900</item> <item name="colorPrimaryDark">@color/material_blue_grey_950</item> <item name="colorAccent">@color/material_deep_teal_500</item> @@ -1260,8 +1258,7 @@ please see themes_device_defaults.xml. <style name="Theme.Material.Settings.Dialog" parent="Theme.Material.Settings.BaseDialog" /> - <style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.Light.Dialog.BaseAlert"> - <item name="colorBackground">@color/white</item> + <style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.DayNight.Dialog.BaseAlert"> <item name="colorPrimary">@color/material_blue_grey_900</item> <item name="colorPrimaryDark">@color/material_blue_grey_950</item> <item name="colorAccent">@color/material_deep_teal_500</item> @@ -1269,22 +1266,19 @@ please see themes_device_defaults.xml. <style name="Theme.Material.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.BaseAlert" /> - <style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation"> - <item name="colorBackground">@color/white</item> + <style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.DayNight.Dialog.Presentation"> <item name="colorPrimary">@color/material_blue_grey_900</item> <item name="colorPrimaryDark">@color/material_blue_grey_950</item> <item name="colorAccent">@color/material_deep_teal_500</item> </style> - <style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.Light.SearchBar"> - <item name="colorBackground">@color/white</item> + <style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.DayNight.SearchBar"> <item name="colorPrimary">@color/material_blue_grey_900</item> <item name="colorPrimaryDark">@color/material_blue_grey_950</item> <item name="colorAccent">@color/material_deep_teal_500</item> </style> - <style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.Light.CompactMenu"> - <item name="colorBackground">@color/white</item> + <style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.DayNight.CompactMenu"> <item name="colorPrimary">@color/material_blue_grey_900</item> <item name="colorPrimaryDark">@color/material_blue_grey_950</item> <item name="colorAccent">@color/material_deep_teal_500</item> diff --git a/core/res/res/values/themes_material_daynight.xml b/core/res/res/values/themes_material_daynight.xml new file mode 100644 index 0000000..5d9b860 --- /dev/null +++ b/core/res/res/values/themes_material_daynight.xml @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<!-- +=============================================================== + PLEASE READ +=============================================================== + +The Material themes must not be modified in order to pass CTS. +Many related themes and styles depend on other values defined in this file. +If you would like to provide custom themes and styles for your device, +please see themes_device_defaults.xml. + +=============================================================== + PLEASE READ +=============================================================== + --> +<resources> + + <!-- Material theme (day/night vesion) for activities. --> + <style name="Theme.Material.DayNight" parent="Theme.Material.Light" /> + + <!-- Variant of Material.DayNight that has a solid (opaque) action bar + with an inverse color profile. The dark action bar sharply stands out against + the light content (when applicable). --> + <style name="Theme.Material.DayNight.DarkActionBar" parent="Theme.Material.Light.DarkActionBar" /> + + <!-- Variant of Material.DayNight with no action bar. --> + <style name="Theme.Material.DayNight.NoActionBar" parent="Theme.Material.Light.NoActionBar" /> + + <!-- Variant of Material.DayNight that has no title bar and fills + the entire screen. This theme + sets {@link android.R.attr#windowFullscreen} to true. --> + <style name="Theme.Material.DayNight.NoActionBar.Fullscreen" parent="Theme.Material.Light.NoActionBar.Fullscreen" /> + + <!-- Variant of Material.DayNight that has no title bar and fills + the entire screen and extends into the display overscan region. This theme + sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan} + to true. --> + <style name="Theme.Material.DayNight.NoActionBar.Overscan" parent="Theme.Material.Light.NoActionBar.Overscan" /> + + <!-- Variant of Material.DayNight that has no title bar and translucent + system decor. This theme sets {@link android.R.attr#windowTranslucentStatus} and + {@link android.R.attr#windowTranslucentNavigation} to true. --> + <style name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" parent="Theme.Material.Light.NoActionBar.TranslucentDecor" /> + + <!-- Default Material.DayNight theme for panel windows. This removes all extraneous + window decorations, so you basically have an empty rectangle in which + to place your content. It makes the window floating, with a transparent + background, and turns off dimming behind the window. --> + <style name="Theme.Material.DayNight.Panel" parent="Theme.Material.Light.Panel" /> + + <!-- Material theme (day/night vesion) for dialog windows and activities, + which is used by the {@link android.app.Dialog} class. This changes + the window to be floating (not fill the entire screen), and puts a + frame around its contents. You can set this theme on an activity if + you would like to make an activity that looks like a Dialog. --> + <style name="Theme.Material.DayNight.Dialog" parent="Theme.Material.DayNight.BaseDialog" /> + <style name="Theme.Material.DayNight.BaseDialog" parent="Theme.Material.Light.BaseDialog" /> + + <!-- Variant of Theme.Material.DayNight.Dialog that has a nice minimum width for + a regular dialog. --> + <style name="Theme.Material.DayNight.Dialog.MinWidth" parent="Theme.Material.Light.Dialog.MinWidth" /> + + <!-- Variant of Theme.Material.DayNight.Dialog that does not include a title bar. --> + <style name="Theme.Material.DayNight.Dialog.NoActionBar" parent="Theme.Material.Light.Dialog.NoActionBar" /> + + <!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a nice minimum width for + a regular dialog. --> + <style name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Light.Dialog.NoActionBar.MinWidth" /> + + <!-- Variant of Theme.Material.DayNight.Dialog that has a fixed size. --> + <style name="Theme.Material.DayNight.Dialog.FixedSize" parent="Theme.Material.Light.Dialog.FixedSize" /> + + <!-- Variant of Theme.Material.DayNight.Dialog.NoActionBar that has a fixed size. --> + <style name="Theme.Material.DayNight.Dialog.NoActionBar.FixedSize" parent="Theme.Material.Light.Dialog.NoActionBar.FixedSize" /> + + <!-- Theme for a window that will be displayed either full-screen on + smaller screens (small, normal) or as a dialog on larger screens + (large, xlarge). --> + <style name="Theme.Material.DayNight.DialogWhenLarge" parent="Theme.Material.Light.DialogWhenLarge" /> + + <!-- Theme for a window without an action bar that will be displayed either full-screen + on smaller screens (small, normal) or as a dialog on larger screens + (large, xlarge). --> + <style name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" parent="Theme.Material.Light.DialogWhenLarge.NoActionBar" /> + + <!-- Theme for a presentation window on a secondary display. --> + <style name="Theme.Material.DayNight.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation" /> + + <!-- Material user theme for alert dialog windows, which is used by the + {@link android.app.AlertDialog} class. --> + <style name="Theme.Material.DayNight.Dialog.Alert" parent="Theme.Material.DayNight.Dialog.BaseAlert" /> + <style name="Theme.Material.DayNight.Dialog.BaseAlert" parent="Theme.Material.Light.Dialog.BaseAlert" /> + + <style name="Theme.Material.DayNight.SearchBar" parent="Theme.Material.Light.SearchBar" /> + <style name="Theme.Material.DayNight.CompactMenu" parent="Theme.Material.Light.CompactMenu" /> + +</resources> diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd index 1ee6606..0a96a15 100644 --- a/docs/html/guide/topics/resources/localization.jd +++ b/docs/html/guide/topics/resources/localization.jd @@ -433,8 +433,8 @@ application, however, should localize properly.</p> <p>To change the locale in the emulator by using the adb shell. </p>
<ol>
- <li>Pick the locale you want to test and determine its language and region codes, for
-example <code>fr</code> for French and <code>CA</code> for Canada.<br>
+ <li>Pick the locale you want to test and determine its BCP-47 language tag, for
+example, Canadian French would be <code>fr-CA</code>.<br>
</li>
<li>Launch an emulator.</li>
<li>From a command-line shell on the host computer, run the following
@@ -444,16 +444,14 @@ command:<br> the <code>-e</code> option:<br>
<code>adb -e shell</code></li>
<li>At the adb shell prompt (<code>#</code>), run this command: <br>
- <code>setprop persist.sys.language [<em>language code</em>];setprop
-persist.sys.country [<em>country code</em>];stop;sleep 5;start <br>
+ <code>setprop persist.sys.locale [<em>BCP-47 language tag</em>];stop;sleep 5;start <br>
</code>Replace bracketed sections with the appropriate codes from Step
1.</li>
</ol>
<p>For instance, to test in Canadian French:</p>
-<p><code>setprop persist.sys.language fr;setprop persist.sys.country
-CA;stop;sleep 5;start </code></p>
+<p><code>setprop persist.sys.locale fr-CA;stop;sleep 5;start </code></p>
<p>This will cause the emulator to restart. (It will look like a full reboot,
but it is not.) Once the Home screen appears again, re-launch your application (for
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index 9e4674b..616aebd 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -322,7 +322,13 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { return false; } - void addLayer(ChildDrawable layer) { + /** + * Adds a new layer at the end of list of layers and returns its index. + * + * @param layer The layer to add. + * @return The index of the layer. + */ + int addLayer(ChildDrawable layer) { final LayerState st = mLayerState; final int N = st.mChildren != null ? st.mChildren.length : 0; final int i = st.mNum; @@ -338,12 +344,13 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { st.mChildren[i] = layer; st.mNum++; st.invalidateCache(); + return i; } /** * Add a new layer to this drawable. The new layer is identified by an id. * - * @param layer The drawable to add as a layer. + * @param dr The drawable to add as a layer. * @param themeAttrs Theme attributes extracted from the layer. * @param id The id of the new layer. * @param left The left padding of the new layer. @@ -351,12 +358,11 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { * @param right The right padding of the new layer. * @param bottom The bottom padding of the new layer. */ - ChildDrawable addLayer(Drawable layer, int[] themeAttrs, int id, int left, int top, int right, - int bottom) { - final ChildDrawable childDrawable = new ChildDrawable(); + ChildDrawable addLayer(Drawable dr, int[] themeAttrs, int id, + int left, int top, int right, int bottom) { + final ChildDrawable childDrawable = createLayer(dr); childDrawable.mId = id; childDrawable.mThemeAttrs = themeAttrs; - childDrawable.mDrawable = layer; childDrawable.mDrawable.setAutoMirrored(isAutoMirrored()); childDrawable.mInsetL = left; childDrawable.mInsetT = top; @@ -365,12 +371,31 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { addLayer(childDrawable); - mLayerState.mChildrenChangingConfigurations |= layer.getChangingConfigurations(); - layer.setCallback(this); + mLayerState.mChildrenChangingConfigurations |= dr.getChangingConfigurations(); + dr.setCallback(this); return childDrawable; } + private ChildDrawable createLayer(Drawable dr) { + final ChildDrawable layer = new ChildDrawable(); + layer.mDrawable = dr; + return layer; + } + + /** + * Adds a new layer containing the specified {@code drawable} to the end of + * the layer list and returns its index. + * + * @param dr The drawable to add as a new layer. + * @return The index of the new layer. + */ + public int addLayer(Drawable dr) { + final ChildDrawable layer = createLayer(dr); + final int index = addLayer(layer); + return index; + } + /** * Looks for a layer with the given ID and returns its {@link Drawable}. * <p> @@ -395,45 +420,46 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { /** * Sets the ID of a layer. * - * @param index The index of the layer which will received the ID. - * @param id The ID to assign to the layer. + * @param index The index of the layer to modify, must be in the range + * {@code 0...getNumberOfLayers()-1}. + * @param id The id to assign to the layer. + * + * @see #getId(int) + * @attr ref android.R.styleable#LayerDrawableItem_id */ public void setId(int index, int id) { mLayerState.mChildren[index].mId = id; } /** - * Returns the number of layers contained within this. - * @return The number of layers. - */ - public int getNumberOfLayers() { - return mLayerState.mNum; - } - - /** - * Returns the drawable at the specified layer index. + * Returns the ID of the specified layer. * - * @param index The layer index of the drawable to retrieve. + * @param index The index of the layer, must be in the range + * {@code 0...getNumberOfLayers()-1}. + * @return The id of the layer or {@link android.view.View#NO_ID} if the + * layer has no id. * - * @return The {@link android.graphics.drawable.Drawable} at the specified layer index. + * @see #setId(int, int) + * @attr ref android.R.styleable#LayerDrawableItem_id */ - public Drawable getDrawable(int index) { - return mLayerState.mChildren[index].mDrawable; + public int getId(int index) { + if (index >= mLayerState.mNum) { + throw new IndexOutOfBoundsException(); + } + return mLayerState.mChildren[index].mId; } /** - * Returns the id of the specified layer. - * - * @param index The index of the layer. + * Returns the number of layers contained within this layer drawable. * - * @return The id of the layer or {@link android.view.View#NO_ID} if the layer has no id. + * @return The number of layers. */ - public int getId(int index) { - return mLayerState.mChildren[index].mId; + public int getNumberOfLayers() { + return mLayerState.mNum; } /** - * Sets (or replaces) the {@link Drawable} for the layer with the given id. + * Replaces the {@link Drawable} for the layer with the given id. * * @param id The layer ID to search for. * @param drawable The replacement {@link Drawable}. @@ -441,31 +467,88 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { * the id was not found). */ public boolean setDrawableByLayerId(int id, Drawable drawable) { + final int index = findIndexByLayerId(id); + if (index < 0) { + return false; + } + + setDrawable(index, drawable); + return true; + } + + /** + * Returns the layer with the specified {@code id}. + * <p> + * If multiple layers have the same ID, returns the layer with the lowest + * index. + * + * @param id The ID of the layer to return. + * @return The index of the layer with the specified ID. + */ + public int findIndexByLayerId(int id) { final ChildDrawable[] layers = mLayerState.mChildren; final int N = mLayerState.mNum; for (int i = 0; i < N; i++) { final ChildDrawable childDrawable = layers[i]; if (childDrawable.mId == id) { - if (childDrawable.mDrawable != null) { - if (drawable != null) { - final Rect bounds = childDrawable.mDrawable.getBounds(); - drawable.setBounds(bounds); - } + return i; + } + } - childDrawable.mDrawable.setCallback(null); - } + return -1; + } - if (drawable != null) { - drawable.setCallback(this); - } + /** + * Sets the drawable for the layer at the specified index. + * + * @param index The index of the layer to modify, must be in the range + * {@code 0...getNumberOfLayers()-1}. + * @param drawable The drawable to set for the layer. + * + * @see #getDrawable(int) + * @attr ref android.R.styleable#LayerDrawableItem_drawable + */ + public void setDrawable(int index, Drawable drawable) { + if (index >= mLayerState.mNum) { + throw new IndexOutOfBoundsException(); + } - childDrawable.mDrawable = drawable; - mLayerState.invalidateCache(); - return true; + final ChildDrawable[] layers = mLayerState.mChildren; + final ChildDrawable childDrawable = layers[index]; + if (childDrawable.mDrawable != null) { + if (drawable != null) { + final Rect bounds = childDrawable.mDrawable.getBounds(); + drawable.setBounds(bounds); } + + childDrawable.mDrawable.setCallback(null); } - return false; + if (drawable != null) { + drawable.setCallback(this); + drawable.setLayoutDirection(getLayoutDirection()); + drawable.setLevel(getLevel()); + } + + childDrawable.mDrawable = drawable; + mLayerState.invalidateCache(); + } + + /** + * Returns the drawable for the layer at the specified index. + * + * @param index The index of the layer, must be in the range + * {@code 0...getNumberOfLayers()-1}. + * @return The {@link Drawable} at the specified layer index. + * + * @see #setDrawable(int, Drawable) + * @attr ref android.R.styleable#LayerDrawableItem_drawable + */ + public Drawable getDrawable(int index) { + if (index >= mLayerState.mNum) { + throw new IndexOutOfBoundsException(); + } + return mLayerState.mChildren[index].mDrawable; } /** diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index d128ffe..cca8a06 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -668,7 +668,8 @@ public: } virtual void output(int level, uint32_t logFlags) const override { - OP_LOG("Draw bitmap %p at %f %f%s", mBitmap, mLocalBounds.left, mLocalBounds.top, + OP_LOG("Draw bitmap %p of size %dx%d%s", + mBitmap, mBitmap->width(), mBitmap->height(), mEntry ? " using AssetAtlas" : ""); } diff --git a/libs/hwui/FloatColor.h b/libs/hwui/FloatColor.h new file mode 100644 index 0000000..803b9d4 --- /dev/null +++ b/libs/hwui/FloatColor.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2015 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. + */ +#ifndef FLOATCOLOR_H +#define FLOATCOLOR_H + +#include "utils/Macros.h" + +namespace android { +namespace uirenderer { + +struct FloatColor { + float r; + float g; + float b; + float a; +}; + +REQUIRE_COMPATIBLE_LAYOUT(FloatColor); + +} /* namespace uirenderer */ +} /* namespace android */ + +#endif /* FLOATCOLOR_H */ diff --git a/libs/hwui/Glop.h b/libs/hwui/Glop.h index e2adff8..12c6e45 100644 --- a/libs/hwui/Glop.h +++ b/libs/hwui/Glop.h @@ -17,6 +17,7 @@ #ifndef ANDROID_HWUI_GLOP_H #define ANDROID_HWUI_GLOP_H +#include "FloatColor.h" #include "Matrix.h" #include "Rect.h" #include "utils/Macros.h" @@ -29,6 +30,7 @@ namespace android { namespace uirenderer { class Program; +class RoundRectClipState; /* * Enumerates optional vertex attributes @@ -44,22 +46,23 @@ enum VertexAttribFlags { kAlpha_Attrib = 1 << 2, }; - /** - * Structure containing all data required to issue a single OpenGL draw + * Structure containing all data required to issue an OpenGL draw * * Includes all of the mesh, fill, and GL state required to perform * the operation. Pieces of data are either directly copied into the * structure, or stored as a pointer or GL object reference to data - * managed + * managed. + * + * Eventually, a Glop should be able to be drawn multiple times from + * a single construction, up until GL context destruction. Currently, + * vertex/index/Texture/RoundRectClipState pointers prevent this from + * being safe. */ // TODO: PREVENT_COPY_AND_ASSIGN(...) or similar struct Glop { - struct FloatColor { - float a, r, g, b; - }; - Rect bounds; + const RoundRectClipState* roundRectClipState; /* * Stores mesh - vertex and index data. @@ -74,12 +77,18 @@ struct Glop { GLuint indexBufferObject; const void* vertices; const void* indices; - int vertexCount; + int elementCount; GLsizei stride; + GLvoid* texCoordOffset; + TextureVertex mappedVertices[4]; } mesh; struct Fill { Program* program; + Texture* texture; + GLenum textureFilter; + + bool colorEnabled; FloatColor color; /* TODO diff --git a/libs/hwui/GlopBuilder.cpp b/libs/hwui/GlopBuilder.cpp index 5373275..e56988c 100644 --- a/libs/hwui/GlopBuilder.cpp +++ b/libs/hwui/GlopBuilder.cpp @@ -33,52 +33,72 @@ namespace uirenderer { #define TRIGGER_STAGE(stageFlag) \ LOG_ALWAYS_FATAL_IF(stageFlag & mStageFlags, "Stage %d cannot be run twice"); \ - mStageFlags = static_cast<StageFlags>(mStageFlags | stageFlag) + mStageFlags = static_cast<StageFlags>(mStageFlags | (stageFlag)) #define REQUIRE_STAGES(requiredFlags) \ - LOG_ALWAYS_FATAL_IF((mStageFlags & requiredFlags) != requiredFlags, \ + LOG_ALWAYS_FATAL_IF((mStageFlags & (requiredFlags)) != (requiredFlags), \ "not prepared for current stage") +static void setUnitQuadTextureCoords(Rect uvs, TextureVertex* quadVertex) {; + TextureVertex::setUV(quadVertex++, uvs.left, uvs.top); + TextureVertex::setUV(quadVertex++, uvs.right, uvs.top); + TextureVertex::setUV(quadVertex++, uvs.left, uvs.bottom); + TextureVertex::setUV(quadVertex++, uvs.right, uvs.bottom); +} + GlopBuilder::GlopBuilder(RenderState& renderState, Caches& caches, Glop* outGlop) : mRenderState(renderState) , mCaches(caches) - , mOutGlop(outGlop){ + , mOutGlop(outGlop) { mStageFlags = kInitialStage; } -GlopBuilder& GlopBuilder::setMeshVertexBuffer(const VertexBuffer& vertexBuffer, bool shadowInterp) { - TRIGGER_STAGE(kMeshStage); +//////////////////////////////////////////////////////////////////////////////// +// Mesh +//////////////////////////////////////////////////////////////////////////////// - const VertexBuffer::MeshFeatureFlags flags = vertexBuffer.getMeshFeatureFlags(); +GlopBuilder& GlopBuilder::setMeshUnitQuad() { + TRIGGER_STAGE(kMeshStage); - bool alphaVertex = flags & VertexBuffer::kAlpha; - bool indices = flags & VertexBuffer::kIndices; - mOutGlop->mesh.vertexFlags = alphaVertex ? kAlpha_Attrib : kNone_Attrib; + mOutGlop->mesh.vertexFlags = kNone_Attrib; mOutGlop->mesh.primitiveMode = GL_TRIANGLE_STRIP; - mOutGlop->mesh.vertexBufferObject = 0; - mOutGlop->mesh.vertices = vertexBuffer.getBuffer(); + mOutGlop->mesh.vertexBufferObject = mRenderState.meshState().getUnitQuadVBO(); + mOutGlop->mesh.vertices = nullptr; mOutGlop->mesh.indexBufferObject = 0; - mOutGlop->mesh.indices = vertexBuffer.getIndices(); - mOutGlop->mesh.vertexCount = indices - ? vertexBuffer.getIndexCount() : vertexBuffer.getVertexCount(); - mOutGlop->mesh.stride = alphaVertex ? kAlphaVertexStride : kVertexStride; - - mDescription.hasVertexAlpha = alphaVertex; - mDescription.useShadowAlphaInterp = shadowInterp; + mOutGlop->mesh.indices = nullptr; + mOutGlop->mesh.elementCount = 4; + mOutGlop->mesh.stride = kTextureVertexStride; + mOutGlop->mesh.texCoordOffset = nullptr; return *this; } -GlopBuilder& GlopBuilder::setMeshUnitQuad() { +GlopBuilder& GlopBuilder::setMeshTexturedUnitQuad(const UvMapper* uvMapper, + bool isAlphaMaskTexture) { TRIGGER_STAGE(kMeshStage); - mOutGlop->mesh.vertexFlags = kNone_Attrib; + mOutGlop->mesh.vertexFlags = kTextureCoord_Attrib; mOutGlop->mesh.primitiveMode = GL_TRIANGLE_STRIP; - mOutGlop->mesh.vertexBufferObject = mRenderState.meshState().getUnitQuadVBO(); - mOutGlop->mesh.vertices = nullptr; + + if (CC_UNLIKELY(uvMapper)) { + Rect uvs(0, 0, 1, 1); + uvMapper->map(uvs); + setUnitQuadTextureCoords(uvs, &mOutGlop->mesh.mappedVertices[0]); + + mOutGlop->mesh.vertexBufferObject = 0; + mOutGlop->mesh.vertices = &mOutGlop->mesh.mappedVertices[0]; + } else { + // standard UV coordinates, use regular unit quad VBO + mOutGlop->mesh.vertexBufferObject = mRenderState.meshState().getUnitQuadVBO(); + mOutGlop->mesh.vertices = nullptr; + } mOutGlop->mesh.indexBufferObject = 0; mOutGlop->mesh.indices = nullptr; - mOutGlop->mesh.vertexCount = 4; + mOutGlop->mesh.elementCount = 4; mOutGlop->mesh.stride = kTextureVertexStride; + mOutGlop->mesh.texCoordOffset = (GLvoid*) kMeshTextureOffset; + + mDescription.hasTexture = true; + mDescription.hasAlpha8Texture = isAlphaMaskTexture; return *this; } @@ -91,92 +111,64 @@ GlopBuilder& GlopBuilder::setMeshIndexedQuads(void* vertexData, int quadCount) { mOutGlop->mesh.vertices = vertexData; mOutGlop->mesh.indexBufferObject = mRenderState.meshState().getQuadListIBO(); mOutGlop->mesh.indices = nullptr; - mOutGlop->mesh.vertexCount = 6 * quadCount; + mOutGlop->mesh.elementCount = 6 * quadCount; mOutGlop->mesh.stride = kVertexStride; + mOutGlop->mesh.texCoordOffset = nullptr; return *this; } -GlopBuilder& GlopBuilder::setTransform(const Matrix4& ortho, - const Matrix4& transform, bool fudgingOffset) { - TRIGGER_STAGE(kTransformStage); - - mOutGlop->transform.ortho.load(ortho); - mOutGlop->transform.canvas.load(transform); - mOutGlop->transform.fudgingOffset = fudgingOffset; - return *this; -} - -GlopBuilder& GlopBuilder::setModelViewMapUnitToRect(const Rect destination) { - TRIGGER_STAGE(kModelViewStage); - - mOutGlop->transform.modelView.loadTranslate(destination.left, destination.top, 0.0f); - mOutGlop->transform.modelView.scale(destination.getWidth(), destination.getHeight(), 1.0f); - mOutGlop->bounds = destination; - return *this; -} - -GlopBuilder& GlopBuilder::setModelViewOffsetRect(float offsetX, float offsetY, const Rect source) { - TRIGGER_STAGE(kModelViewStage); - - mOutGlop->transform.modelView.loadTranslate(offsetX, offsetY, 0.0f); - mOutGlop->bounds = source; - mOutGlop->bounds.translate(offsetX, offsetY); - return *this; -} - -GlopBuilder& GlopBuilder::setOptionalPaint(const SkPaint* paint, float alphaScale) { - if (paint) { - return setPaint(*paint, alphaScale); - } - - TRIGGER_STAGE(kFillStage); - REQUIRE_STAGES(kMeshStage); +GlopBuilder& GlopBuilder::setMeshVertexBuffer(const VertexBuffer& vertexBuffer, bool shadowInterp) { + TRIGGER_STAGE(kMeshStage); - mOutGlop->fill.color = { alphaScale, alphaScale, alphaScale, alphaScale }; + const VertexBuffer::MeshFeatureFlags flags = vertexBuffer.getMeshFeatureFlags(); - const bool SWAP_SRC_DST = false; - // TODO: account for texture blend - if (alphaScale < 1.0f - || (mOutGlop->mesh.vertexFlags & kAlpha_Attrib)) { - Blend::getFactors(SkXfermode::kSrcOver_Mode, SWAP_SRC_DST, - &mOutGlop->blend.src, &mOutGlop->blend.dst); - } else { - mOutGlop->blend = { GL_ZERO, GL_ZERO }; - } + bool alphaVertex = flags & VertexBuffer::kAlpha; + bool indices = flags & VertexBuffer::kIndices; + mOutGlop->mesh.vertexFlags = alphaVertex ? kAlpha_Attrib : kNone_Attrib; + mOutGlop->mesh.primitiveMode = GL_TRIANGLE_STRIP; + mOutGlop->mesh.vertexBufferObject = 0; + mOutGlop->mesh.vertices = vertexBuffer.getBuffer(); + mOutGlop->mesh.indexBufferObject = 0; + mOutGlop->mesh.indices = vertexBuffer.getIndices(); + mOutGlop->mesh.elementCount = indices + ? vertexBuffer.getIndexCount() : vertexBuffer.getVertexCount(); + mOutGlop->mesh.stride = alphaVertex ? kAlphaVertexStride : kVertexStride; + mDescription.hasVertexAlpha = alphaVertex; + mDescription.useShadowAlphaInterp = shadowInterp; return *this; } -GlopBuilder& GlopBuilder::setPaint(const SkPaint& paint, float alphaScale) { - TRIGGER_STAGE(kFillStage); - REQUIRE_STAGES(kMeshStage); - const SkShader* shader = paint.getShader(); - const SkColorFilter* colorFilter = paint.getColorFilter(); +//////////////////////////////////////////////////////////////////////////////// +// Fill +//////////////////////////////////////////////////////////////////////////////// - SkXfermode::Mode mode = PaintUtils::getXfermode(paint.getXfermode()); +void GlopBuilder::setFill(int color, float alphaScale, SkXfermode::Mode mode, + const SkShader* shader, const SkColorFilter* colorFilter) { if (mode != SkXfermode::kClear_Mode) { - int color = paint.getColor(); float alpha = (SkColorGetA(color) / 255.0f) * alphaScale; if (!shader) { float colorScale = alpha / 255.0f; mOutGlop->fill.color = { - alpha, colorScale * SkColorGetR(color), colorScale * SkColorGetG(color), - colorScale * SkColorGetB(color) + colorScale * SkColorGetB(color), + alpha }; } else { - mOutGlop->fill.color = { alpha, 1, 1, 1 }; + mOutGlop->fill.color = { 1, 1, 1, alpha }; } } else { - mOutGlop->fill.color = { 1, 0, 0, 0 }; + mOutGlop->fill.color = { 0, 0, 0, 1 }; } const bool SWAP_SRC_DST = false; mOutGlop->blend = { GL_ZERO, GL_ZERO }; if (mOutGlop->fill.color.a < 1.0f || (mOutGlop->mesh.vertexFlags & kAlpha_Attrib) + || (mOutGlop->fill.texture && mOutGlop->fill.texture->blend) + || mOutGlop->roundRectClipState || PaintUtils::isBlendedShader(shader) || PaintUtils::isBlendedColorFilter(colorFilter) || mode != SkXfermode::kSrcOver_Mode) { @@ -218,10 +210,10 @@ GlopBuilder& GlopBuilder::setPaint(const SkPaint& paint, float alphaScale) { const float alpha = SkColorGetA(color) / 255.0f; float colorScale = alpha / 255.0f; mOutGlop->fill.filter.color = { - alpha, colorScale * SkColorGetR(color), colorScale * SkColorGetG(color), colorScale * SkColorGetB(color), + alpha, }; } else if (colorFilter->asColorMatrix(srcColorMatrix)) { mOutGlop->fill.filterMode = mDescription.colorOp = ProgramDescription::kColorMatrix; @@ -245,18 +237,151 @@ GlopBuilder& GlopBuilder::setPaint(const SkPaint& paint, float alphaScale) { } else { mOutGlop->fill.filterMode = ProgramDescription::kColorNone; } +} + +GlopBuilder& GlopBuilder::setFillTexturePaint(Texture& texture, bool isAlphaMaskTexture, + const SkPaint* paint, float alphaScale) { + TRIGGER_STAGE(kFillStage); + REQUIRE_STAGES(kMeshStage); + + mOutGlop->fill.texture = &texture; + mOutGlop->fill.textureFilter = PaintUtils::getFilter(paint); + + if (paint) { + int color = paint->getColor(); + SkShader* shader = paint->getShader(); + + if (!isAlphaMaskTexture) { + // Texture defines color, so disable shaders, and reset all non-alpha color channels + color |= 0x00FFFFFF; + shader = nullptr; + } + setFill(color, alphaScale, PaintUtils::getXfermode(paint->getXfermode()), + shader, paint->getColorFilter()); + } else { + mOutGlop->fill.color = { alphaScale, alphaScale, alphaScale, alphaScale }; + + const bool SWAP_SRC_DST = false; + if (alphaScale < 1.0f + || (mOutGlop->mesh.vertexFlags & kAlpha_Attrib) + || texture.blend + || mOutGlop->roundRectClipState) { + Blend::getFactors(SkXfermode::kSrcOver_Mode, SWAP_SRC_DST, + &mOutGlop->blend.src, &mOutGlop->blend.dst); + } else { + mOutGlop->blend = { GL_ZERO, GL_ZERO }; + } + } + + if (isAlphaMaskTexture) { + mDescription.modulate = mOutGlop->fill.color.a < 1.0f + || mOutGlop->fill.color.r > 0.0f + || mOutGlop->fill.color.g > 0.0f + || mOutGlop->fill.color.b > 0.0f; + } else { + mDescription.modulate = mOutGlop->fill.color.a < 1.0f; + } + return *this; +} + +GlopBuilder& GlopBuilder::setFillPaint(const SkPaint& paint, float alphaScale) { + TRIGGER_STAGE(kFillStage); + REQUIRE_STAGES(kMeshStage); + + mOutGlop->fill.texture = nullptr; + mOutGlop->fill.textureFilter = GL_NEAREST; + + setFill(paint.getColor(), alphaScale, PaintUtils::getXfermode(paint.getXfermode()), + paint.getShader(), paint.getColorFilter()); + mDescription.modulate = mOutGlop->fill.color.a < 1.0f; + return *this; +} + +//////////////////////////////////////////////////////////////////////////////// +// Transform +//////////////////////////////////////////////////////////////////////////////// + +GlopBuilder& GlopBuilder::setTransformClip(const Matrix4& ortho, + const Matrix4& transform, bool fudgingOffset) { + TRIGGER_STAGE(kTransformStage); + + mOutGlop->transform.ortho.load(ortho); + mOutGlop->transform.canvas.load(transform); + mOutGlop->transform.fudgingOffset = fudgingOffset; + return *this; +} + + +//////////////////////////////////////////////////////////////////////////////// +// ModelView +//////////////////////////////////////////////////////////////////////////////// + +GlopBuilder& GlopBuilder::setModelViewMapUnitToRect(const Rect destination) { + TRIGGER_STAGE(kModelViewStage); + + mOutGlop->transform.modelView.loadTranslate(destination.left, destination.top, 0.0f); + mOutGlop->transform.modelView.scale(destination.getWidth(), destination.getHeight(), 1.0f); + mOutGlop->bounds = destination; + return *this; +} + +GlopBuilder& GlopBuilder::setModelViewMapUnitToRectSnap(const Rect destination) { + TRIGGER_STAGE(kModelViewStage); + REQUIRE_STAGES(kTransformStage | kFillStage); + + float left = destination.left; + float top = destination.top; + + const Matrix4& canvasTransform = mOutGlop->transform.canvas; + if (CC_LIKELY(canvasTransform.isPureTranslate())) { + const float translateX = canvasTransform.getTranslateX(); + const float translateY = canvasTransform.getTranslateY(); + + left = (int) floorf(left + translateX + 0.5f) - translateX; + top = (int) floorf(top + translateY + 0.5f) - translateY; + mOutGlop->fill.textureFilter = GL_NEAREST; + } + + mOutGlop->transform.modelView.loadTranslate(left, top, 0.0f); + mOutGlop->transform.modelView.scale(destination.getWidth(), destination.getHeight(), 1.0f); + mOutGlop->bounds = destination; + return *this; +} + +GlopBuilder& GlopBuilder::setModelViewOffsetRect(float offsetX, float offsetY, const Rect source) { + TRIGGER_STAGE(kModelViewStage); + + mOutGlop->transform.modelView.loadTranslate(offsetX, offsetY, 0.0f); + mOutGlop->bounds = source; + mOutGlop->bounds.translate(offsetX, offsetY); + return *this; +} +GlopBuilder& GlopBuilder::setRoundRectClipState(const RoundRectClipState* roundRectClipState) { + TRIGGER_STAGE(kRoundRectClipStage); + + mOutGlop->roundRectClipState = roundRectClipState; + mDescription.hasRoundRectClip = roundRectClipState != nullptr; return *this; } +//////////////////////////////////////////////////////////////////////////////// +// Build +//////////////////////////////////////////////////////////////////////////////// + void GlopBuilder::build() { REQUIRE_STAGES(kAllStages); - mDescription.modulate = mOutGlop->fill.color.a < 1.0f; mOutGlop->fill.program = mCaches.programCache.get(mDescription); mOutGlop->transform.canvas.mapRect(mOutGlop->bounds); + + // duplicates ProgramCache's definition of color uniform presence + const bool singleColor = !mDescription.hasTexture + && !mDescription.hasExternalTexture + && !mDescription.hasGradient + && !mDescription.hasBitmap; + mOutGlop->fill.colorEnabled = mDescription.modulate || singleColor; } } /* namespace uirenderer */ } /* namespace android */ - diff --git a/libs/hwui/GlopBuilder.h b/libs/hwui/GlopBuilder.h index 48ce81a..04d421c 100644 --- a/libs/hwui/GlopBuilder.h +++ b/libs/hwui/GlopBuilder.h @@ -38,25 +38,35 @@ public: GlopBuilder(RenderState& renderState, Caches& caches, Glop* outGlop); GlopBuilder& setMeshUnitQuad(); + GlopBuilder& setMeshTexturedUnitQuad(const UvMapper* uvMapper, bool isAlphaMaskTexture); GlopBuilder& setMeshVertexBuffer(const VertexBuffer& vertexBuffer, bool shadowInterp); GlopBuilder& setMeshIndexedQuads(void* vertexData, int quadCount); - GlopBuilder& setTransform(const Matrix4& ortho, const Matrix4& transform, bool fudgingOffset); + GlopBuilder& setFillPaint(const SkPaint& paint, float alphaScale); + GlopBuilder& setFillTexturePaint(Texture& texture, bool isAlphaMaskTexture, + const SkPaint* paint, float alphaScale); + + GlopBuilder& setTransformClip(const Matrix4& ortho, const Matrix4& transform, bool fudgingOffset); GlopBuilder& setModelViewMapUnitToRect(const Rect destination); + GlopBuilder& setModelViewMapUnitToRectSnap(const Rect destination); GlopBuilder& setModelViewOffsetRect(float offsetX, float offsetY, const Rect source); - GlopBuilder& setOptionalPaint(const SkPaint* paint, float alphaScale); - GlopBuilder& setPaint(const SkPaint& paint, float alphaScale); + GlopBuilder& setRoundRectClipState(const RoundRectClipState* roundRectClipState); + void build(); private: + void setFill(int color, float alphaScale, SkXfermode::Mode mode, + const SkShader* shader, const SkColorFilter* colorFilter); + enum StageFlags { kInitialStage = 0, kMeshStage = 1 << 0, kTransformStage = 1 << 1, kModelViewStage = 1 << 2, kFillStage = 1 << 3, - kAllStages = kMeshStage | kTransformStage | kModelViewStage | kFillStage, + kRoundRectClipStage = 1 << 4, + kAllStages = kMeshStage | kFillStage | kTransformStage | kModelViewStage | kRoundRectClipStage, } mStageFlags; ProgramDescription mDescription; diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 61cd16f..0841124 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -57,16 +57,11 @@ #define EVENT_LOGD(...) #endif +#define USE_GLOPS true + namespace android { namespace uirenderer { -static GLenum getFilter(const SkPaint* paint) { - if (!paint || paint->getFilterLevel() != SkPaint::kNone_FilterLevel) { - return GL_LINEAR; - } - return GL_NEAREST; -} - /////////////////////////////////////////////////////////////////////////////// // Globals /////////////////////////////////////////////////////////////////////////////// @@ -1586,6 +1581,7 @@ void OpenGLRenderer::renderGlop(const Glop& glop) { // TODO: specify more clearly when a draw should dirty the layer. // is writing to the stencil the only time we should ignore this? dirtyLayer(glop.bounds.left, glop.bounds.top, glop.bounds.right, glop.bounds.bottom); + mDirty = true; } } @@ -1611,7 +1607,7 @@ void OpenGLRenderer::setupDraw(bool clearLayer) { mSetShaderColor = false; mColorSet = false; - mColorA = mColorR = mColorG = mColorB = 0.0f; + mColor.a = mColor.r = mColor.g = mColor.b = 0.0f; mTextureUnit = 0; mTrackDirtyRegions = true; @@ -1647,21 +1643,21 @@ void OpenGLRenderer::setupDrawVertexAlpha(bool useShadowAlphaInterp) { } void OpenGLRenderer::setupDrawColor(int color, int alpha) { - mColorA = alpha / 255.0f; - mColorR = mColorA * ((color >> 16) & 0xFF) / 255.0f; - mColorG = mColorA * ((color >> 8) & 0xFF) / 255.0f; - mColorB = mColorA * ((color ) & 0xFF) / 255.0f; + mColor.a = alpha / 255.0f; + mColor.r = mColor.a * ((color >> 16) & 0xFF) / 255.0f; + mColor.g = mColor.a * ((color >> 8) & 0xFF) / 255.0f; + mColor.b = mColor.a * ((color ) & 0xFF) / 255.0f; mColorSet = true; - mSetShaderColor = mDescription.setColorModulate(mColorA); + mSetShaderColor = mDescription.setColorModulate(mColor.a); } void OpenGLRenderer::setupDrawAlpha8Color(int color, int alpha) { - mColorA = alpha / 255.0f; - mColorR = mColorA * ((color >> 16) & 0xFF) / 255.0f; - mColorG = mColorA * ((color >> 8) & 0xFF) / 255.0f; - mColorB = mColorA * ((color ) & 0xFF) / 255.0f; + mColor.a = alpha / 255.0f; + mColor.r = mColor.a * ((color >> 16) & 0xFF) / 255.0f; + mColor.g = mColor.a * ((color >> 8) & 0xFF) / 255.0f; + mColor.b = mColor.a * ((color ) & 0xFF) / 255.0f; mColorSet = true; - mSetShaderColor = mDescription.setAlpha8ColorModulate(mColorR, mColorG, mColorB, mColorA); + mSetShaderColor = mDescription.setAlpha8ColorModulate(mColor.r, mColor.g, mColor.b, mColor.a); } void OpenGLRenderer::setupDrawTextGamma(const SkPaint* paint) { @@ -1669,10 +1665,10 @@ void OpenGLRenderer::setupDrawTextGamma(const SkPaint* paint) { } void OpenGLRenderer::setupDrawColor(float r, float g, float b, float a) { - mColorA = a; - mColorR = r; - mColorG = g; - mColorB = b; + mColor.a = a; + mColor.r = r; + mColor.g = g; + mColor.b = b; mColorSet = true; mSetShaderColor = mDescription.setColorModulate(a); } @@ -1699,8 +1695,8 @@ void OpenGLRenderer::setupDrawColorFilter(const SkColorFilter* filter) { void OpenGLRenderer::accountForClear(SkXfermode::Mode mode) { if (mColorSet && mode == SkXfermode::kClear_Mode) { - mColorA = 1.0f; - mColorR = mColorG = mColorB = 0.0f; + mColor.a = 1.0f; + mColor.r = mColor.g = mColor.b = 0.0f; mSetShaderColor = mDescription.modulate = true; } } @@ -1713,7 +1709,7 @@ void OpenGLRenderer::setupDrawBlending(const Layer* layer, bool swapSrcDst) { // TODO: check shader blending, once we have shader drawing support for layers. bool blend = layer->isBlend() || getLayerAlpha(layer) < 1.0f - || (mColorSet && mColorA < 1.0f) + || (mColorSet && mColor.a < 1.0f) || PaintUtils::isBlendedColorFilter(layer->getColorFilter()); chooseBlending(blend, mode, mDescription, swapSrcDst); } @@ -1723,7 +1719,7 @@ void OpenGLRenderer::setupDrawBlending(const SkPaint* paint, bool blend, bool sw // When the blending mode is kClear_Mode, we need to use a modulate color // argb=1,0,0,0 accountForClear(mode); - blend |= (mColorSet && mColorA < 1.0f) + blend |= (mColorSet && mColor.a < 1.0f) || (getShader(paint) && !getShader(paint)->isOpaque()) || PaintUtils::isBlendedColorFilter(getColorFilter(paint)); chooseBlending(blend, mode, mDescription, swapSrcDst); @@ -1775,13 +1771,13 @@ void OpenGLRenderer::setupDrawModelView(ModelViewMode mode, bool offset, void OpenGLRenderer::setupDrawColorUniforms(bool hasShader) { if ((mColorSet && !hasShader) || (hasShader && mSetShaderColor)) { - mCaches.program().setColor(mColorR, mColorG, mColorB, mColorA); + mCaches.program().setColor(mColor); } } void OpenGLRenderer::setupDrawPureColorUniforms() { if (mSetShaderColor) { - mCaches.program().setColor(mColorR, mColorG, mColorB, mColorA); + mCaches.program().setColor(mColor); } } @@ -1973,22 +1969,34 @@ void OpenGLRenderer::drawRenderNode(RenderNode* renderNode, Rect& dirty, int32_t } } -void OpenGLRenderer::drawAlphaBitmap(Texture* texture, float left, float top, - const SkPaint* paint) { - float x = left; - float y = top; +void OpenGLRenderer::drawAlphaBitmap(Texture* texture, const SkPaint* paint) { + if (USE_GLOPS && (!paint || !paint->getShader())) { + Glop glop; + GlopBuilder aBuilder(mRenderState, mCaches, &glop); + aBuilder.setMeshTexturedUnitQuad(texture->uvMapper, true) + .setFillTexturePaint(*texture, true, paint, currentSnapshot()->alpha) + .setTransformClip(currentSnapshot()->getOrthoMatrix(), *currentTransform(), false) + .setModelViewMapUnitToRectSnap(Rect(0, 0, texture->width, texture->height)) + .setRoundRectClipState(currentSnapshot()->roundRectClipState) + .build(); + renderGlop(glop); + return; + } + + float x = 0; + float y = 0; texture->setWrap(GL_CLAMP_TO_EDGE, true); bool ignoreTransform = false; if (currentTransform()->isPureTranslate()) { - x = (int) floorf(left + currentTransform()->getTranslateX() + 0.5f); - y = (int) floorf(top + currentTransform()->getTranslateY() + 0.5f); + x = (int) floorf(currentTransform()->getTranslateX() + 0.5f); + y = (int) floorf(currentTransform()->getTranslateY() + 0.5f); ignoreTransform = true; texture->setFilter(GL_NEAREST, true); } else { - texture->setFilter(getFilter(paint), true); + texture->setFilter(PaintUtils::getFilter(paint), true); } // No need to check for a UV mapper on the texture object, only ARGB_8888 @@ -2013,7 +2021,7 @@ void OpenGLRenderer::drawBitmaps(const SkBitmap* bitmap, AssetAtlas::Entry* entr const AutoTexture autoCleanup(texture); texture->setWrap(GL_CLAMP_TO_EDGE, true); - texture->setFilter(pureTranslate ? GL_NEAREST : getFilter(paint), true); + texture->setFilter(pureTranslate ? GL_NEAREST : PaintUtils::getFilter(paint), true); const float x = (int) floorf(bounds.left + 0.5f); const float y = (int) floorf(bounds.top + 0.5f); @@ -2043,9 +2051,9 @@ void OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) { const AutoTexture autoCleanup(texture); if (CC_UNLIKELY(bitmap->colorType() == kAlpha_8_SkColorType)) { - drawAlphaBitmap(texture, 0, 0, paint); + drawAlphaBitmap(texture, paint); } else { - drawTextureRect(0, 0, bitmap->width(), bitmap->height(), texture, paint); + drawTextureRect(texture, paint); } mDirty = true; @@ -2130,7 +2138,7 @@ void OpenGLRenderer::drawBitmapMesh(const SkBitmap* bitmap, int meshWidth, int m const AutoTexture autoCleanup(texture); texture->setWrap(GL_CLAMP_TO_EDGE, true); - texture->setFilter(getFilter(paint), true); + texture->setFilter(PaintUtils::getFilter(paint), true); int alpha; SkXfermode::Mode mode; @@ -2213,10 +2221,10 @@ void OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, dstLeft = x; dstTop = y; - texture->setFilter(scaled ? getFilter(paint) : GL_NEAREST, true); + texture->setFilter(scaled ? PaintUtils::getFilter(paint) : GL_NEAREST, true); ignoreTransform = true; } else { - texture->setFilter(getFilter(paint), true); + texture->setFilter(PaintUtils::getFilter(paint), true); } if (CC_UNLIKELY(useScaleTransform)) { @@ -2350,15 +2358,16 @@ void OpenGLRenderer::drawVertexBuffer(float translateX, float translateY, return; } - if (!paint->getShader() && !currentSnapshot()->roundRectClipState) { + if (USE_GLOPS && !paint->getShader()) { Glop glop; GlopBuilder aBuilder(mRenderState, mCaches, &glop); bool fudgeOffset = displayFlags & kVertexBuffer_Offset; bool shadowInterp = displayFlags & kVertexBuffer_ShadowInterp; aBuilder.setMeshVertexBuffer(vertexBuffer, shadowInterp) - .setTransform(currentSnapshot()->getOrthoMatrix(), *currentTransform(), fudgeOffset) + .setFillPaint(*paint, currentSnapshot()->alpha) + .setTransformClip(currentSnapshot()->getOrthoMatrix(), *currentTransform(), fudgeOffset) .setModelViewOffsetRect(translateX, translateY, vertexBuffer.getBounds()) - .setPaint(*paint, currentSnapshot()->alpha) + .setRoundRectClipState(currentSnapshot()->roundRectClipState) .build(); renderGlop(glop); return; @@ -3251,14 +3260,15 @@ void OpenGLRenderer::drawColorRects(const float* rects, int count, const SkPaint return; } - if (!paint->getShader() && !currentSnapshot()->roundRectClipState) { + if (USE_GLOPS && !paint->getShader()) { const Matrix4& transform = ignoreTransform ? Matrix4::identity() : *currentTransform(); Glop glop; GlopBuilder aBuilder(mRenderState, mCaches, &glop); aBuilder.setMeshIndexedQuads(&mesh[0], count / 4) - .setTransform(currentSnapshot()->getOrthoMatrix(), transform, false) + .setFillPaint(*paint, currentSnapshot()->alpha) + .setTransformClip(currentSnapshot()->getOrthoMatrix(), transform, false) .setModelViewOffsetRect(0, 0, Rect(left, top, right, bottom)) - .setPaint(*paint, currentSnapshot()->alpha) + .setRoundRectClipState(currentSnapshot()->roundRectClipState) .build(); renderGlop(glop); return; @@ -3296,14 +3306,15 @@ void OpenGLRenderer::drawColorRects(const float* rects, int count, const SkPaint void OpenGLRenderer::drawColorRect(float left, float top, float right, float bottom, const SkPaint* paint, bool ignoreTransform) { - if (!paint->getShader() && !currentSnapshot()->roundRectClipState) { + if (USE_GLOPS && !paint->getShader()) { const Matrix4& transform = ignoreTransform ? Matrix4::identity() : *currentTransform(); Glop glop; GlopBuilder aBuilder(mRenderState, mCaches, &glop); aBuilder.setMeshUnitQuad() - .setTransform(currentSnapshot()->getOrthoMatrix(), transform, false) + .setFillPaint(*paint, currentSnapshot()->alpha) + .setTransformClip(currentSnapshot()->getOrthoMatrix(), transform, false) .setModelViewMapUnitToRect(Rect(left, top, right, bottom)) - .setPaint(*paint, currentSnapshot()->alpha) + .setRoundRectClipState(currentSnapshot()->roundRectClipState) .build(); renderGlop(glop); return; @@ -3332,8 +3343,20 @@ void OpenGLRenderer::drawColorRect(float left, float top, float right, float bot glDrawArrays(GL_TRIANGLE_STRIP, 0, kUnitQuadCount); } -void OpenGLRenderer::drawTextureRect(float left, float top, float right, float bottom, - Texture* texture, const SkPaint* paint) { +void OpenGLRenderer::drawTextureRect(Texture* texture, const SkPaint* paint) { + if (USE_GLOPS) { + Glop glop; + GlopBuilder aBuilder(mRenderState, mCaches, &glop); + aBuilder.setMeshTexturedUnitQuad(texture->uvMapper, false) + .setFillTexturePaint(*texture, false, paint, currentSnapshot()->alpha) + .setTransformClip(currentSnapshot()->getOrthoMatrix(), *currentTransform(), false) + .setModelViewMapUnitToRectSnap(Rect(0, 0, texture->width, texture->height)) + .setRoundRectClipState(currentSnapshot()->roundRectClipState) + .build(); + renderGlop(glop); + return; + } + texture->setWrap(GL_CLAMP_TO_EDGE, true); GLvoid* vertices = (GLvoid*) nullptr; @@ -3350,16 +3373,16 @@ void OpenGLRenderer::drawTextureRect(float left, float top, float right, float b } if (CC_LIKELY(currentTransform()->isPureTranslate())) { - const float x = (int) floorf(left + currentTransform()->getTranslateX() + 0.5f); - const float y = (int) floorf(top + currentTransform()->getTranslateY() + 0.5f); + const float x = (int) floorf(currentTransform()->getTranslateX() + 0.5f); + const float y = (int) floorf(currentTransform()->getTranslateY() + 0.5f); texture->setFilter(GL_NEAREST, true); drawTextureMesh(x, y, x + texture->width, y + texture->height, texture->id, paint, texture->blend, vertices, texCoords, GL_TRIANGLE_STRIP, kUnitQuadCount, false, true); } else { - texture->setFilter(getFilter(paint), true); - drawTextureMesh(left, top, right, bottom, texture->id, paint, + texture->setFilter(PaintUtils::getFilter(paint), true); + drawTextureMesh(0, 0, texture->width, texture->height, texture->id, paint, texture->blend, vertices, texCoords, GL_TRIANGLE_STRIP, kUnitQuadCount); } diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index f097041..4f8a2ea 100755 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -697,11 +697,9 @@ private: * different compositing rules. * * @param texture The texture to draw with - * @param left The x coordinate of the bitmap - * @param top The y coordinate of the bitmap * @param paint The paint to render with */ - void drawAlphaBitmap(Texture* texture, float left, float top, const SkPaint* paint); + void drawAlphaBitmap(Texture* texture, const SkPaint* paint); /** * Renders a strip of polygons with the specified paint, used for tessellated geometry. @@ -730,18 +728,12 @@ private: void drawConvexPath(const SkPath& path, const SkPaint* paint); /** - * Draws a textured rectangle with the specified texture. The specified coordinates - * are transformed by the current snapshot's transform matrix. + * Draws a textured rectangle with the specified texture. * - * @param left The left coordinate of the rectangle - * @param top The top coordinate of the rectangle - * @param right The right coordinate of the rectangle - * @param bottom The bottom coordinate of the rectangle * @param texture The texture to use * @param paint The paint containing the alpha, blending mode, etc. */ - void drawTextureRect(float left, float top, float right, float bottom, - Texture* texture, const SkPaint* paint); + void drawTextureRect(Texture* texture, const SkPaint* paint); /** * Draws a textured mesh with the specified texture. If the indices are omitted, @@ -1010,7 +1002,7 @@ private: ProgramDescription mDescription; // Color description bool mColorSet; - float mColorA, mColorR, mColorG, mColorB; + FloatColor mColor; // Indicates that the shader should get a color bool mSetShaderColor; // Current texture unit diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 5f34b34..32713e9 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -177,12 +177,12 @@ void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix, glUniformMatrix4fv(transform, 1, GL_FALSE, &t.data[0]); } -void Program::setColor(const float r, const float g, const float b, const float a) { +void Program::setColor(FloatColor color) { if (!mHasColorUniform) { mColorUniform = getUniform("color"); mHasColorUniform = true; } - glUniform4f(mColorUniform, r, g, b, a); + glUniform4f(mColorUniform, color.r, color.g, color.b, color.a); } void Program::use() { diff --git a/libs/hwui/Program.h b/libs/hwui/Program.h index 01231b5..af1e4a7 100644 --- a/libs/hwui/Program.h +++ b/libs/hwui/Program.h @@ -25,6 +25,7 @@ #include <SkXfermode.h> #include "Debug.h" +#include "FloatColor.h" #include "Matrix.h" #include "Properties.h" @@ -363,7 +364,7 @@ public: /** * Sets the color associated with this shader. */ - void setColor(const float r, const float g, const float b, const float a); + void setColor(FloatColor color); /** * Name of the texCoords attribute if it exists (kBindingTexCoords), -1 otherwise. diff --git a/libs/hwui/Vertex.h b/libs/hwui/Vertex.h index 5b80bbd..fd3845d 100644 --- a/libs/hwui/Vertex.h +++ b/libs/hwui/Vertex.h @@ -19,11 +19,9 @@ #include "Vector.h" -#include <type_traits> +#include "utils/Macros.h" -#define REQUIRE_COMPATIBLE_LAYOUT(TARGET_TYPE) \ - static_assert(std::is_standard_layout<TARGET_TYPE>::value, \ - #TARGET_TYPE " must have standard layout") +#include <type_traits> namespace android { namespace uirenderer { diff --git a/libs/hwui/renderstate/Blend.cpp b/libs/hwui/renderstate/Blend.cpp index c751dba..789f6cc 100644 --- a/libs/hwui/renderstate/Blend.cpp +++ b/libs/hwui/renderstate/Blend.cpp @@ -119,7 +119,7 @@ void Blend::setFactors(GLenum srcMode, GLenum dstMode) { mEnabled = true; } - if (srcMode != mSrcMode || dstMode != mSrcMode) { + if (srcMode != mSrcMode || dstMode != mDstMode) { glBlendFunc(srcMode, dstMode); mSrcMode = srcMode; mDstMode = dstMode; diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index 6394dc1..3953ecd 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp @@ -209,23 +209,25 @@ void RenderState::postDecStrong(VirtualLightRefBase* object) { void RenderState::render(const Glop& glop) { const Glop::Mesh& mesh = glop.mesh; - const Glop::Fill& shader = glop.fill; + const Glop::Fill& fill = glop.fill; - // -------------------------------------------- - // ---------- Shader + uniform setup ---------- - // -------------------------------------------- - mCaches->setProgram(shader.program); + // --------------------------------------------- + // ---------- Program + uniform setup ---------- + // --------------------------------------------- + mCaches->setProgram(fill.program); - Glop::FloatColor color = shader.color; - shader.program->setColor(color.r, color.g, color.b, color.a); + if (fill.colorEnabled) { + fill.program->setColor(fill.color); + } - shader.program->set(glop.transform.ortho, + fill.program->set(glop.transform.ortho, glop.transform.modelView, glop.transform.canvas, glop.transform.fudgingOffset); + // Color filter uniforms if (glop.fill.filterMode == ProgramDescription::kColorBlend) { - const Glop::FloatColor& color = glop.fill.filter.color; + const FloatColor& color = glop.fill.filter.color; glUniform4f(mCaches->program().getUniform("colorBlend"), color.r, color.g, color.b, color.a); } else if (glop.fill.filterMode == ProgramDescription::kColorMatrix) { @@ -235,11 +237,28 @@ void RenderState::render(const Glop& glop) { glop.fill.filter.matrix.vector); } + // Round rect clipping uniforms + if (glop.roundRectClipState) { + // TODO: avoid query, and cache values (or RRCS ptr) in program + const RoundRectClipState* state = glop.roundRectClipState; + const Rect& innerRect = state->innerRect; + glUniform4f(fill.program->getUniform("roundRectInnerRectLTRB"), + innerRect.left, innerRect.top, + innerRect.right, innerRect.bottom); + glUniformMatrix4fv(fill.program->getUniform("roundRectInvTransform"), + 1, GL_FALSE, &state->matrix.data[0]); + + // add half pixel to round out integer rect space to cover pixel centers + float roundedOutRadius = state->radius + 0.5f; + glUniform1f(fill.program->getUniform("roundRectRadius"), + roundedOutRadius); + } + // -------------------------------- // ---------- Mesh setup ---------- // -------------------------------- // vertices - bool force = meshState().bindMeshBufferInternal(mesh.vertexBufferObject) + const bool force = meshState().bindMeshBufferInternal(mesh.vertexBufferObject) || (mesh.vertices != nullptr); meshState().bindPositionVertexPointer(force, mesh.vertices, mesh.stride); @@ -247,19 +266,26 @@ void RenderState::render(const Glop& glop) { meshState().bindIndicesBufferInternal(mesh.indexBufferObject); if (mesh.vertexFlags & kTextureCoord_Attrib) { - // TODO: support textures - LOG_ALWAYS_FATAL("textures not yet supported"); + // TODO: to support shaders, increment texture unit + mCaches->textureState().activateTexture(0); + + glop.fill.texture->setWrap(GL_CLAMP_TO_EDGE, true); + glop.fill.texture->setFilter(glop.fill.textureFilter, true); + + mCaches->textureState().bindTexture(fill.texture->id); + meshState().enableTexCoordsVertexArray(); + meshState().bindTexCoordsVertexPointer(force, mesh.texCoordOffset); } else { meshState().disableTexCoordsVertexArray(); } if (mesh.vertexFlags & kColor_Attrib) { LOG_ALWAYS_FATAL("color vertex attribute not yet supported"); - // TODO: enable color, disable when done + // TODO: enable color attribute, disable when done } int alphaSlot = -1; if (mesh.vertexFlags & kAlpha_Attrib) { const void* alphaCoords = ((const GLbyte*) glop.mesh.vertices) + kVertexAlphaOffset; - alphaSlot = shader.program->getAttrib("vtxAlpha"); + alphaSlot = fill.program->getAttrib("vtxAlpha"); glEnableVertexAttribArray(alphaSlot); glVertexAttribPointer(alphaSlot, 1, GL_FLOAT, GL_FALSE, kAlphaVertexStride, alphaCoords); } @@ -275,7 +301,7 @@ void RenderState::render(const Glop& glop) { if (mesh.indexBufferObject == meshState().getQuadListIBO()) { // Since the indexed quad list is of limited length, we loop over // the glDrawXXX method while updating the vertex pointer - GLsizei elementsCount = mesh.vertexCount; + GLsizei elementsCount = mesh.elementCount; const GLbyte* vertices = static_cast<const GLbyte*>(mesh.vertices); while (elementsCount > 0) { GLsizei drawCount = MathUtils::min(elementsCount, (GLsizei) kMaxNumberOfQuads * 6); @@ -287,9 +313,9 @@ void RenderState::render(const Glop& glop) { vertices += (drawCount / 6) * 4 * mesh.stride; } } else if (mesh.indexBufferObject || mesh.indices) { - glDrawElements(mesh.primitiveMode, mesh.vertexCount, GL_UNSIGNED_SHORT, mesh.indices); + glDrawElements(mesh.primitiveMode, mesh.elementCount, GL_UNSIGNED_SHORT, mesh.indices); } else { - glDrawArrays(mesh.primitiveMode, 0, mesh.vertexCount); + glDrawArrays(mesh.primitiveMode, 0, mesh.elementCount); } // ----------------------------------- diff --git a/libs/hwui/utils/Macros.h b/libs/hwui/utils/Macros.h index fe43fdb..eae73a9 100644 --- a/libs/hwui/utils/Macros.h +++ b/libs/hwui/utils/Macros.h @@ -29,4 +29,8 @@ friend inline int compare_type(const Type& lhs, const Type& rhs) { return lhs.compare(rhs); } \ friend inline hash_t hash_type(const Type& entry) { return entry.hash(); } +#define REQUIRE_COMPATIBLE_LAYOUT(Type) \ + static_assert(std::is_standard_layout<Type>::value, \ + #Type " must have standard layout") + #endif /* MACROS_H */ diff --git a/libs/hwui/utils/PaintUtils.h b/libs/hwui/utils/PaintUtils.h index 679e2bf..1a5cbf8 100644 --- a/libs/hwui/utils/PaintUtils.h +++ b/libs/hwui/utils/PaintUtils.h @@ -37,6 +37,13 @@ public: return resultMode; } + static inline GLenum getFilter(const SkPaint* paint) { + if (!paint || paint->getFilterLevel() != SkPaint::kNone_FilterLevel) { + return GL_LINEAR; + } + return GL_NEAREST; + } + // TODO: move to a method on android:Paint? replace with SkPaint::nothingToDraw()? static inline bool paintWillNotDraw(const SkPaint& paint) { return paint.getAlpha() == 0 diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index ff2c004..5aac06d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1228,6 +1228,7 @@ public class SettingsProvider extends ContentProvider { && whereArgs.length == 1) { name = whereArgs[0]; table = computeTableForSetting(uri, name); + return; } else if (where != null && (WHERE_PATTERN_NO_PARAM_NO_BRACKETS.matcher(where).matches() || WHERE_PATTERN_NO_PARAM_IN_BRACKETS.matcher(where).matches())) { @@ -1237,30 +1238,35 @@ public class SettingsProvider extends ContentProvider { where.lastIndexOf("\"")); name = where.substring(startIndex, endIndex); table = computeTableForSetting(uri, name); + return; } else if (supportAll && where == null && whereArgs == null) { name = null; table = computeTableForSetting(uri, null); - } else if (uri.getPathSegments().size() == 2 - && where == null && whereArgs == null) { + return; + } + } break; + + case 2: { + if (where == null && whereArgs == null) { name = uri.getPathSegments().get(1); table = computeTableForSetting(uri, name); - } else { - EventLogTags.writeUnsupportedSettingsQuery( - uri.toSafeString(), where, Arrays.toString(whereArgs)); - throw new IllegalArgumentException("Only null where and args" - + " or name=? where and a single arg or name='SOME_SETTING' " - + "are supported uri: " + uri + " where: " + where + " args: " - + Arrays.toString(whereArgs)); + return; } } break; - - default: { - throw new IllegalArgumentException("Invalid URI: " + uri); - } } + + EventLogTags.writeUnsupportedSettingsQuery( + uri.toSafeString(), where, Arrays.toString(whereArgs)); + String message = String.format( "Supported SQL:\n" + + " uri content://some_table/some_property with null where and where args\n" + + " uri content://some_table with query name=? and single name as arg\n" + + " uri content://some_table with query name=some_name and null args\n" + + " but got - uri:%1s, where:%2s whereArgs:%3s", uri, where, + Arrays.toString(whereArgs)); + throw new IllegalArgumentException(message); } - public static String computeTableForSetting(Uri uri, String name) { + private static String computeTableForSetting(Uri uri, String name) { String table = getValidTableOrThrow(uri); if (name != null) { diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index e63d220..833638c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -275,7 +275,8 @@ final class SettingsState { if (newSize > mMaxBytesPerAppPackage) { throw new IllegalStateException("You are adding too many system settings. " - + "You should stop using system settings for app specific data."); + + "You should stop using system settings for app specific data" + + " package: " + packageName); } if (DEBUG) { diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java index f713c33..8473db4 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java @@ -136,16 +136,27 @@ abstract class BaseSettingsProviderTest extends AndroidTestCase { } protected String queryStringViaProviderApi(int type, String name) { - return queryStringViaProviderApi(type, name, false); + return queryStringViaProviderApi(type, name, false, false); } - protected String queryStringViaProviderApi(int type, String name, boolean queryStringInQuotes) { - Uri uri = getBaseUriForType(type); - - String queryString = queryStringInQuotes ? "(name=?)" : "name=?"; + protected String queryStringViaProviderApi(int type, String name, boolean queryStringInQuotes, + boolean appendNameToUri) { + final Uri uri; + final String queryString; + final String[] queryArgs; + + if (appendNameToUri) { + uri = Uri.withAppendedPath(getBaseUriForType(type), name); + queryString = null; + queryArgs = null; + } else { + uri = getBaseUriForType(type); + queryString = queryStringInQuotes ? "(name=?)" : "name=?"; + queryArgs = new String[]{name}; + } Cursor cursor = getContext().getContentResolver().query(uri, NAME_VALUE_COLUMNS, - queryString, new String[]{name}, null); + queryString, queryArgs, null); if (cursor == null) { return null; diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java index cbfcbf5..b89fb10 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java @@ -184,6 +184,28 @@ public class SettingsProviderTest extends BaseSettingsProviderTest { doTestQueryStringInBracketsViaProviderApiForType(SETTING_TYPE_SYSTEM); } + public void testQueryStringWithAppendedNameToUriViaProviderApi() throws Exception { + // Make sure we have a clean slate. + deleteStringViaProviderApi(SETTING_TYPE_SYSTEM, FAKE_SETTING_NAME); + + try { + // Insert the setting. + final Uri uri = insertStringViaProviderApi(SETTING_TYPE_SYSTEM, FAKE_SETTING_NAME, + FAKE_SETTING_VALUE, false); + Uri expectUri = Uri.withAppendedPath(getBaseUriForType(SETTING_TYPE_SYSTEM), + FAKE_SETTING_NAME); + assertEquals("Did not get expected Uri.", expectUri, uri); + + // Make sure the first setting is there. + String firstValue = queryStringViaProviderApi(SETTING_TYPE_SYSTEM, FAKE_SETTING_NAME, + false, true); + assertEquals("Setting must be present", FAKE_SETTING_VALUE, firstValue); + } finally { + // Clean up. + deleteStringViaProviderApi(SETTING_TYPE_SYSTEM, FAKE_SETTING_NAME); + } + } + private void doTestQueryStringInBracketsViaProviderApiForType(int type) { // Make sure we have a clean slate. deleteStringViaProviderApi(type, FAKE_SETTING_NAME); @@ -196,7 +218,7 @@ public class SettingsProviderTest extends BaseSettingsProviderTest { assertEquals("Did not get expected Uri.", expectUri, uri); // Make sure the first setting is there. - String firstValue = queryStringViaProviderApi(type, FAKE_SETTING_NAME, true); + String firstValue = queryStringViaProviderApi(type, FAKE_SETTING_NAME, true, false); assertEquals("Setting must be present", FAKE_SETTING_VALUE, firstValue); } finally { // Clean up. diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 6d3f976..532e1b7 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -22,9 +22,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:focusable="true" - android:fitsSystemWindows="true" - android:descendantFocusability="afterDescendants"> + android:fitsSystemWindows="true"> <com.android.systemui.statusbar.BackDropView android:id="@+id/backdrop" @@ -45,7 +43,8 @@ <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_behind" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:importantForAccessibility="no" /> <include layout="@layout/status_bar" android:layout_width="match_parent" @@ -82,6 +81,7 @@ <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_in_front" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:importantForAccessibility="no" /> </com.android.systemui.statusbar.phone.StatusBarWindowView> diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 1405fc1..1e3b46b 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -892,11 +892,6 @@ class MountService extends IMountService.Stub // Temporary workaround for http://b/17945169. Slog.d(TAG, "Setting system properties to " + systemLocale + " from mount service"); SystemProperties.set("persist.sys.locale", locale.toLanguageTag()); - - // TODO: Stop setting these properties once we've removed all - // references to them. - SystemProperties.set("persist.sys.language", locale.getLanguage()); - SystemProperties.set("persist.sys.country", locale.getCountry()); } /** diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index d1b4569..aeacd45 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -31,6 +31,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.res.Configuration; +import android.content.res.Resources; import android.os.BatteryManager; import android.os.Binder; import android.os.Handler; @@ -63,7 +64,7 @@ final class UiModeManagerService extends SystemService { private int mDockState = Intent.EXTRA_DOCK_STATE_UNDOCKED; private int mLastBroadcastState = Intent.EXTRA_DOCK_STATE_UNDOCKED; - int mNightMode = UiModeManager.MODE_NIGHT_NO; + private int mNightMode = UiModeManager.MODE_NIGHT_NO; private boolean mCarModeEnabled = false; private boolean mCharging = false; @@ -157,6 +158,7 @@ final class UiModeManagerService extends SystemService { public void onStart() { final Context context = getContext(); mTwilightManager = getLocalService(TwilightManager.class); + final PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); mWakeLock = powerManager.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG); @@ -168,20 +170,23 @@ final class UiModeManagerService extends SystemService { mConfiguration.setToDefaults(); - mDefaultUiModeType = context.getResources().getInteger( + final Resources res = context.getResources(); + mDefaultUiModeType = res.getInteger( com.android.internal.R.integer.config_defaultUiModeType); - mCarModeKeepsScreenOn = (context.getResources().getInteger( + mCarModeKeepsScreenOn = (res.getInteger( com.android.internal.R.integer.config_carDockKeepsScreenOn) == 1); - mDeskModeKeepsScreenOn = (context.getResources().getInteger( + mDeskModeKeepsScreenOn = (res.getInteger( com.android.internal.R.integer.config_deskDockKeepsScreenOn) == 1); - mTelevision = context.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_TELEVISION) || - context.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_LEANBACK); - mWatch = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH); + final PackageManager pm = context.getPackageManager(); + mTelevision = pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION) + || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK); + mWatch = pm.hasSystemFeature(PackageManager.FEATURE_WATCH); + + final int defaultNightMode = res.getInteger( + com.android.internal.R.integer.config_defaultNightMode); mNightMode = Settings.Secure.getInt(context.getContentResolver(), - Settings.Secure.UI_NIGHT_MODE, UiModeManager.MODE_NIGHT_AUTO); + Settings.Secure.UI_NIGHT_MODE, defaultNightMode); mTwilightManager.registerListener(mTwilightListener, mHandler); @@ -245,7 +250,7 @@ final class UiModeManagerService extends SystemService { final long ident = Binder.clearCallingIdentity(); try { synchronized (mLock) { - if (isDoingNightModeLocked() && mNightMode != mode) { + if (mNightMode != mode) { Settings.Secure.putInt(getContext().getContentResolver(), Settings.Secure.UI_NIGHT_MODE, mode); mNightMode = mode; @@ -309,10 +314,6 @@ final class UiModeManagerService extends SystemService { } } - boolean isDoingNightModeLocked() { - return mCarModeEnabled || mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED; - } - void setCarModeLocked(boolean enabled, int flags) { if (mCarModeEnabled != enabled) { mCarModeEnabled = enabled; @@ -354,17 +355,13 @@ final class UiModeManagerService extends SystemService { } else if (isDeskDockState(mDockState)) { uiMode = Configuration.UI_MODE_TYPE_DESK; } - if (mCarModeEnabled) { - if (mNightMode == UiModeManager.MODE_NIGHT_AUTO) { - updateComputedNightModeLocked(); - uiMode |= mComputedNightMode ? Configuration.UI_MODE_NIGHT_YES - : Configuration.UI_MODE_NIGHT_NO; - } else { - uiMode |= mNightMode << 4; - } + + if (mNightMode == UiModeManager.MODE_NIGHT_AUTO) { + updateComputedNightModeLocked(); + uiMode |= mComputedNightMode ? Configuration.UI_MODE_NIGHT_YES + : Configuration.UI_MODE_NIGHT_NO; } else { - // Disabling the car mode clears the night mode. - uiMode = (uiMode & ~Configuration.UI_MODE_NIGHT_MASK) | Configuration.UI_MODE_NIGHT_NO; + uiMode |= mNightMode << 4; } if (LOG) { @@ -618,7 +615,7 @@ final class UiModeManagerService extends SystemService { void updateTwilight() { synchronized (mLock) { - if (isDoingNightModeLocked() && mNightMode == UiModeManager.MODE_NIGHT_AUTO) { + if (mNightMode == UiModeManager.MODE_NIGHT_AUTO) { updateComputedNightModeLocked(); updateLocked(0, 0); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 6c267ea..a437761 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -16402,15 +16402,6 @@ public final class ActivityManagerService extends ActivityManagerNative if (isPersist) { SystemProperties.set("persist.sys.locale", languageTag); - - // These values are *deprecated*, use persist.sys.locale instead. - // - // TODO: Stop setting these values once all code that references - // them has been removed. - SystemProperties.set("persist.sys.language", l.getLanguage()); - SystemProperties.set("persist.sys.country", l.getCountry()); - SystemProperties.set("persist.sys.localevar", l.getVariant()); - mHandler.sendMessage(mHandler.obtainMessage(SEND_LOCALE_TO_MOUNT_DAEMON_MSG, l)); } } diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java index 6e61e41..4e075c3 100644 --- a/services/core/java/com/android/server/display/ColorFade.java +++ b/services/core/java/com/android/server/display/ColorFade.java @@ -37,7 +37,6 @@ import android.opengl.EGLDisplay; import android.opengl.EGLSurface; import android.opengl.GLES20; import android.opengl.GLES11Ext; -import android.util.FloatMath; import android.util.Slog; import android.view.DisplayInfo; import android.view.Surface.OutOfResourcesException; @@ -372,13 +371,13 @@ final class ColorFade { GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT); // Draw the frame. - float one_minus_level = 1 - level; - float cos = FloatMath.cos((float)Math.PI * one_minus_level); - float sign = cos < 0 ? -1 : 1; - float opacity = -FloatMath.pow(one_minus_level, 2) + 1; - float saturation = FloatMath.pow(level, 4); - float scale = (-FloatMath.pow(one_minus_level, 2) + 1) * 0.1f + 0.9f; - float gamma = (0.5f * sign * FloatMath.pow(cos, 2) + 0.5f) * 0.9f + 0.1f; + double one_minus_level = 1 - level; + double cos = Math.cos(Math.PI * one_minus_level); + double sign = cos < 0 ? -1 : 1; + float opacity = (float) -Math.pow(one_minus_level, 2) + 1; + float saturation = (float) Math.pow(level, 4); + float scale = (float) ((-Math.pow(one_minus_level, 2) + 1) * 0.1d + 0.9d); + float gamma = (float) ((0.5d * sign * Math.pow(cos, 2) + 0.5d) * 0.9d + 0.1d); drawFaded(opacity, 1.f / gamma, saturation, scale); if (checkGlErrors("drawFrame")) { return false; |