diff --git a/bintray-upload.gradle b/bintray-upload.gradle deleted file mode 100644 index 62b60264c..000000000 --- a/bintray-upload.gradle +++ /dev/null @@ -1,70 +0,0 @@ -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' - -def siteUrl = 'https://github.com/SimpleMobileTools/Simple-Commons' -def gitUrl = 'https://github.com/SimpleMobileTools/Simple-Commons.git' -group = "com.simplemobiletools" -version = propVersionName - -install { - repositories.mavenInstaller { - pom.project { - packaging 'aar' - name 'Simple Commons' - description = 'Some helper functions, dialogs etc used by multiple simple apps.' - url siteUrl - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id 'tibbi' - name 'Tibor Kaputa' - email 'hello@simplemobiletools.com' - } - } - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -artifacts { - archives sourcesJar -} - -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) - -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - pkg { - repo = "simple-commons" - name = "simple-commons" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - version { - gpg { - sign = true - passphrase = properties.getProperty("bintray.gpg.password") - } - } - } -} diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt index d8a0e0271..351a86db1 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt @@ -125,10 +125,31 @@ class CustomizationActivity : BaseSimpleActivity() { private fun setupThemes() { predefinedThemes.apply { - put(THEME_LIGHT, MyTheme(R.string.light_theme, R.color.theme_light_text_color, R.color.theme_light_background_color, R.color.color_primary, R.color.color_primary)) - put(THEME_DARK, MyTheme(R.string.dark_theme, R.color.theme_dark_text_color, R.color.theme_dark_background_color, R.color.color_primary, R.color.color_primary)) + put( + THEME_LIGHT, + MyTheme( + R.string.light_theme, + R.color.theme_light_text_color, + R.color.theme_light_background_color, + R.color.color_primary, + R.color.color_primary + ) + ) + put( + THEME_DARK, + MyTheme(R.string.dark_theme, R.color.theme_dark_text_color, R.color.theme_dark_background_color, R.color.color_primary, R.color.color_primary) + ) //put(THEME_SOLARIZED, MyTheme(R.string.solarized, R.color.theme_solarized_text_color, R.color.theme_solarized_background_color, R.color.theme_solarized_primary_color)) - put(THEME_DARK_RED, MyTheme(R.string.dark_red, R.color.theme_dark_text_color, R.color.theme_dark_background_color, R.color.theme_dark_red_primary_color, R.color.md_red_700)) + put( + THEME_DARK_RED, + MyTheme( + R.string.dark_red, + R.color.theme_dark_text_color, + R.color.theme_dark_background_color, + R.color.theme_dark_red_primary_color, + R.color.md_red_700 + ) + ) put(THEME_WHITE, MyTheme(R.string.white, R.color.dark_grey, android.R.color.white, android.R.color.white, R.color.color_primary)) put(THEME_BLACK_WHITE, MyTheme(R.string.black_white, android.R.color.white, android.R.color.black, android.R.color.black, R.color.md_grey_black)) put(THEME_CUSTOM, MyTheme(R.string.custom, 0, 0, 0, 0)) @@ -408,11 +429,13 @@ class CustomizationActivity : BaseSimpleActivity() { private fun handleAccentColorLayout() { customization_accent_color_holder.beVisibleIf(curSelectedThemeId == THEME_WHITE || isCurrentWhiteTheme() || curSelectedThemeId == THEME_BLACK_WHITE || isCurrentBlackAndWhiteTheme()) - customization_accent_color_label.text = getString(if (curSelectedThemeId == THEME_WHITE || isCurrentWhiteTheme()) { - R.string.accent_color_white - } else { - R.string.accent_color_black_and_white - }) + customization_accent_color_label.text = getString( + if (curSelectedThemeId == THEME_WHITE || isCurrentWhiteTheme()) { + R.string.accent_color_white + } else { + R.string.accent_color_black_and_white + } + ) } private fun isCurrentWhiteTheme() = curTextColor == DARK_GREY && curPrimaryColor == Color.WHITE && curBackgroundColor == Color.WHITE diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt index c702cd900..70190a94e 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt @@ -14,19 +14,29 @@ import com.simplemobiletools.commons.R import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.views.ColorPickerSquare import kotlinx.android.synthetic.main.dialog_color_picker.view.* +import java.util.* + +private const val RECENT_COLORS_NUMBER = 5 // forked from https://github.com/yukuku/ambilwarna -class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBackground: Boolean = false, showUseDefaultButton: Boolean = false, - val currentColorCallback: ((color: Int) -> Unit)? = null, val callback: (wasPositivePressed: Boolean, color: Int) -> Unit) { - lateinit var viewHue: View - lateinit var viewSatVal: ColorPickerSquare - lateinit var viewCursor: ImageView - lateinit var viewNewColor: ImageView - lateinit var viewTarget: ImageView - lateinit var newHexField: EditText - lateinit var viewContainer: ViewGroup +class ColorPickerDialog( + val activity: Activity, + color: Int, + val removeDimmedBackground: Boolean = false, + showUseDefaultButton: Boolean = false, + val currentColorCallback: ((color: Int) -> Unit)? = null, + val callback: (wasPositivePressed: Boolean, color: Int) -> Unit +) { + var viewHue: View + var viewSatVal: ColorPickerSquare + var viewCursor: ImageView + var viewNewColor: ImageView + var viewTarget: ImageView + var newHexField: EditText + var viewContainer: ViewGroup + private val baseConfig = activity.baseConfig private val currentColorHsv = FloatArray(3) - private val backgroundColor = activity.baseConfig.backgroundColor + private val backgroundColor = baseConfig.backgroundColor private val cornerRadius = activity.getCornerRadius() private var isHueBeingDragged = false private var wasDimmedBackgroundRemoved = false @@ -57,6 +67,7 @@ class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBack true } newHexField.setText(hexCode) + setupRecentColors() } viewHue.setOnTouchListener(OnTouchListener { v, event -> @@ -125,11 +136,11 @@ class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBack } } - val textColor = activity.baseConfig.textColor + val textColor = baseConfig.textColor val builder = AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok) { dialog, which -> confirmNewColor() } - .setNegativeButton(R.string.cancel) { dialog, which -> dialogDismissed() } - .setOnCancelListener { dialogDismissed() } + .setPositiveButton(R.string.ok) { dialog, which -> confirmNewColor() } + .setNegativeButton(R.string.cancel) { dialog, which -> dialogDismissed() } + .setOnCancelListener { dialogDismissed() } if (showUseDefaultButton) { builder.setNeutralButton(R.string.use_default) { dialog, which -> useDefault() } @@ -149,21 +160,57 @@ class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBack } } + private fun View.setupRecentColors() { + val recentColors = baseConfig.colorPickerRecentColors + if (recentColors.isNotEmpty()) { + recent_colors.beVisible() + val squareSize = context.resources.getDimensionPixelSize(R.dimen.colorpicker_hue_width) + recentColors.take(RECENT_COLORS_NUMBER).reversed().forEach { recentColor -> + val recentColorView = ImageView(context) + recentColorView.id = View.generateViewId() + recentColorView.layoutParams = ViewGroup.LayoutParams(squareSize, squareSize) + recentColorView.setFillWithStroke(recentColor, backgroundColor, cornerRadius) + recentColorView.setOnClickListener { newHexField.setText(getHexCode(recentColor)) } + recent_colors.addView(recentColorView) + recent_colors_flow.addView(recentColorView) + } + } + } + private fun dialogDismissed() { callback(false, 0) } private fun confirmNewColor() { val hexValue = newHexField.value - if (hexValue.length == 6) { - callback(true, Color.parseColor("#$hexValue")) + val newColor = if (hexValue.length == 6) { + Color.parseColor("#$hexValue") } else { - callback(true, getColor()) + getColor() } + addRecentColor(newColor) + + callback(true, newColor) } private fun useDefault() { - callback(true, activity.baseConfig.defaultNavigationBarColor) + val defaultColor = baseConfig.defaultNavigationBarColor + addRecentColor(defaultColor) + + callback(true, defaultColor) + } + + private fun addRecentColor(color: Int) { + var recentColors = baseConfig.colorPickerRecentColors + + recentColors.remove(color) + if (recentColors.size >= RECENT_COLORS_NUMBER) { + val numberOfColorsToDrop = recentColors.size - RECENT_COLORS_NUMBER + 1 + recentColors = LinkedList(recentColors.dropLast(numberOfColorsToDrop)) + } + recentColors.addFirst(color) + + baseConfig.colorPickerRecentColors = recentColors } private fun getHexCode(color: Int) = color.toHex().substring(1) diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationDialog.kt index f7e10baa1..bf2821262 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationDialog.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationDialog.kt @@ -16,8 +16,10 @@ import kotlinx.android.synthetic.main.dialog_message.view.* * @param negative negative buttons text ID (optional) * @param callback an anonymous function */ -class ConfirmationDialog(activity: Activity, message: String = "", messageId: Int = R.string.proceed_with_deletion, positive: Int = R.string.yes, - negative: Int = R.string.no, val callback: () -> Unit) { +class ConfirmationDialog( + activity: Activity, message: String = "", messageId: Int = R.string.proceed_with_deletion, positive: Int = R.string.yes, + negative: Int = R.string.no, val cancelOnTouchOutside: Boolean = true, val callback: () -> Unit +) { var dialog: AlertDialog init { @@ -25,13 +27,13 @@ class ConfirmationDialog(activity: Activity, message: String = "", messageId: In view.message.text = if (message.isEmpty()) activity.resources.getString(messageId) else message val builder = AlertDialog.Builder(activity) - .setPositiveButton(positive) { dialog, which -> dialogConfirmed() } + .setPositiveButton(positive) { dialog, which -> dialogConfirmed() } if (negative != 0) builder.setNegativeButton(negative, null) dialog = builder.create().apply { - activity.setupDialogStuff(view, this) + activity.setupDialogStuff(view, this, cancelOnTouchOutside = cancelOnTouchOutside) } } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SelectAlarmSoundDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SelectAlarmSoundDialog.kt index 941285aab..44a5bce84 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SelectAlarmSoundDialog.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SelectAlarmSoundDialog.kt @@ -1,5 +1,6 @@ package com.simplemobiletools.commons.dialogs +import android.content.ActivityNotFoundException import android.content.Intent import android.media.MediaPlayer import android.net.Uri @@ -18,9 +19,11 @@ import com.simplemobiletools.commons.views.MyCompatRadioButton import kotlinx.android.synthetic.main.dialog_select_alarm_sound.view.* import java.util.* -class SelectAlarmSoundDialog(val activity: BaseSimpleActivity, val currentUri: String, val audioStream: Int, val pickAudioIntentId: Int, - val type: Int, val loopAudio: Boolean, val onAlarmPicked: (alarmSound: AlarmSound?) -> Unit, - val onAlarmSoundDeleted: (alarmSound: AlarmSound) -> Unit) { +class SelectAlarmSoundDialog( + val activity: BaseSimpleActivity, val currentUri: String, val audioStream: Int, val pickAudioIntentId: Int, + val type: Int, val loopAudio: Boolean, val onAlarmPicked: (alarmSound: AlarmSound?) -> Unit, + val onAlarmSoundDeleted: (alarmSound: AlarmSound) -> Unit +) { private val ADD_NEW_SOUND_ID = -2 private val view = activity.layoutInflater.inflate(R.layout.dialog_select_alarm_sound, null) @@ -42,13 +45,13 @@ class SelectAlarmSoundDialog(val activity: BaseSimpleActivity, val currentUri: S addYourAlarms() dialog = AlertDialog.Builder(activity) - .setOnDismissListener { mediaPlayer?.stop() } - .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(R.string.cancel, null) - .create().apply { - activity.setupDialogStuff(view, this) - window?.volumeControlStream = audioStream - } + .setOnDismissListener { mediaPlayer?.stop() } + .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this) + window?.volumeControlStream = audioStream + } } private fun addYourAlarms() { @@ -103,11 +106,16 @@ class SelectAlarmSoundDialog(val activity: BaseSimpleActivity, val currentUri: S alarmSound.uri == SILENT -> mediaPlayer?.stop() alarmSound.id == ADD_NEW_SOUND_ID -> { val action = Intent.ACTION_OPEN_DOCUMENT - Intent(action).apply { + val intent = Intent(action).apply { type = "audio/*" - activity.startActivityForResult(this, pickAudioIntentId) flags = flags or Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION } + + try { + activity.startActivityForResult(intent, pickAudioIntentId) + } catch (e: ActivityNotFoundException) { + activity.toast(R.string.no_app_found) + } dialog.dismiss() } else -> try { diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Cursor.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Cursor.kt index 97d7257c5..e6fff35dd 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Cursor.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Cursor.kt @@ -4,10 +4,14 @@ import android.database.Cursor fun Cursor.getStringValue(key: String) = getString(getColumnIndex(key)) +fun Cursor.getStringValueOrNull(key: String) = if (isNull(getColumnIndex(key))) null else getString(getColumnIndex(key)) + fun Cursor.getIntValue(key: String) = getInt(getColumnIndex(key)) fun Cursor.getIntValueOrNull(key: String) = if (isNull(getColumnIndex(key))) null else getInt(getColumnIndex(key)) fun Cursor.getLongValue(key: String) = getLong(getColumnIndex(key)) +fun Cursor.getLongValueOrNull(key: String) = if (isNull(getColumnIndex(key))) null else getLong(getColumnIndex(key)) + fun Cursor.getBlobValue(key: String) = getBlob(getColumnIndex(key)) diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/ImageView.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/ImageView.kt index 12539a6e2..b607568dc 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/ImageView.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/ImageView.kt @@ -10,7 +10,7 @@ fun ImageView.setFillWithStroke(fillColor: Int, backgroundColor: Int, cornerRadi shape = GradientDrawable.RECTANGLE setColor(fillColor) setStroke(2, strokeColor) - setBackgroundDrawable(this) + background = this if (cornerRadiusSize != 0f) { cornerRadius = cornerRadiusSize diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt index 24d4191a3..fe2236344 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt @@ -456,4 +456,9 @@ open class BaseConfig(val context: Context) { var showCallConfirmation: Boolean get() = prefs.getBoolean(SHOW_CALL_CONFIRMATION, false) set(showCallConfirmation) = prefs.edit().putBoolean(SHOW_CALL_CONFIRMATION, showCallConfirmation).apply() + + // color picker last used colors + internal var colorPickerRecentColors: LinkedList + get() = LinkedList(prefs.getString(COLOR_PICKER_RECENT_COLORS, null)?.lines()?.map { it.toInt() } ?: emptyList()) + set(recentColors) = prefs.edit().putString(COLOR_PICKER_RECENT_COLORS, recentColors.joinToString(separator = "\n")).apply() } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt index 8b342266e..52a8764fe 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt @@ -156,6 +156,7 @@ const val DEFAULT_TAB = "default_tab" const val START_NAME_WITH_SURNAME = "start_name_with_surname" const val FAVORITES = "favorites" const val SHOW_CALL_CONFIRMATION = "show_call_confirmation" +internal const val COLOR_PICKER_RECENT_COLORS = "color_picker_recent_colors" // licenses internal const val LICENSE_KOTLIN = 1 diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/models/SimpleContact.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/models/SimpleContact.kt index 071230973..0b4cebbc4 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/models/SimpleContact.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/models/SimpleContact.kt @@ -44,4 +44,24 @@ data class SimpleContact(val rawId: Int, val contactId: Int, var name: String, v false } } + + fun doesHavePhoneNumber(text: String): Boolean { + return if (text.isNotEmpty()) { + val normalizedText = text.normalizePhoneNumber() + if (normalizedText.isEmpty()) { + phoneNumbers.any { phoneNumber -> + phoneNumber == text + } + } else { + phoneNumbers.any { phoneNumber -> + PhoneNumberUtils.compare(phoneNumber.normalizePhoneNumber(), normalizedText) || + phoneNumber == text || + phoneNumber.normalizePhoneNumber() == normalizedText || + phoneNumber == normalizedText + } + } + } else { + false + } + } } diff --git a/commons/src/main/res/drawable-hdpi/ic_pin.png b/commons/src/main/res/drawable-hdpi/ic_pin.png new file mode 100644 index 000000000..a535b3ee2 Binary files /dev/null and b/commons/src/main/res/drawable-hdpi/ic_pin.png differ diff --git a/commons/src/main/res/drawable-hdpi/ic_unpin.png b/commons/src/main/res/drawable-hdpi/ic_unpin.png new file mode 100644 index 000000000..91845ba74 Binary files /dev/null and b/commons/src/main/res/drawable-hdpi/ic_unpin.png differ diff --git a/commons/src/main/res/drawable-xhdpi/ic_pin.png b/commons/src/main/res/drawable-xhdpi/ic_pin.png new file mode 100644 index 000000000..a18e7dda5 Binary files /dev/null and b/commons/src/main/res/drawable-xhdpi/ic_pin.png differ diff --git a/commons/src/main/res/drawable-xhdpi/ic_unpin.png b/commons/src/main/res/drawable-xhdpi/ic_unpin.png new file mode 100644 index 000000000..fee0ef4bc Binary files /dev/null and b/commons/src/main/res/drawable-xhdpi/ic_unpin.png differ diff --git a/commons/src/main/res/drawable-xxhdpi/ic_pin.png b/commons/src/main/res/drawable-xxhdpi/ic_pin.png new file mode 100644 index 000000000..6067d4dcf Binary files /dev/null and b/commons/src/main/res/drawable-xxhdpi/ic_pin.png differ diff --git a/commons/src/main/res/drawable-xxhdpi/ic_unpin.png b/commons/src/main/res/drawable-xxhdpi/ic_unpin.png new file mode 100644 index 000000000..e5936d1c4 Binary files /dev/null and b/commons/src/main/res/drawable-xxhdpi/ic_unpin.png differ diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_pin.png b/commons/src/main/res/drawable-xxxhdpi/ic_pin.png new file mode 100644 index 000000000..a7cd80df6 Binary files /dev/null and b/commons/src/main/res/drawable-xxxhdpi/ic_pin.png differ diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_unpin.png b/commons/src/main/res/drawable-xxxhdpi/ic_unpin.png new file mode 100644 index 000000000..94f5fa49a Binary files /dev/null and b/commons/src/main/res/drawable-xxxhdpi/ic_unpin.png differ diff --git a/commons/src/main/res/layout/dialog_color_picker.xml b/commons/src/main/res/layout/dialog_color_picker.xml index ca278a941..0651cbcb8 100644 --- a/commons/src/main/res/layout/dialog_color_picker.xml +++ b/commons/src/main/res/layout/dialog_color_picker.xml @@ -1,5 +1,6 @@ + + + + + + النمط السلسلة التي تريد إضافتها %Y - سنة\n%M - شهر\n%D - يوم\n%h - ساعة\n%m - دقيقة\n%s - ثانية\n%i - الرقم يزداد من 1 + Filename (without .txt) + Filename (without .json) نسخ diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml index 78e2af55c..7786eb60f 100644 --- a/commons/src/main/res/values-az/strings.xml +++ b/commons/src/main/res/values-az/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Kopyala diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml index 736a125cb..911c6a6d2 100644 --- a/commons/src/main/res/values-br/strings.xml +++ b/commons/src/main/res/values-br/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Copy diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml index 46ed57c3b..e5d0edcdc 100644 --- a/commons/src/main/res/values-ca/strings.xml +++ b/commons/src/main/res/values-ca/strings.xml @@ -104,6 +104,8 @@ Patró Cadena per afegir %Y - any\n%M - mes\n%D - dia\n%h - hora\n%m - minut\n%s - segon\n%i - nombre augmentant des de 1 + Nom del fitxer (sense .txt) + Nom del fitxer (sense .json) Copiar diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml index 3beed9d13..64442bcc3 100644 --- a/commons/src/main/res/values-cs/strings.xml +++ b/commons/src/main/res/values-cs/strings.xml @@ -104,6 +104,8 @@ Vzor Přidat řetězec %Y - rok\n%M - měsíc\n%D - den\n%h - hodina\n%m - minuta\n%s - sekunda\n%i - číslo narůstající od 1 + Filename (without .txt) + Filename (without .json) Kopírovat diff --git a/commons/src/main/res/values-cy/strings.xml b/commons/src/main/res/values-cy/strings.xml index e6ff86ca8..ccb0efdde 100644 --- a/commons/src/main/res/values-cy/strings.xml +++ b/commons/src/main/res/values-cy/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Copïo diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml index d3f3f8a8c..41c266d77 100644 --- a/commons/src/main/res/values-da/strings.xml +++ b/commons/src/main/res/values-da/strings.xml @@ -1,7 +1,7 @@ OK Annuller - Nothing + Intet Senere Gem som Fil gemt @@ -56,8 +56,8 @@ Blokér nummer Blokér numre Blokerede numre - Export blocked numbers - Import blocked numbers + Eksporter blokerede numre + Importer blokerede numre Du skal gøre denne app til standardopkaldsappen for at gøre brug af blokerede numre. Gør til standard Er du sikker på at du vil blokere \"%s\"? @@ -104,6 +104,8 @@ Mønster Tekststreng der skal tilføjes %Y - år\n%M - måned\n%D - dag\n%h - time\n%m - minut\n%s - sekund\n%i - tal stigende fra 1 + Filenavn (uden .txt) + Filenavn (uden .json) Kopier @@ -292,7 +294,7 @@ Navn Størrelse Senest ændret - Date created + Oprettelsesdato Eksponeringsdato Titel Filnavn @@ -317,7 +319,7 @@ Er du sikker på at du vil slette dette? Er du sikker på at du vil flytte dette til papirkurven? Spørg ikke igen i denne session - Do not show again + Vis ikke dette igen Ja Nej Måske @@ -341,8 +343,8 @@ Fingeraftryk Tilføj fingeraftryk Sæt din finger på sensoren - Open biometric ID verification dialog - Authenticate + Åbn dialogboksen til verifikation af biometrisk ID + Godkend Godkendelsen fejlede Godkendelse blokeret, prøv igen om lidt Du har ingen registrerede fingeraftryk, tilføj nogle i indstillingerne på din enhed diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml index 3f80e4bd6..1cf921a78 100644 --- a/commons/src/main/res/values-de/strings.xml +++ b/commons/src/main/res/values-de/strings.xml @@ -104,6 +104,8 @@ Muster Text zum Hinzufügen %Y - Jahr\n%M - Monat\n%D - Tag\n%h - Stunde\n%m - Minute\n%s - Sekunde\n%i - Aufsteigender Index, beginnt bei 1 + Filename (without .txt) + Filename (without .json) Kopieren diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml index 75e2ebeb8..2e592e223 100644 --- a/commons/src/main/res/values-el/strings.xml +++ b/commons/src/main/res/values-el/strings.xml @@ -104,6 +104,8 @@ Μοτίβο Συμβολοσειρά για προσθήκη %Y - έτος\n%M - μήνας\n%D - ημέρα\n%h - ώρα\n%m - λεπτό\n%s - δευτ/το\n%i - αύξηση αριθμού από 1 + Όνομα αρχείου (χωρίς .txt) + Όνομα αρχείου (χωρίς .json) Αντιγραφή @@ -337,7 +339,7 @@ Εισαγωγή μοτίβου Λάθος μοτίβο Επανάληψη μοτίβου - Biometrics + Βιομετρικά Δακτυλικό αποτύπωμα Προσθήκη δακτυλικού αποτυπώματος Παρακαλώ τοποθετήστε το δάκτυλό σας στον αισθητήρα δακτυλικών αποτυπωμάτων @@ -518,7 +520,7 @@ Μικρό Μεσαίο Μεγάλο - Πολύ Μεγάλο + Τεράστιο Κωδικός προστασίας προβολής κρυφών στοιχείων Κωδικός προστασίας ολόκληρης της εφαρμογής Προστασία με κωδικό για διαγραφή ή μετακίνηση @@ -575,7 +577,7 @@ Ο Κάδος Ανακύκλωσης άδειασε επιτυχώς Τα αρχεία επαναφέρθηκαν επιτυχώς Σίγουρα θέλετε να αδειάσετε τον Κάδο Ανακύκλωσης; Τα αρχεία θα χαθούν οριστικά. - Ο Κάδος Ανακύκλωσης είναι κενός + Ο Κάδος Ανακύκλωσης είναι άδειος Η μετακίνηση στον Κάδο είναι ανενεργή, χρησιμοποιείστε την Επαναφορά Εμφάνιση Κάδου Ανακύκλωσης Απόκρυψη Κάδου Ανακύκλωσης @@ -700,7 +702,7 @@ Γειά σας,\n\nφαίνεται ότι χρησιμοποιείτε αυτήν την εφαρμογή ήδη για αρκετό καιρό, και το εκτιμούμε πραγματικά.\n\nΑν μπορούμε να σας ζητήσουμε μια χάρη, παρακαλούμε αξιολογήστε μας στο Google Play. Αυτό θα μας βοηθούσε πολύ.\n\nΑνεξάρτητα τι αποφασίσατε, δεν θα εμφανιστεί ξανά αυτό το μήνυμα.\n\nΕυχαριστούμε! Βαθμολογήστε την εφαρμογή μας παρακαλώ :) Σας Ευχαριστούμε - Το widget είναι κλειδωμένο.\nΠαρακαλώ αναβαθμίστε σε Pro έκδοση, για να το ξεκλειδώστε το. + Το widget είναι κλειδωμένο.\nΠαρακαλώ αναβαθμίστε σε Pro έκδοση, για να το ξεκλειδώσετε. Παρακαλώ αγοράστε το Simple Thank You για να το ξεκλειδώσετε. @@ -822,7 +824,7 @@ Λίστες ελέγχου - Διαφορετική σημείωση και χρώματα ανά γραφικό συστατικό + Διαφορετική σημείωση και χρώματα ανά γραφικό στοιχείο Κλείδωμα Σημείωσης diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml index 8ef7c4905..66f4d2a9b 100644 --- a/commons/src/main/res/values-es/strings.xml +++ b/commons/src/main/res/values-es/strings.xml @@ -104,6 +104,8 @@ Modelo Cadena para agregar %Y - Año\n%M - Mes\n%D - Día\n%h - Hora\n%m - Minuto\n%s - Segundo\n%i - número aumentando desde 1 + Filename (without .txt) + Filename (without .json) Copiar diff --git a/commons/src/main/res/values-eu/strings.xml b/commons/src/main/res/values-eu/strings.xml index 894390cc4..6fb06ec61 100644 --- a/commons/src/main/res/values-eu/strings.xml +++ b/commons/src/main/res/values-eu/strings.xml @@ -104,6 +104,8 @@ Eredua Gehitzeko katea %Y - urtea\n%M - hilabetea\n%D - eguna\n%h - ordua\n%m - minutua\n%s - segundoa\n%i - 1 baino gehiago den zenbakia + Filename (without .txt) + Filename (without .json) Kopiatu diff --git a/commons/src/main/res/values-fa/strings.xml b/commons/src/main/res/values-fa/strings.xml index 97499880d..a3ea2e70f 100644 --- a/commons/src/main/res/values-fa/strings.xml +++ b/commons/src/main/res/values-fa/strings.xml @@ -104,6 +104,8 @@ الگو رشته برای افزودن %Y - سال\n%M - ماه\n%D - روز\n%h - ساعت\n%m - دقیقه\n%s - ثانیه\n%i - افزایش اعداد با شروع از 1 + Filename (without .txt) + Filename (without .json) رونوشت diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml index 29ab0bb5f..74e2c2442 100644 --- a/commons/src/main/res/values-fi/strings.xml +++ b/commons/src/main/res/values-fi/strings.xml @@ -104,6 +104,8 @@ Kuvio Lisättävä merkkijono %Y - vuosi\n%M - kuukausi\n%D - päivä\n%h - tunti\n%m - minuutti\n%s - sekunti\n%i - nouseva numero, alkaen numerosta 1 + Tiedostonimi (ilman .txt-päätettä) + Tiedostonimi (ilman .json-päätettä) Kopioi diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml index 659e822b9..93918c2f0 100644 --- a/commons/src/main/res/values-fr/strings.xml +++ b/commons/src/main/res/values-fr/strings.xml @@ -104,6 +104,8 @@ Modèle Caractères à ajouter %Y - année\n%M - mois\n%D - jour\n%h - heure\n%m - minute\n%s - seconde\n%i - Incrémentation débute à 1 + Filename (without .txt) + Filename (without .json) Copier diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml index 745932680..2526cc81d 100644 --- a/commons/src/main/res/values-gl/strings.xml +++ b/commons/src/main/res/values-gl/strings.xml @@ -104,6 +104,8 @@ Patrón Cadea a engadir %Y - ano\n%M - mes\n%D - día\n%h - hora\n%m - minuto\n%s - segundo\n%i - número incremental desde 1 + Filename (without .txt) + Filename (without .json) Copiar diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml index f60cd32dc..85d83d70d 100644 --- a/commons/src/main/res/values-hi-rIN/strings.xml +++ b/commons/src/main/res/values-hi-rIN/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Copy diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml index 3099b8c04..1544c2afd 100644 --- a/commons/src/main/res/values-hr/strings.xml +++ b/commons/src/main/res/values-hr/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Kopiraj diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml index c6bde7493..d53461fd1 100644 --- a/commons/src/main/res/values-hu/strings.xml +++ b/commons/src/main/res/values-hu/strings.xml @@ -104,6 +104,8 @@ Minta String to add %É - év\n%H - hónap\n%N - nap\n%ó - óra\n%p - perc\n%mp - másodperc\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Másolás diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml index 40ba04302..cf36d0436 100644 --- a/commons/src/main/res/values-id/strings.xml +++ b/commons/src/main/res/values-id/strings.xml @@ -104,6 +104,8 @@ Pola Kata untuk ditambahkan %Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik\n%i - angka bertambah mulai dari 1 + Filename (without .txt) + Filename (without .json) Salin diff --git a/commons/src/main/res/values-in/strings.xml b/commons/src/main/res/values-in/strings.xml index a0ac8bf96..5c19f5d99 100644 --- a/commons/src/main/res/values-in/strings.xml +++ b/commons/src/main/res/values-in/strings.xml @@ -104,6 +104,8 @@ Pola Kata untuk ditambahkan %Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik\n%i - angka bertambah mulai dari 1 + Filename (without .txt) + Filename (without .json) Salin diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml index f2653c541..7b697bbab 100644 --- a/commons/src/main/res/values-it/strings.xml +++ b/commons/src/main/res/values-it/strings.xml @@ -104,6 +104,8 @@ Modello Stringa da aggiungere %Y - anno\n%M - mese\n%D - giorno\n%h - ora\n%m - minuto\n%s - secondo\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Copia diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml index 523f3a137..8f970954f 100644 --- a/commons/src/main/res/values-iw/strings.xml +++ b/commons/src/main/res/values-iw/strings.xml @@ -104,6 +104,8 @@ דפוס מחרוזת להוספה %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) העתק diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml index 77f1f9fbf..5ecc0313c 100644 --- a/commons/src/main/res/values-ja/strings.xml +++ b/commons/src/main/res/values-ja/strings.xml @@ -104,6 +104,8 @@ パターン 追加する文字列 %Y - 年\n%M - 月\n%D - 日\n%h - 時\n%m - 分\n%s - 秒\n%i - 1から増える数 + Filename (without .txt) + Filename (without .json) コピー diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml index 26d69d019..e3a04e16b 100644 --- a/commons/src/main/res/values-ko-rKR/strings.xml +++ b/commons/src/main/res/values-ko-rKR/strings.xml @@ -104,6 +104,8 @@ 패턴 추가할 문장 %Y - 년\n%M - 월\n%D - 일\n%h - 시\n%m - 분\n%s - 초\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) 복사 diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml index 7a29ff417..15db24f8a 100644 --- a/commons/src/main/res/values-lt/strings.xml +++ b/commons/src/main/res/values-lt/strings.xml @@ -104,6 +104,8 @@ Modelis Pridedama eilutė %Y - metai\n%M - mėnuo\n%D - diena\n%h - valanda\n%m - minutė\n%s - sekundė\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Kopijuoti diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml index 9609f9aa2..9a2510e9b 100644 --- a/commons/src/main/res/values-nb/strings.xml +++ b/commons/src/main/res/values-nb/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Kopier diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml index fb3bb7f2e..a67f5f349 100644 --- a/commons/src/main/res/values-nl/strings.xml +++ b/commons/src/main/res/values-nl/strings.xml @@ -104,6 +104,8 @@ Patroon Tekens toevoegen %Y - jaar\n%M - maand\n%D - dag\n%h - uur\n%m - minuut\n%s - seconde\n%i - getal oplopend vanaf 1 + Bestandsnaam (zonder .txt) + Bestandsnaam (zonder .json) Kopiëren diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml index fc5e27f08..30dca5b19 100644 --- a/commons/src/main/res/values-no/strings.xml +++ b/commons/src/main/res/values-no/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Kopier diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml index 322b6551a..b4549ec3b 100644 --- a/commons/src/main/res/values-pl/strings.xml +++ b/commons/src/main/res/values-pl/strings.xml @@ -104,6 +104,8 @@ Wzór Ciąg do dodania %Y - rok\n%M - miesiąc\n%D - dzień\n%h - godzina\n%m - minuta\n%s - sekunda\n%i - numer rosnący od 1 + Nazwa pliku (bez .txt) + Nazwa pliku (bez .json) Kopiuj diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml index bf73e6e13..a36e35406 100644 --- a/commons/src/main/res/values-pt-rBR/strings.xml +++ b/commons/src/main/res/values-pt-rBR/strings.xml @@ -104,6 +104,8 @@ Padrão Texto a adicionar %Y - ano\n%M - mês\n%D - dia\n%h - hora\n%m - minuto\n%s - segundo\n%i – aumento numérico de 1 + Filename (without .txt) + Filename (without .json) Copiar diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml index 0ae160281..658aabf0f 100644 --- a/commons/src/main/res/values-pt/strings.xml +++ b/commons/src/main/res/values-pt/strings.xml @@ -104,6 +104,8 @@ Padrão Texto a adicionar %Y - ano\n%M - mês\n%D - dia\n%h - horas\n%m - minutos\n%s - segundos\n%i - incremento númerico a partir de 1 + Filename (without .txt) + Filename (without .json) Copiar diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml index 8f6610744..6bcd5a427 100644 --- a/commons/src/main/res/values-ru/strings.xml +++ b/commons/src/main/res/values-ru/strings.xml @@ -103,7 +103,9 @@ Простое переименование Шаблон Строка для добавления - %Y - год\n%M - месяц\n%D - день\n%h - час\n%m - минута\n%s - секунда\n%i - порядковый номер с 1 + %Y — год\n%M — месяц\n%D — день\n%h — час\n%m — минута\n%s — секунда\n%i — порядковый номер с 1 + Имя файла (без .txt) + Имя файла (без .json) Копировать @@ -519,8 +521,8 @@ - Время, оставшееся до срабатывания будильника:\n%s - Время, оставшееся до срабатывания напоминания:\n%s + Время до срабатывания будильника:\n%s + Время до срабатывания напоминания:\n%s Убедитесь, что будильник работает правильно, прежде чем полагаться на него. Он может не работать должным образом из-за системных ограничений, связанных с экономией батареи. Убедитесь, что напоминания работают правильно, прежде чем полагаться на них. Они могут не работать должным образом из-за системных ограничений, связанных с экономией батареи. Уведомления этого приложения отключены. Перейдите в настройки устройства и включите их. diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml index 588d43afe..217db4a40 100644 --- a/commons/src/main/res/values-sk/strings.xml +++ b/commons/src/main/res/values-sk/strings.xml @@ -104,6 +104,8 @@ Vzor Reťazec na pridanie %Y - rok\n%M - mesiac\n%D - deň\n%h - hodina\n%m - minúta\n%s - sekunda\n%i - číslo narastajúce od 1 + Názov súboru (bez .txt) + Názov súboru (bez .json) Kopírovať diff --git a/commons/src/main/res/values-sl/strings.xml b/commons/src/main/res/values-sl/strings.xml index 8bfbc02c5..3b5071f62 100644 --- a/commons/src/main/res/values-sl/strings.xml +++ b/commons/src/main/res/values-sl/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Kopiraj diff --git a/commons/src/main/res/values-sr/strings.xml b/commons/src/main/res/values-sr/strings.xml index 2e933983a..1264b0497 100644 --- a/commons/src/main/res/values-sr/strings.xml +++ b/commons/src/main/res/values-sr/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Копирај diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml index ca7b3517b..d618931e6 100644 --- a/commons/src/main/res/values-sv/strings.xml +++ b/commons/src/main/res/values-sv/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - år\n%M - månad\n%D - dag\n%h - timme\n%m - minut\n%s - sekund\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Kopiera diff --git a/commons/src/main/res/values-ta/strings.xml b/commons/src/main/res/values-ta/strings.xml index a1c9c1ec1..6e732d2df 100644 --- a/commons/src/main/res/values-ta/strings.xml +++ b/commons/src/main/res/values-ta/strings.xml @@ -104,6 +104,8 @@ முறை சேர்க்க வேண்டிய சரம் %Y - ஆண்டு\n%M - மாதம்\n%D - நாள்\n%h - மணி\n%m - நிமிடம்\n%s - விநாடிகள்\n%i - 1 இலிருந்து அதிகரிக்கும் எண் + Filename (without .txt) + Filename (without .json) நகலெடுக்கவும் diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml index e73871e77..c20cdd222 100644 --- a/commons/src/main/res/values-tr/strings.xml +++ b/commons/src/main/res/values-tr/strings.xml @@ -104,6 +104,8 @@ Desen Eklenecek dize %Y - yıl\n%M - ay\n%D - gün\n%h - saat\n%m - dakika\n%s - saniye\n%i - 1\'den artan sayı + Filename (without .txt) + Filename (without .json) Kopyala diff --git a/commons/src/main/res/values-uk/strings.xml b/commons/src/main/res/values-uk/strings.xml index d169351ac..4afff8b1d 100644 --- a/commons/src/main/res/values-uk/strings.xml +++ b/commons/src/main/res/values-uk/strings.xml @@ -104,6 +104,8 @@ Шаблон Рядок для додавання %Y - рік\n%M - місяць\n%D - день\n%h - година\n%m - хвилина\n%s - секунда\n%i - номер від 1 + Filename (without .txt) + Filename (without .json) Копіювати diff --git a/commons/src/main/res/values-vi/strings.xml b/commons/src/main/res/values-vi/strings.xml index 2ec743de2..75e17c40f 100644 --- a/commons/src/main/res/values-vi/strings.xml +++ b/commons/src/main/res/values-vi/strings.xml @@ -104,6 +104,8 @@ Mẫu Chuỗi để thêm %Y - năm\n%M - tháng\n%D - ngày\n%h - giờ\n%m - phút\n%s - giây\n%i - số tăng từ 1 + Filename (without .txt) + Filename (without .json) Sao chép diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml index 83bba9e30..aa5e722e9 100644 --- a/commons/src/main/res/values-zh-rCN/strings.xml +++ b/commons/src/main/res/values-zh-rCN/strings.xml @@ -104,6 +104,8 @@ 图案 要添加的字符串 %Y - 年\n%M - 月\n%D - 日\n%h - 时\n%m - 分\n%s - 秒\n%i - 数字从1递增 + Filename (without .txt) + Filename (without .json) 复制 diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml index 7aba08679..43ab86391 100644 --- a/commons/src/main/res/values-zh-rTW/strings.xml +++ b/commons/src/main/res/values-zh-rTW/strings.xml @@ -104,6 +104,8 @@ 格式重新命名 添加文字 %Y - 年\n%M - 月\n%D - 日\n%h - 小時\n%m - 分鐘\n%s - 秒鐘\n%i - 數字從1增加起 + Filename (without .txt) + Filename (without .json) 複製 diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml index 51eb2043c..38811b62f 100644 --- a/commons/src/main/res/values/strings.xml +++ b/commons/src/main/res/values/strings.xml @@ -104,6 +104,8 @@ Pattern String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second\n%i - number increasing from 1 + Filename (without .txt) + Filename (without .json) Copy diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 000000000..adb3fe10c --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk11