From 29840f66c79363753f18d6bae93601298e108dc0 Mon Sep 17 00:00:00 2001 From: Anderson Mesquita Date: Fri, 18 Sep 2020 10:55:47 -0400 Subject: [PATCH 1/8] Switch isSwapTime conditional This doesn't change behavior, but makes the variable `isSwapTime` match the value of the checkbox state (`cbSwapTimeDate.isChecked()`). Now, both of them will be either `true` or `false` together, instead of having opposite values. --- .../awais/instagrabber/dialogs/TimeSettingsDialog.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java b/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java index 9a371db2..cf3bf5ee 100755 --- a/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java +++ b/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java @@ -86,11 +86,12 @@ public final class TimeSettingsDialog extends DialogFragment implements AdapterV final String timeStr = String.valueOf(timeSettingsBinding.spTimeFormat.getSelectedItem()); final String dateStr = String.valueOf(timeSettingsBinding.spDateFormat.getSelectedItem()); - final boolean isSwapTime = !timeSettingsBinding.cbSwapTimeDate.isChecked(); + final boolean isSwapTime = timeSettingsBinding.cbSwapTimeDate.isChecked(); + final boolean isBlankSeparator = timeSettingsBinding.spSeparator.getSelectedItemPosition() <= 0; - selectedFormat = (isSwapTime ? timeStr : dateStr) - + (TextUtils.isEmpty(sepStr) || timeSettingsBinding.spSeparator.getSelectedItemPosition() == 0 ? " " : " '" + sepStr + "' ") - + (isSwapTime ? dateStr : timeStr); + selectedFormat = (isSwapTime ? dateStr : timeStr) + + (isBlankSeparator ? " " : " '" + sepStr + "' ") + + (isSwapTime ? timeStr : dateStr); timeSettingsBinding.btnConfirm.setEnabled(true); currentFormat = new SimpleDateFormat(selectedFormat, LocaleUtils.getCurrentLocale()); From 68033cd0ec05915497c887954c4aa747e781a844 Mon Sep 17 00:00:00 2001 From: Anderson Mesquita Date: Wed, 16 Sep 2020 10:10:05 -0400 Subject: [PATCH 2/8] Save "Swap time and date positions" checkbox state Currently, if the user checks the option "Swap time and date positions", leaves the settings modal and returns to it, the option will be unchecked, even though the date and time are, indeed, swapped. This saves the value of the "Swap time and date positions" option so that it will match whatever state the user selected last. Fixes: #165 --- .../instagrabber/dialogs/TimeSettingsDialog.java | 15 ++++++++++++--- .../settings/SettingsPreferencesFragment.java | 6 +++++- .../java/awais/instagrabber/utils/Constants.java | 1 + .../awais/instagrabber/utils/SettingsHelper.java | 3 ++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java b/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java index cf3bf5ee..9958e59c 100755 --- a/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java +++ b/app/src/main/java/awais/instagrabber/dialogs/TimeSettingsDialog.java @@ -34,15 +34,18 @@ public final class TimeSettingsDialog extends DialogFragment implements AdapterV private boolean customDateTimeFormatEnabled; private String customDateTimeFormat; private String dateTimeSelection; + private final boolean swapDateTimeEnabled; private final OnConfirmListener onConfirmListener; public TimeSettingsDialog(final boolean customDateTimeFormatEnabled, final String customDateTimeFormat, final String dateTimeSelection, + final boolean swapDateTimeEnabled, final OnConfirmListener onConfirmListener) { this.customDateTimeFormatEnabled = customDateTimeFormatEnabled; this.customDateTimeFormat = customDateTimeFormat; this.dateTimeSelection = dateTimeSelection; + this.swapDateTimeEnabled = swapDateTimeEnabled; this.onConfirmListener = onConfirmListener; final Calendar instance = GregorianCalendar.getInstance(); instance.set(2020, 5, 22, 8, 17, 13); @@ -55,6 +58,7 @@ public final class TimeSettingsDialog extends DialogFragment implements AdapterV timeSettingsBinding.cbCustomFormat.setOnCheckedChangeListener(this); timeSettingsBinding.cbCustomFormat.setChecked(customDateTimeFormatEnabled); + timeSettingsBinding.cbSwapTimeDate.setChecked(swapDateTimeEnabled); timeSettingsBinding.etCustomFormat.setText(customDateTimeFormat); final String[] dateTimeFormat = dateTimeSelection.split(";"); // output = time;separator;date @@ -146,13 +150,15 @@ public final class TimeSettingsDialog extends DialogFragment implements AdapterV if (v == timeSettingsBinding.btnConfirm) { final Editable etCustomFormatText = timeSettingsBinding.etCustomFormat.getText(); if (onConfirmListener != null) { - onConfirmListener.onConfirm(timeSettingsBinding.cbCustomFormat.isChecked(), + onConfirmListener.onConfirm( + timeSettingsBinding.cbCustomFormat.isChecked(), etCustomFormatText == null ? null : etCustomFormatText.toString(), timeSettingsBinding.spTimeFormat.getSelectedItemPosition(), timeSettingsBinding.spSeparator.getSelectedItemPosition(), timeSettingsBinding.spDateFormat.getSelectedItemPosition(), selectedFormat, - currentFormat); + currentFormat, + timeSettingsBinding.cbSwapTimeDate.isChecked()); } dismiss(); } else if (v == timeSettingsBinding.btnInfo) { @@ -167,7 +173,10 @@ public final class TimeSettingsDialog extends DialogFragment implements AdapterV String formatSelection, int spTimeFormatSelectedItemPosition, int spSeparatorSelectedItemPosition, - int spDateFormatSelectedItemPosition, final String selectedFormat, final SimpleDateFormat currentFormat); + int spDateFormatSelectedItemPosition, + final String selectedFormat, + final SimpleDateFormat currentFormat, + final boolean swapDateTime); } @Override diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/SettingsPreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/SettingsPreferencesFragment.java index 7e108b17..ba3abc9c 100644 --- a/app/src/main/java/awais/instagrabber/fragments/settings/SettingsPreferencesFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/settings/SettingsPreferencesFragment.java @@ -284,12 +284,15 @@ public class SettingsPreferencesFragment extends BasePreferencesFragment { settingsHelper.getBoolean(Constants.CUSTOM_DATE_TIME_FORMAT_ENABLED), settingsHelper.getString(Constants.CUSTOM_DATE_TIME_FORMAT), settingsHelper.getString(Constants.DATE_TIME_SELECTION), + settingsHelper.getBoolean(Constants.SWAP_DATE_TIME_FORMAT_ENABLED), (isCustomFormat, formatSelection, spTimeFormatSelectedItemPosition, spSeparatorSelectedItemPosition, spDateFormatSelectedItemPosition, - selectedFormat, currentFormat) -> { + selectedFormat, + currentFormat, + swapDateTime) -> { if (isCustomFormat) { settingsHelper.putString(Constants.CUSTOM_DATE_TIME_FORMAT, formatSelection); } else { @@ -300,6 +303,7 @@ public class SettingsPreferencesFragment extends BasePreferencesFragment { settingsHelper.putString(Constants.DATE_TIME_SELECTION, formatSelectionUpdated); } settingsHelper.putBoolean(Constants.CUSTOM_DATE_TIME_FORMAT_ENABLED, isCustomFormat); + settingsHelper.putBoolean(Constants.SWAP_DATE_TIME_FORMAT_ENABLED, swapDateTime); Utils.datetimeParser = (SimpleDateFormat) currentFormat.clone(); preference.setSummary(Utils.datetimeParser.format(new Date())); } diff --git a/app/src/main/java/awais/instagrabber/utils/Constants.java b/app/src/main/java/awais/instagrabber/utils/Constants.java index 59251a02..6155fd06 100644 --- a/app/src/main/java/awais/instagrabber/utils/Constants.java +++ b/app/src/main/java/awais/instagrabber/utils/Constants.java @@ -19,6 +19,7 @@ public final class Constants { public static final String AUTOLOAD_POSTS = "autoload_posts"; public static final String SHOW_FEED = "show_feed"; public static final String CUSTOM_DATE_TIME_FORMAT_ENABLED = "data_time_custom_enabled"; + public static final String SWAP_DATE_TIME_FORMAT_ENABLED = "swap_date_time_enabled"; public static final String MARK_AS_SEEN = "mark_as_seen"; public static final String DM_MARK_AS_SEEN = "dm_mark_as_seen"; public static final String INSTADP = "instadp"; diff --git a/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java b/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java index a62dc9a8..aa39823e 100755 --- a/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java +++ b/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java @@ -34,6 +34,7 @@ import static awais.instagrabber.utils.Constants.PREV_INSTALL_VERSION; import static awais.instagrabber.utils.Constants.SHOW_QUICK_ACCESS_DIALOG; import static awais.instagrabber.utils.Constants.SKIPPED_VERSION; import static awais.instagrabber.utils.Constants.STORY_VIEWER; +import static awais.instagrabber.utils.Constants.SWAP_DATE_TIME_FORMAT_ENABLED; public final class SettingsHelper { private final SharedPreferences sharedPreferences; @@ -118,7 +119,7 @@ public final class SettingsHelper { @StringDef({DOWNLOAD_USER_FOLDER, FOLDER_SAVE_TO, AUTOPLAY_VIDEOS, SHOW_QUICK_ACCESS_DIALOG, MUTED_VIDEOS, AUTOLOAD_POSTS, CUSTOM_DATE_TIME_FORMAT_ENABLED, MARK_AS_SEEN, DM_MARK_AS_SEEN, INSTADP, - CHECK_ACTIVITY, CHECK_UPDATES}) + CHECK_ACTIVITY, CHECK_UPDATES, SWAP_DATE_TIME_FORMAT_ENABLED}) public @interface BooleanSettings {} @StringDef({PREV_INSTALL_VERSION}) From 890c4d32d1ef5e957137c3357cb2d52d8fb9f2be Mon Sep 17 00:00:00 2001 From: Anderson Mesquita Date: Fri, 18 Sep 2020 13:40:36 -0400 Subject: [PATCH 3/8] Extract method to get longest cookie This reduces duplication and makes it easier to know what `getCookie` is doing, since all domains are now clustered together and it's easy to see the difference between them.. --- .../awais/instagrabber/utils/CookieUtils.java | 97 ++++++------------- 1 file changed, 30 insertions(+), 67 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/utils/CookieUtils.java b/app/src/main/java/awais/instagrabber/utils/CookieUtils.java index e3e4f800..207f2600 100644 --- a/app/src/main/java/awais/instagrabber/utils/CookieUtils.java +++ b/app/src/main/java/awais/instagrabber/utils/CookieUtils.java @@ -10,6 +10,8 @@ import java.net.CookieStore; import java.net.HttpCookie; import java.net.URI; import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; import awais.instagrabber.BuildConfig; import awaisomereport.LogCollector; @@ -74,79 +76,40 @@ public final class CookieUtils { @Nullable public static String getCookie(@Nullable final String webViewUrl) { - int lastLongestCookieLength = 0; - String mainCookie = null; + final List domains = Arrays.asList( + "https://instagram.com", + "https://instagram.com/", + "http://instagram.com", + "http://instagram.com", + "https://www.instagram.com", + "https://www.instagram.com/", + "http://www.instagram.com", + "http://www.instagram.com/" + ); - String cookie; if (!TextUtils.isEmpty(webViewUrl)) { - cookie = COOKIE_MANAGER.getCookie(webViewUrl); + domains.add(0, webViewUrl); + } + + return getLongestCookie(domains); + } + + @Nullable + private static String getLongestCookie(final List domains) { + int longestLength = 0; + String longestCookie = null; + + for (final String domain : domains) { + final String cookie = COOKIE_MANAGER.getCookie(domain); if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; + final int cookieLength = cookie.length(); + if (cookieLength > longestLength) { + longestCookie = cookie; + longestLength = cookieLength; } } } - cookie = COOKIE_MANAGER.getCookie("https://instagram.com"); - if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; - } - } - cookie = COOKIE_MANAGER.getCookie("https://instagram.com/"); - if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; - } - } - cookie = COOKIE_MANAGER.getCookie("http://instagram.com"); - if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; - } - } - cookie = COOKIE_MANAGER.getCookie("http://instagram.com/"); - if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; - } - } - cookie = COOKIE_MANAGER.getCookie("https://www.instagram.com"); - if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; - } - } - cookie = COOKIE_MANAGER.getCookie("https://www.instagram.com/"); - if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; - } - } - cookie = COOKIE_MANAGER.getCookie("http://www.instagram.com"); - if (cookie != null) { - final int cookieLen = cookie.length(); - if (cookieLen > lastLongestCookieLength) { - mainCookie = cookie; - lastLongestCookieLength = cookieLen; - } - } - cookie = COOKIE_MANAGER.getCookie("http://www.instagram.com/"); - if (cookie != null && cookie.length() > lastLongestCookieLength) mainCookie = cookie; - return mainCookie; + return longestCookie; } } From dd0f1e397c849cf06a2a61c2967bb0a71ca0833d Mon Sep 17 00:00:00 2001 From: Anderson Mesquita Date: Fri, 18 Sep 2020 13:48:40 -0400 Subject: [PATCH 4/8] Extract method to get cookie value Currently, trying to get a `csrftoken` from an empty cookie string will crash the application. This creates a helper method to extract a cookie value given a cookie name by pattern matching on the cookie string and returning the value if one is found. Fixes: #167 --- .../awais/instagrabber/utils/CookieUtils.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/utils/CookieUtils.java b/app/src/main/java/awais/instagrabber/utils/CookieUtils.java index 207f2600..17c43e2b 100644 --- a/app/src/main/java/awais/instagrabber/utils/CookieUtils.java +++ b/app/src/main/java/awais/instagrabber/utils/CookieUtils.java @@ -12,6 +12,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Arrays; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import awais.instagrabber.BuildConfig; import awaisomereport.LogCollector; @@ -56,22 +58,23 @@ public final class CookieUtils { } @Nullable - public static String getUserIdFromCookie(final String cookie) { - if (!TextUtils.isEmpty(cookie)) { - final int uidIndex = cookie.indexOf("ds_user_id="); - if (uidIndex > 0) { - String uid = cookie.split("ds_user_id=")[1].split(";")[0]; - return !TextUtils.isEmpty(uid) ? uid : null; - } - } - return null; + public static String getUserIdFromCookie(final String cookies) { + return getCookieValue(cookies, "ds_user_id"); } - public static String getCsrfTokenFromCookie(final String cookie) { - if (cookie == null) { - return null; + @Nullable + public static String getCsrfTokenFromCookie(final String cookies) { + return getCookieValue(cookies, "csrftoken"); + } + + @Nullable + private static String getCookieValue(final String cookies, final String name) { + final Pattern pattern = Pattern.compile(name + "=(.+?);"); + final Matcher matcher = pattern.matcher(cookies); + if (matcher.find()) { + return matcher.group(1); } - return cookie.split("csrftoken=")[1].split(";")[0]; + return null; } @Nullable From 5e302abc8385717e55b46378a70bcd7dfd6ecde3 Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sat, 19 Sep 2020 22:54:20 -0400 Subject: [PATCH 5/8] add @andersonvom to contributors Co-Authored-By: Anderson Mesquita --- .all-contributorsrc | 23 ++++++++++++----------- README.md | 6 +++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 04d554bf..c0f4f8aa 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -31,6 +31,16 @@ "question" ] }, + { + "login": "andersonvom", + "name": "Anderson Mesquita", + "avatar_url": "https://avatars3.githubusercontent.com/u/69922?v=4", + "profile": "https://github.com/andersonvom", + "contributions": [ + "code", + "bug" + ] + }, { "login": "AwaisKing", "name": "AWAiS", @@ -47,16 +57,8 @@ "avatar_url": "https://avatars2.githubusercontent.com/u/42580385?v=4", "profile": "https://stefannajdovski.com/", "contributions": [ - "design" - ] - }, - { - "login": "aypie", - "name": "Alex Potterson", - "avatar_url": "https://avatars3.githubusercontent.com/u/57075012?v=4", - "profile": "http://aypie.design/", - "contributions": [ - "design" + "design", + "translation" ] }, { @@ -97,7 +99,6 @@ "avatar_url": "https://avatars3.githubusercontent.com/u/13700948", "profile": "https://github.com/Galang23", "contributions": [ - "question", "translation" ] }, diff --git a/README.md b/README.md index 5982211b..d904bba3 100755 --- a/README.md +++ b/README.md @@ -47,15 +47,15 @@ Prominent contributors are listed here in the [all-contributors](https://allcont
Austin Huang
💻 📖 💬 🌍 🤔
Ammar Githam
💻 🎨 🤔 🚧 💬 +
Anderson Mesquita
💻 🐛
AWAiS
💻 🤔 -
Stefan Najdovski
🎨 -
Alex Potterson
🎨 +
Stefan Najdovski
🎨 🌍
Kevin Thomas
💵
Shadowspear123
📝 🐛 🤔 💬 📓
Airikr
💬 🤔 -
Galang23
💬 🌍 +
Galang23
🌍
farzadx
🌍
kernoeb
🌍
Ten_Lego
🌍 From 6aead8ff2bab4498caef03fdcfc82f7ea6aa6d5b Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sat, 19 Sep 2020 23:25:16 -0400 Subject: [PATCH 6/8] add material design icons attribution --- .../fragments/settings/AboutFragment.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java index 78699e61..67f3004f 100644 --- a/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java @@ -29,12 +29,13 @@ public class AboutFragment extends BasePreferencesFragment { final PreferenceCategory thirdPartyCategory = new PreferenceCategory(context); screen.addPreference(thirdPartyCategory); thirdPartyCategory.setTitle(R.string.about_category_3pt); - thirdPartyCategory.setSummary(R.string.about_category_3pt_summary); + //thirdPartyCategory.setSummary(R.string.about_category_3pt_summary); thirdPartyCategory.setIconSpaceReserved(false); // alphabetical order!!! thirdPartyCategory.addPreference(getExoPlayerPreference()); thirdPartyCategory.addPreference(getFrescoPreference()); thirdPartyCategory.addPreference(getJsoupPreference()); + thirdPartyCategory.addPreference(getMDIPreference()); thirdPartyCategory.addPreference(getRetrofitPreference()); final PreferenceCategory licenseCategory = new PreferenceCategory(context); @@ -157,6 +158,22 @@ public class AboutFragment extends BasePreferencesFragment { return preference; } + private Preference getMDIPreference() { + final Context context = getContext(); + if (context == null) return null; + final Preference preference = new Preference(context); + preference.setTitle("Material Design Icons"); + preference.setSummary("Copyright (C) 2014 Austin Andrews & Google LLC. Apache Version 2.0."); + preference.setIconSpaceReserved(false); + preference.setOnPreferenceClickListener(p -> { + final Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse("https://exoplayer.dev/")); + startActivity(intent); + return true; + }); + return preference; + } + private Preference getLicensePreference() { final Context context = getContext(); if (context == null) return null; From 63d30a9c2e37eb9837469147e8826f228d62fe3d Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sat, 19 Sep 2020 23:34:09 -0400 Subject: [PATCH 7/8] no more midnight coding --- app/build.gradle | 4 ++-- .../awais/instagrabber/fragments/settings/AboutFragment.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 87be6298..6a69b2ad 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { minSdkVersion 16 targetSdkVersion 29 - versionCode 50 - versionName '19.0-a1' + versionCode 51 + versionName '19.0-a2' multiDexEnabled true diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java index 67f3004f..0e72d21f 100644 --- a/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java @@ -167,7 +167,7 @@ public class AboutFragment extends BasePreferencesFragment { preference.setIconSpaceReserved(false); preference.setOnPreferenceClickListener(p -> { final Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse("https://exoplayer.dev/")); + intent.setData(Uri.parse("https://materialdesignicons.com/")); startActivity(intent); return true; }); From 37c301f54fd61bb190b1d8b0bb9bf38a18878656 Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sun, 20 Sep 2020 09:30:50 -0400 Subject: [PATCH 8/8] New Crowdin updates (#156) * New translations strings.xml (Chinese Simplified) * New translations arrays.xml (Spanish) * New translations arrays.xml (Macedonian) * New translations arrays.xml (Indonesian) * New translations arrays.xml (Portuguese, Brazilian) * New translations arrays.xml (Chinese Simplified) * New translations arrays.xml (Turkish) * New translations arrays.xml (Russian) * New translations arrays.xml (Polish) * New translations arrays.xml (Italian) * New translations arrays.xml (German) * New translations arrays.xml (French) * New translations strings.xml (French) * New translations strings.xml (Persian) * New translations arrays.xml (Persian) * New translations strings.xml (Indonesian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Turkish) * New translations strings.xml (Russian) * New translations strings.xml (Polish) * New translations strings.xml (Italian) * New translations strings.xml (German) * New translations strings.xml (Spanish) * New translations strings.xml (Macedonian) * New translations arrays.xml (Persian) * New translations strings.xml (Persian) * New translations arrays.xml (Chinese Simplified) * New translations arrays.xml (Chinese Simplified) * New translations arrays.xml (Turkish) * New translations strings.xml (German) * New translations arrays.xml (German) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Indonesian) * New translations arrays.xml (Indonesian) --- app/src/main/res/values-de/arrays.xml | 22 +++--- app/src/main/res/values-de/strings.xml | 48 ++++++------- app/src/main/res/values-es/arrays.xml | 20 +++--- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fa/arrays.xml | 20 +++--- app/src/main/res/values-fa/strings.xml | 14 ++-- app/src/main/res/values-fr/arrays.xml | 20 +++--- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-in/arrays.xml | 22 +++--- app/src/main/res/values-in/strings.xml | 98 +++++++++++++------------- app/src/main/res/values-it/arrays.xml | 20 +++--- app/src/main/res/values-it/strings.xml | 4 +- app/src/main/res/values-mk/arrays.xml | 20 +++--- app/src/main/res/values-mk/strings.xml | 2 +- app/src/main/res/values-pl/arrays.xml | 20 +++--- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt/arrays.xml | 20 +++--- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/arrays.xml | 20 +++--- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-tr/arrays.xml | 20 +++--- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh/arrays.xml | 20 +++--- app/src/main/res/values-zh/strings.xml | 2 +- 24 files changed, 236 insertions(+), 188 deletions(-) diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml index a0079a91..088c4a46 100644 --- a/app/src/main/res/values-de/arrays.xml +++ b/app/src/main/res/values-de/arrays.xml @@ -3,15 +3,17 @@ Systemstandard Englisch - Französisch [Danke an @kernoeb (Telegram)] - Spanisch [Danke an @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Chinesisch (Vereinfacht) - Indonesisch [Danke an @Galang23 (GitLab)] - Italienisch [Danke an @RAR_Ramar (Telegram)] - Deutsch [Danke an @peterge1998 (GitHub)] - Polnisch [Danke an @Lego8486 (GitHub)] - Türkisch [Danke an @faydin90 (Telegram)] - BR Portugiesisch [Danke an @wagnim (GitHub)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -39,7 +41,7 @@ 3 - Disable + Deaktivieren storiesig Aloinstagram Instadp @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9430ca18..252a8bc3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -31,20 +31,20 @@ Nutzerstory Änderungsprotokoll Symbolleiste unten anzeigen - Check for updates at startup + Beim Start auf Aktualisierungen prüfen Beiträge in den Benutzernamen-Ordner in Downloads herunterladen Alle Beiträge des Benutzers automatisch laden - Mark stories as seen after viewing - Story author will know you viewed it - Mark DM as seen after viewing - Other members will know you viewed it + Stories nach dem Ansehen als gesehen markieren + Die Person wird wissen, dass du dir die Story angesehen hast + Direktnachrichten nach dem Ansehen als gesehen markieren + Andere Mitglieder werden wissen, dass du sie gesehen hast Aktivitätsbenachrichtigungen aktivieren Fehler beim Laden des Profils!\nVersuche dich einzuloggen und erneut zu suchen. Fehler beim Erstellen von Download-Ordner(n). Nutzer-Feed anzeigen (Funktioniert nur, wenn Benutzer angemeldet ist) In benutzerdefiniertem Ordner speichern Ordner auswählen - Theme + Design Betrifft nur angemeldete Benutzer: Betrifft nur anonyme Benutzer: Datenschutz @@ -52,7 +52,7 @@ storiesig für Stories und Highlights von öffentlichen Nutzern verwenden Story viewer service Importieren/Exportieren - Language + Sprache Was soll ich tun? %s\nBeiträge %s\nAbonnenten @@ -106,8 +106,8 @@ Gefällt mir Gespeichert Markiert - Gefällt (%s) - Unlike (%s) + Gefällt mir (%s) + Gefällt mir nicht mehr (%s) Lesezeichen Lesezeichen entfernen Folgen @@ -161,7 +161,7 @@ Text kopieren Anhang herunterladen Nachricht gefällt mir - Like von der Nachricht entfernen + Nachricht gefällt mir nicht mehr Nachricht zurückrufen Absender Profil ansehen Beitrag geteilt von %s @@ -199,12 +199,12 @@ Kommentar kopieren Auf Kommentar antworten Kommentar gefällt mir - Like vom Kommentar entfernen + Kommentar gefällt mir nicht mehr Kommentar löschen Keine leeren Kommentare! - Möchten du nach dem Benutzernamen suchen? - Möchten du nach dem Hashtag suchen? - Möchten du nach dem Ort suchen? + Möchtest du nach dem Benutzernamen suchen? + Möchtest du nach dem Hashtag suchen? + Möchtest du nach dem Ort suchen? Abonnenten Abonniert Vergleiche Abonnenten & abonnierte Accounts @@ -242,25 +242,25 @@ %d Likes Hast du dich abgemeldet, bevor du auf diese Benachrichtigung geklickt hast? Feed - Profile - More + Profil + Mehr DM %d selected - Relogin + Erneut anmelden Refresh your cookies if facing any issues - Successfully logged out! + Erfolgreich abgemeldet! Info - Mark as seen + Als gesehen markieren Do not show again until next update Version - Start screen - General - Theme + Startbildschirm + Allgemein + Design Downloads Locale Account Current login not working? Simply add the account again. - Add account + Account hinzufügen License (English only) Visit our website Get support, discuss, meet others, and have fun! @@ -275,6 +275,6 @@ Black Light theme Dark theme - Barinsta + Barista Material Dark diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml index eca51d33..774dcb7b 100755 --- a/app/src/main/res/values-es/arrays.xml +++ b/app/src/main/res/values-es/arrays.xml @@ -3,15 +3,17 @@ Predeterminado del sistema Inglés - Francés [Gracias a @kernoeb (Telegram)] - Español [Gracias a @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Chino Simplificado - Indonesio [Gracias a @Galang23 (GitLab)] - Italiano [Gracias a @RAR_Ramar (Telegram)] - Alemán [Gracias a @peterge1998 (GitHub)] - Polaco [Gracias a @Lego8486 (GitHub)] - Turco [Gracias a @faydin90 (Telegram)] - Portugués brasileño [Gracias a @wagnim (GitHub)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a168ef85..449318b3 100755 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -275,6 +275,6 @@ Black Light theme Dark theme - Barinsta + Barista Material Dark diff --git a/app/src/main/res/values-fa/arrays.xml b/app/src/main/res/values-fa/arrays.xml index 4748cabb..76e43ab5 100644 --- a/app/src/main/res/values-fa/arrays.xml +++ b/app/src/main/res/values-fa/arrays.xml @@ -3,15 +3,17 @@ پیش فرض سیستم انگلیسی - فرانسوی [ با سپاس از kernoeb@ (تلگرام)] - اسپانیایی [ با سپاس از sguinetti@ (گیت هاب)] + فرانسوی [ با سپاس از kernoeb@ ] + اسپانیایی [ با سپاس از sguinetti@ ] چینی ساده شده - اندونزیایی [ با سپاس از Galang23@ (گیت هاب)] - ایتالیایی [ با سپاس از RAR_Ramar@ (تلگرام)] - آلمانی [ با سپاس از peterge1998@ (گیت هاب)] - لهستانی [ با سپاس از Lego8486@ (گیت هاب)] - ترکی [ با سپاس از faydin90@ (تلگرام)] - برزیلی پرتغالی [ با سپاس از wagnim@ (گیت هاب)] + اندونزیایی [ با سپاس از Galang23@ ] + ایتالیایی [ با سپاس از RAR_Ramar@ ] + آلمانی [ با سپاس از peterge1998@ ] + لهستانی [ با سپاس از Lego8486@ ] + ترکی [ با سپاس از faydin90@ ] + برزیلی پرتغالی [ با سپاس از wagnim@ ] + پارسی [ با سپاس از Frzking@ ] + مقدونی [ با تشکر از snajdovski@ ] ۰ @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 0593fa30..b1ea866b 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -264,18 +264,18 @@ افزودن حساب مجوز (فقط انگلیسی) از وبسایت ما بازدید کنید - Get support, discuss, meet others, and have fun! - See our source code on GitHub - Audit, star, report bugs, contribute, and have fun (again)! + پشتیبانی دریافت کنید ، بحث کنید ، با دیگران ملاقات کنید و از آن لذت ببرید! + کد منبع ما را در GitHub ببینید + حسابرسی ، ستاره گذاری ، گزارش اشکالات ، مشارکت و سرگرمی (دوباره)! ارسال بازخورد با ایمیل - Third-Party Attributions - The following third-party open-source libraries are used: + اسناد شخص ثالث + از کتابخانه های منبع باز شخص ثالث زیر استفاده می شود: یادآور - Please use this app responsibly. Downloaded images should only be used for purposes allowed by applicable laws. + لطفا با مسئولیت پذیری از این برنامه استفاده کنید. از تصاویر بارگیری شده فقط باید برای مقاصدی استفاده شود که طبق قوانین قابل اجرا است. سفید مشکی پوسته روشن پوسته تیره - Barinsta + باریستا متریال تیره diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml index 91dc3990..34fb31e8 100755 --- a/app/src/main/res/values-fr/arrays.xml +++ b/app/src/main/res/values-fr/arrays.xml @@ -3,15 +3,17 @@ Par défaut (Système) Anglais - Français [Merci à @kernoeb (Telegram)] - Espagnol [Merci à @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Chinois Simplifié - Indonésien [Merci à @Galang23 (GitLab)] - Italien [Merci à @RAR_Ramar (Telegram)] - Allemand [Merci à @peterge1998 (GitHub)] - Polonais [Merci à @Lego8486 (GitHub)] - Turc [Merci à @faydin90 (Telegram)] - Portugais brésilien [Merci à @wagnim (GitHub)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2bba583f..f96d2bcc 100755 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -275,6 +275,6 @@ Black Light theme Dark theme - Barinsta + Barista Material Dark diff --git a/app/src/main/res/values-in/arrays.xml b/app/src/main/res/values-in/arrays.xml index e466dea5..9a8969fa 100644 --- a/app/src/main/res/values-in/arrays.xml +++ b/app/src/main/res/values-in/arrays.xml @@ -3,15 +3,17 @@ Bawaan Sistem Inggris - Prancis [Terima kasih @kernoeb (Telegram)] - Spanyol [Terima kasih @sguinetti (GitLab)] + Prancis [Terima kasih @kernoeb] + Spanyol [Terima kasih @sguinetti] Tiongkok Sederhana - Bahasa Indonesia [Terima kasih @Galang23 (GitLab)] - Italia [Terima kasih @RAR_Ramar (Telegram)] - Jerman [Terima kasih @peterge1998 (GitHub)] - Polandia [Terima kasih @Lego8486 (GitHub)] - Turki [Terima kasih @faydin90 (Telegram)] - Portugis Brasil [Terima kasih @wagnim (GitHub)] + Bahasa Indonesia [Terima kasih @Galang23] + Italia [Terima kasih @RAR_Ramar] + Jerman [Teirma kasih @peterge1998] + Polandia [Terima kasih @Lego8486] + Turki [Terima kasih @faydin90] + Portugis Brazil [Terima kasih @wagnim] + Persia [Terima kasih @farzadx] + Makedonia [Terima kasih @snajdovski] 0 @@ -39,7 +41,7 @@ 3 - Disable + Nonaktifkan storiesig Aloinstagram Instadp @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 5e21efb8..12520b38 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -31,28 +31,28 @@ Story Catatan Perubahan Tampilkan bilah alat di bawah - Check for updates at startup + Cek pembaruan saat memulai Unduh kiriman ke folder nama pengguna di folder unduhan Muat otomatis semua kiriman dari pengguna - Mark stories as seen after viewing - Story author will know you viewed it - Mark DM as seen after viewing - Other members will know you viewed it + Tandai cerita dibaca setelah melihat + Pembuat cerita akan tahu Anda melihatnya + Tandai DM dibaca setelah melihat + Peserta lain akan tahu Anda melihatnya Nyalakan pemberitahuan aktivitas Galat saat memuat profil!\nCoba masuk dan cari lagi. Galat saat membuat folder unduhan. Tampilkan Beranda pengguna (hanya bisa saat anda sudah masuk) Simpan ke folder khusus Pilih folder - Theme + Tema Hanya memengaruhi pengguna yang sudah masuk: Hanya memengaruhi pengguna anonim: Privasi Gunakan Instadp untuk foto profil kualitas tinggi Gunakan storiesig untuk cerita dan sorotan dari pengguna publik - Story viewer service + Layanan penayang cerita Ekspor/impor Pengaturan - Language + Bahasa Apa yang harus dilakukan? %s\nkiriman %s\npengikut @@ -87,7 +87,7 @@ Sebutan Akun Ini Bersifat Pribadi Anda tidak akan dapat mengakses kiriman setelah berhenti mengikuti! Anda yakin? - You can log in via More -> Account on the bottom-right corner or you can view public accounts without login! + Anda bisa masuk melalui Lebih-> Akun di pojok kanan bawah. Atau anda dapat melihat akun publik tanpa masuk! Anda dapat mengusap ke kiri/kanan untuk jelajah/beranda, atau cari sesuatu di bawah! Akun ini tidak memiliki kiriman Kiriman tidak ditemukan! @@ -95,11 +95,11 @@ selengkapnya… Masuk Keluar - Browse Instagram anonymously - Remove all accounts - This will remove all added accounts from the app!\nTo remove just one account, long tap the account from the account switcher dialog.\nDo you want to continue? + Jelajahi Instagram secara anonim + Hapus semua akun + Ini akan menghapus semua akun yang telah ditambahkan ke aplikasi!\nUntuk menghapus satu akun, ketuk lama akun tersebut di dialog penukar akun.\nApakah Anda ingin melanjutkan? Kirim Jurnal [kalau sesuatu gak jalan] - Date format + Format tanggal Kunjungi Laman Proyek Gabung Grup Telegram Gabung ke Ruangan Matrix @@ -135,12 +135,12 @@ Muat ulang Dapatkan cookies Desktop Mode\nuntuk 2FA - Use custom format + Gunakan format suaian Pemisah Format Jam Format Tanggal Pratinjau - Swap Time and Date positions + Tukar posisi jam dan tanggal Panel Favorit digunakan untuk menambahkan hashtag dan/atau pengguna yang anda sukai.\n\nPanel Akses Cepat digunakan untuk berpindah akun secara cepat.\n\nNb. 1: Pastikan kamu masuk ke akun yang kamu inginkan [Pengaturan > Masuk] terlebih dahulu untuk menambahkan akun ke daftar ini.\n\nNb. 2: Keluar dari akun saat ini kemudian masuk ke akun lainnya.\nJika banyak akun tidak bekerja untukmu, tidak ada yang bisa kita lakukan! Tidak dapat menghapus akun yang sedang digunakan Apakah anda yakin ingin menghapus %s? @@ -241,40 +241,40 @@ %d sebutan pengguna %d suka Anda keluar sebelum mengklik pemberitahuan ini?! - Feed - Profile - More - DM - %d selected - Relogin - Refresh your cookies if facing any issues - Successfully logged out! + Umpan + Profil + Selengkapnya + Pesan Langsung + %d dipilih + Masuk ulang + Segarkan cookies Anda bila menemui masalah + Berhasil keluar! Info - Mark as seen - Do not show again until next update - Version - Start screen - General - Theme - Downloads - Locale - Account - Current login not working? Simply add the account again. - Add account - License (English only) - Visit our website - Get support, discuss, meet others, and have fun! - See our source code on GitHub - Audit, star, report bugs, contribute, and have fun (again)! - Send feedback by email - Third-Party Attributions - The following third-party open-source libraries are used: - Reminder - Please use this app responsibly. Downloaded images should only be used for purposes allowed by applicable laws. - White - Black - Light theme - Dark theme - Barinsta + Tandai sudah dibaca + Jangan tampilkan lagi sampai pembaruan berikutnya + Versi + Layar mulai + Umum + Tema + Unduhan + Lokal + Akun + Login saat ini tidak bekerja? Tambahkan akun lagi. Simpel. + Tambah akun + Lisensi (Hanya bahasa Inggris) + Kunjungi situs web kami + Dapatkan bantuan, diskusi, bertemu lainnya, dan bersenang-senang! + Lihat kode sumber kami di GitHub + Audit, bintangi, laporan masalah, kontribusi, dan bersenang-senanglah (lagi)! + Kirim umpan balik melalui surel + Atribusi Pihak Ketiga + Berikut adalah pustaka pihak ketiga bersumber terbuka yang digunakan: + Pengingat + Gunakan aplikasi ini dengan bertanggung jawab. Gambar yang diunduh seharusnya digunakan sesuai dengan batasan-batasan yang ditetapkan oleh Undang-Undang. + Putih + Hitam + Tema terang + Tema gelap + Barista Material Dark diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml index 8b79310c..0332b8d4 100755 --- a/app/src/main/res/values-it/arrays.xml +++ b/app/src/main/res/values-it/arrays.xml @@ -3,15 +3,17 @@ Predefinito da sistema Inglese - Francese [Grazie a @kernoeb (Telegram)] - Spagnolo [Grazie a @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Cinese Semplificato - Indonesiano [Grazie a @Galang23 (GitLab)] - Italiano [Grazie a @RAR_Ramar (Telegram)] - Tedesco [Grazie a @peterge1998 (GitHub)] - Polacco [Grazie a @Lego8486 (GitHub)] - Turco [Grazie a @faydin90 (Telegram)] - Portoghese [Grazie a @wagnim (Telegram)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0e8c185e..109af1e8 100755 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -40,7 +40,7 @@ Altri membri sapranno di averlo visto Abilita notifiche attività Errore durante il caricamento del profilo!\nProvare ad accedere e cercare nuovamente. - Errore durante la creazione della cartella di scaricamento(). + Errore durante la creazione delle cartelle di scaricamento. Mostra feed utente (funziona solo quando l\'utente ha effettuato l\'accesso) Salva nella cartella personalizzata Seleziona cartella @@ -275,6 +275,6 @@ Nero Tema chiaro Tema scuro - Barinsta + Barista Materiale Scuro diff --git a/app/src/main/res/values-mk/arrays.xml b/app/src/main/res/values-mk/arrays.xml index fecb23fe..e25cc849 100644 --- a/app/src/main/res/values-mk/arrays.xml +++ b/app/src/main/res/values-mk/arrays.xml @@ -3,15 +3,17 @@ Системски одбрано Англиски - Француски [Благодарност до @kernoeb (Telegram)] - Шпански [Благодарност до @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Кинески - Индонезиски [Благодарност до @Galang23 (GitLab)] - Италијански [Благодарност до @RAR_Ramar (Telegram)] - Германски [Благодарност до @peterge1998 (GitHub)] - Полски [Благодарност до @Lego8486 (GitHub)] - Турски [Благодарност до @faydin90 (Telegram)] - Португалски(Бразил) [Благодарност до @wagnim (GitHub)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 42f30eda..99a76be7 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -275,6 +275,6 @@ Црна Светла тема Темна тема - Barinsta + Barista Материјално Црна diff --git a/app/src/main/res/values-pl/arrays.xml b/app/src/main/res/values-pl/arrays.xml index 1d81854f..cb45f646 100644 --- a/app/src/main/res/values-pl/arrays.xml +++ b/app/src/main/res/values-pl/arrays.xml @@ -3,15 +3,17 @@ Język urządzenia Angielski - Francuski [Podziękowania dla @kernoeb (Telegram)] - Hiszpański [Podziękowania dla @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Chiński uproszczony - Indonezyjski [Podziękowania dla @Galang23 (GitLab)] - Włoski [Podziękowania dla @RAR_Ramar (Telegram)] - Niemiecki [Podziękowania dla @peterge1998 (GitHub)] - Polski [Podziękowania dla @Lego8486 (GitHub)] - Turecki [Podziękowania dla @faydin90 (Telegram)] - Portugalski [Podziękowania dla @wagnim (GitHub)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b582d7d8..3175db9b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -275,6 +275,6 @@ Black Light theme Dark theme - Barinsta + Barista Material Dark diff --git a/app/src/main/res/values-pt/arrays.xml b/app/src/main/res/values-pt/arrays.xml index 47c84346..86a68b2e 100644 --- a/app/src/main/res/values-pt/arrays.xml +++ b/app/src/main/res/values-pt/arrays.xml @@ -3,15 +3,17 @@ Padrão do sistema Inglês - Francês [Agradecimentos a @kernoeb (Telegram)] - Espanhol [Agradecimentos a @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Chinês (Simplificado) - Indonésio [Agradecimentos a @Galang23 (GitLab)] - Italiano [Agradecimentos a @RAR_Ramar (Telegram)] - Alemão [Agradecimentos a @peterge1998 (GitHub)] - Polonês [Agradecimentos a @Lego8486 (GitHub)] - Turco [Agradecimentos a @faydin90 (Telegram)] - Português (BR) [Agradecimentos a @wagnim (GitHub)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 80d697fa..9d626bd8 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -275,6 +275,6 @@ Black Light theme Dark theme - Barinsta + Barista Material Dark diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml index 39ec84b6..995f1dbc 100644 --- a/app/src/main/res/values-ru/arrays.xml +++ b/app/src/main/res/values-ru/arrays.xml @@ -3,15 +3,17 @@ System Default English - French [Thanks to @kernoeb (Telegram)] - Spanish [Thanks to @sguinetti (GitLab)] + French [Thanks to @kernoeb] + Spanish [Thanks to @sguinetti] Chinese Simplified - Indonesian [Thanks to @Galang23 (GitLab)] - Italian [Thanks to @RAR_Ramar (Telegram)] - German [Thanks to @peterge1998 (GitHub)] - Polish [Thanks to @Lego8486 (GitHub)] - Turkish [Thanks to @faydin90 (Telegram)] - Portuguese (BR) [Thanks to @wagnim (GitHub)] + Indonesian [Thanks to @Galang23] + Italian [Thanks to @RAR_Ramar] + German [Thanks to @peterge1998] + Polish [Thanks to @Lego8486] + Turkish [Thanks to @faydin90] + Brazilian Portuguese [Thanks to @wagnim] + Persian [Thanks to @farzadx] + Macedonian [Thanks to @snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ac9bfbc2..2021acec 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -275,6 +275,6 @@ Black Light theme Dark theme - Barinsta + Barista Material Dark diff --git a/app/src/main/res/values-tr/arrays.xml b/app/src/main/res/values-tr/arrays.xml index 226af0f2..a801b947 100644 --- a/app/src/main/res/values-tr/arrays.xml +++ b/app/src/main/res/values-tr/arrays.xml @@ -3,15 +3,17 @@ Sistem Varsayılanı İngilizce - Fransızca [@kernoeb (Telegram) sayesinde] - İspanyolca [@sguinetti (GitLab) sayesinde] + Fransızca [@kernoeb tarafından] + İspanyolca [@sguinetti tarafından] Basitleştirilmiş Çince - Endonezyaca [@Galang23 (GitLab) sayesinde] - İtalyaca [@RAR_Ramar (Telegram) sayesinde] - Almanca [@peterge1998 (GitHub) sayesinde] - Lehçe [@Lego8486 (GitHub) sayesinde] - Türkçe [@faydin90 (Telegram) sayesinde] - Portekizce [@wagnim (GitHub) sayesinde] + Endonezyaca [@Galang23 tarafından] + İtalyaca [@RAR_Ramar tarafından] + Almanca [@peterge1998 tarafından] + Lehçe [@Lego8486 tarafından] + Türkçe [@faydin90 tarafından] + Brezilya Portekizce [@wagnim tarafından] + Farsça [@farzadx tarafından] + Makedonyaca [@snajdovski tarafından] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7d84c0b6..cb7b1efb 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -275,6 +275,6 @@ Siyah Açık tema Koyu Tema - Barinsta + Barista Materyal Koyu diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml index f6f5ee9c..e2561ddb 100755 --- a/app/src/main/res/values-zh/arrays.xml +++ b/app/src/main/res/values-zh/arrays.xml @@ -3,15 +3,17 @@ 系统默认 英文 - 法文 [感谢 @kernoeb (Telegram)] - 西班牙文 [感谢 @sguinetti (GitLab)] + 法文 [感谢 @kernoeb] + 西班牙文 [感谢 @sguinetti] 简体中文 - 印尼文 [感谢 @Galang23 (GitLab)] - 意大利文 [感谢 @RAR_Ramar (Telegram)] - 德文 [感谢 @peterge1998 (GitHub)] - 波兰文 [感谢 @Lego8486 (GitHub)] - 土耳其语 [感谢 @faydin90 (Telegram)] - 巴西葡文 [感谢 @wagnim (GitHub)] + 印尼文 [感谢 @Galang23] + 意大利语 [感谢@RAR_Ramar] + 德语 [感谢@peterge1998年] + 波兰语 [谢谢@Lego8486] + 土耳其语 [感谢@faydin90] + 巴西葡萄牙语 [感谢@wagnim] + 波斯语 [感谢@frazadx] + 马其顿语 [感谢@snajdovski] 0 @@ -109,10 +111,12 @@ @string/light_white_theme @string/light_barinsta_theme + @string/light_bibliogram_theme @style/AppTheme.Light.White @style/AppTheme.Light.Barinsta + @style/AppTheme.Light.Bibliogram @string/dark_black_theme diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 3f549811..e245530b 100755 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -275,6 +275,6 @@ 黑色 浅色主题 深色主题 - Barinsta + Barista Material Dark