Merge remote-tracking branch 'origin/task/add-favourites' into task/add-favourites

2024-11-22 14:47:29 +00:00 · 2020-09-21 03:53:27 +09:00 · 2020-09-21 03:53:27 +09:00 · 80b0cfa87f
commit 80b0cfa87f
parent 05c0937c6f ad0f683caa
33 changed files with 342 additions and 294 deletions
--- 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"
      ]
    },
--- a/README.md
+++ b/README.md
@ -47,15 +47,15 @@ Prominent contributors are listed here in the [all-contributors](https://allcont
  <tr>
    <td align="center"><a href="https://austinhuang.me"><img src="https://avatars1.githubusercontent.com/u/16656689?s=100" width="100px;" alt=""/><br /><sub><b>Austin Huang</b></sub></a><br /><a href="https://github.com/austinhuang0131/instagrabber/commits?author=austinhuang0131" title="Code">💻</a> <a href="https://github.com/austinhuang0131/instagrabber/commits?author=austinhuang0131" title="Documentation">📖</a> <a href="#question-austinhuang0131" title="Answering Questions">💬</a> <a href="#translation-austinhuang0131" title="Translation">🌍</a> <a href="#ideas-austinhuang0131" title="Ideas, Planning, & Feedback">🤔</a></td>
    <td align="center"><a href="https://github.com/ammargitham"><img src="https://avatars0.githubusercontent.com/u/8017365?s=100" width="100px;" alt=""/><br /><sub><b>Ammar Githam</b></sub></a><br /><a href="https://github.com/austinhuang0131/instagrabber/commits?author=ammargitham" title="Code">💻</a> <a href="#design-ammargitham" title="Design">🎨</a> <a href="#ideas-ammargitham" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-ammargitham" title="Maintenance">🚧</a> <a href="#question-ammargitham" title="Answering Questions">💬</a></td>
+    <td align="center"><a href="https://github.com/andersonvom"><img src="https://avatars3.githubusercontent.com/u/69922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anderson Mesquita</b></sub></a><br /><a href="https://github.com/austinhuang0131/instagrabber/commits?author=andersonvom" title="Code">💻</a> <a href="https://github.com/austinhuang0131/instagrabber/issues?q=author%3Aandersonvom" title="Bug reports">🐛</a></td>
    <td align="center"><a href="http://rerolledgeek.blogspot.com/"><img src="https://avatars3.githubusercontent.com/u/5278488?s=100" width="100px;" alt=""/><br /><sub><b>AWAiS</b></sub></a><br /><a href="https://github.com/austinhuang0131/instagrabber/commits?author=AwaisKing" title="Code">💻</a> <a href="#ideas-AwaisKing" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://stefannajdovski.com/"><img src="https://avatars2.githubusercontent.com/u/42580385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Najdovski</b></sub></a><br /><a href="#design-snajdovski" title="Design">🎨</a></td>
-    <td align="center"><a href="http://aypie.design/"><img src="https://avatars3.githubusercontent.com/u/57075012?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alex Potterson</b></sub></a><br /><a href="#design-aypie" title="Design">🎨</a></td>
+    <td align="center"><a href="https://stefannajdovski.com/"><img src="https://avatars2.githubusercontent.com/u/42580385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Najdovski</b></sub></a><br /><a href="#design-snajdovski" title="Design">🎨</a> <a href="#translation-snajdovski" title="Translation">🌍</a></td>
    <td align="center"><a href="http://kevinthomas.dev"><img src="https://avatars2.githubusercontent.com/u/15370181?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Thomas</b></sub></a><br /><a href="#financial-KevinNThomas" title="Financial">💵</a></td>
  </tr>
  <tr>
    <td align="center"><a href="https://github.com/Shadowspear123"><img src="https://avatars1.githubusercontent.com/u/50462281?s=100" width="100px;" alt=""/><br /><sub><b>Shadowspear123</b></sub></a><br /><a href="#blog-Shadowspear123" title="Blogposts">📝</a> <a href="https://github.com/austinhuang0131/instagrabber/issues?q=author%3AShadowspear123" title="Bug reports">🐛</a> <a href="#ideas-Shadowspear123" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-Shadowspear123" title="Answering Questions">💬</a> <a href="#userTesting-Shadowspear123" title="User Testing">📓</a></td>
    <td align="center"><a href="https://airikr.me/"><img src="https://avatars0.githubusercontent.com/u/53869451?s=100" width="100px;" alt=""/><br /><sub><b>Airikr</b></sub></a><br /><a href="#question-e-edgren" title="Answering Questions">💬</a> <a href="#ideas-e-edgren" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/Galang23"><img src="https://avatars3.githubusercontent.com/u/13700948?s=100" width="100px;" alt=""/><br /><sub><b>Galang23</b></sub></a><br /><a href="#question-Galang23" title="Answering Questions">💬</a> <a href="#translation-Galang23" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Galang23"><img src="https://avatars3.githubusercontent.com/u/13700948?s=100" width="100px;" alt=""/><br /><sub><b>Galang23</b></sub></a><br /><a href="#translation-Galang23" title="Translation">🌍</a></td>
    <td align="center"><a href="https://github.com/farzadx"><img src="https://avatars2.githubusercontent.com/u/70059397?v=4?s=100" width="100px;" alt=""/><br /><sub><b>farzadx</b></sub></a><br /><a href="#translation-farzadx" title="Translation">🌍</a></td>
    <td align="center"><a href="https://becauseofprog.fr/"><img src="https://avatars3.githubusercontent.com/u/24623168?s=100" width="100px;" alt=""/><br /><sub><b>kernoeb</b></sub></a><br /><a href="#translation-kernoeb" title="Translation">🌍</a></td>
    <td align="center"><a href="https://github.com/Lego8486"><img src="https://avatars1.githubusercontent.com/u/47414485?s=100" width="100px;" alt=""/><br /><sub><b>Ten_Lego</b></sub></a><br /><a href="#translation-Lego8486" title="Translation">🌍</a></td>
--- 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

--- 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
@ -86,11 +90,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());
@ -145,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) {
@ -166,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
--- 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://materialdesignicons.com/"));
+            startActivity(intent);
+            return true;
+        });
+        return preference;
+    }
+
    private Preference getLicensePreference() {
        final Context context = getContext();
        if (context == null) return null;
--- 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()));
                    }
--- 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";
--- a/app/src/main/java/awais/instagrabber/utils/CookieUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/CookieUtils.java
@ -10,6 +10,10 @@ 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 java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import awais.instagrabber.BuildConfig;
 import awaisomereport.LogCollector;
@ -54,99 +58,61 @@ 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;
-            }
+    public static String getUserIdFromCookie(final String cookies) {
+        return getCookieValue(cookies, "ds_user_id");
+    }
+
+    @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 null;
    }

-    public static String getCsrfTokenFromCookie(final String cookie) {
-        if (cookie == null) {
-            return null;
+    @Nullable
+    public static String getCookie(@Nullable final String webViewUrl) {
+        final List<String> 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/"
+        );
+
+        if (!TextUtils.isEmpty(webViewUrl)) {
+            domains.add(0, webViewUrl);
        }
-        return cookie.split("csrftoken=")[1].split(";")[0];
+
+        return getLongestCookie(domains);
    }

    @Nullable
-    public static String getCookie(@Nullable final String webViewUrl) {
-        int lastLongestCookieLength = 0;
-        String mainCookie = null;
+    private static String getLongestCookie(final List<String> domains) {
+        int longestLength = 0;
+        String longestCookie = null;

-        String cookie;
-        if (!TextUtils.isEmpty(webViewUrl)) {
-            cookie = COOKIE_MANAGER.getCookie(webViewUrl);
+        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;
    }
 }
--- 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})
--- a/app/src/main/res/values-de/arrays.xml
+++ b/app/src/main/res/values-de/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Systemstandard</item>
        <item>Englisch</item>
-        <item>Französisch [Danke an @kernoeb (Telegram)]</item>
-        <item>Spanisch [Danke an @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Chinesisch (Vereinfacht)</item>
-        <item>Indonesisch [Danke an @Galang23 (GitLab)]</item>
-        <item>Italienisch [Danke an @RAR_Ramar (Telegram)]</item>
-        <item>Deutsch [Danke an @peterge1998 (GitHub)]</item>
-        <item>Polnisch [Danke an @Lego8486 (GitHub)]</item>
-        <item>Türkisch [Danke an @faydin90 (Telegram)]</item>
-        <item>BR Portugiesisch [Danke an @wagnim (GitHub)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -39,7 +41,7 @@
        <item>3</item>
    </string-array>
    <string-array name="anonymous_story_viewer">
-        <item>Disable</item>
+        <item>Deaktivieren</item>
        <item>storiesig</item>
        <item>Aloinstagram</item>
        <item>Instadp</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -31,20 +31,20 @@
    <string name="title_user_story">Nutzerstory</string>
    <string name="title_changelog">Änderungsprotokoll</string>
    <string name="bottom_toolbar">Symbolleiste unten anzeigen</string>
-    <string name="update_check">Check for updates at startup</string>
+    <string name="update_check">Beim Start auf Aktualisierungen prüfen</string>
    <string name="download_user_folder">Beiträge in den Benutzernamen-Ordner in Downloads herunterladen</string>
    <string name="autoload_posts">Alle Beiträge des Benutzers automatisch laden</string>
-    <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
-    <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
-    <string name="dm_mark_as_seen_setting">Mark DM as seen after viewing</string>
-    <string name="dm_mark_as_seen_setting_summary">Other members will know you viewed it</string>
+    <string name="mark_as_seen_setting">Stories nach dem Ansehen als gesehen markieren</string>
+    <string name="mark_as_seen_setting_summary">Die Person wird wissen, dass du dir die Story angesehen hast</string>
+    <string name="dm_mark_as_seen_setting">Direktnachrichten nach dem Ansehen als gesehen markieren</string>
+    <string name="dm_mark_as_seen_setting_summary">Andere Mitglieder werden wissen, dass du sie gesehen hast</string>
    <string name="activity_setting">Aktivitätsbenachrichtigungen aktivieren</string>
    <string name="error_loading_profile">Fehler beim Laden des Profils!\nVersuche dich einzuloggen und erneut zu suchen.</string>
    <string name="error_creating_folders">Fehler beim Erstellen von Download-Ordner(n).</string>
    <string name="show_feed">Nutzer-Feed anzeigen (Funktioniert nur, wenn Benutzer angemeldet ist)</string>
    <string name="save_to_folder">In benutzerdefiniertem Ordner speichern</string>
    <string name="select_folder">Ordner auswählen</string>
-    <string name="theme_settings">Theme</string>
+    <string name="theme_settings">Design</string>
    <string name="login_settings">Betrifft nur angemeldete Benutzer:</string>
    <string name="anonymous_settings">Betrifft nur anonyme Benutzer:</string>
    <string name="privacy_warning">Datenschutz</string>
@ -52,7 +52,7 @@
    <string name="storiesig_settings">storiesig für Stories und Highlights von öffentlichen Nutzern verwenden</string>
    <string name="stories_viewer_settings">Story viewer service</string>
    <string name="import_export">Importieren/Exportieren</string>
-    <string name="select_language">Language</string>
+    <string name="select_language">Sprache</string>
    <string name="what_to_do_dialog">Was soll ich tun?</string>
    <string name="main_posts_count">%s\nBeiträge</string>
    <string name="main_posts_followers">%s\nAbonnenten</string>
@ -106,8 +106,8 @@
    <string name="liked">Gefällt mir</string>
    <string name="saved">Gespeichert</string>
    <string name="tagged">Markiert</string>
-    <string name="like">Gefällt (%s)</string>
-    <string name="unlike">Unlike (%s)</string>
+    <string name="like">Gefällt mir (%s)</string>
+    <string name="unlike">Gefällt mir nicht mehr (%s)</string>
    <string name="bookmark">Lesezeichen</string>
    <string name="unbookmark">Lesezeichen entfernen</string>
    <string name="follow">Folgen</string>
@ -161,7 +161,7 @@
    <string name="dms_inbox_copy_text">Text kopieren</string>
    <string name="dms_inbox_download">Anhang herunterladen</string>
    <string name="dms_inbox_like">Nachricht gefällt mir</string>
-    <string name="dms_inbox_unlike">Like von der Nachricht entfernen</string>
+    <string name="dms_inbox_unlike">Nachricht gefällt mir nicht mehr</string>
    <string name="dms_inbox_unsend">Nachricht zurückrufen</string>
    <string name="dms_inbox_author">Absender Profil ansehen</string>
    <string name="dms_inbox_media_shared_from">Beitrag geteilt von %s</string>
@ -199,12 +199,12 @@
    <string name="comment_viewer_copy_comment">Kommentar kopieren</string>
    <string name="comment_viewer_reply_comment">Auf Kommentar antworten</string>
    <string name="comment_viewer_like_comment">Kommentar gefällt mir</string>
-    <string name="comment_viewer_unlike_comment">Like vom Kommentar entfernen</string>
+    <string name="comment_viewer_unlike_comment">Kommentar gefällt mir nicht mehr</string>
    <string name="comment_viewer_delete_comment">Kommentar löschen</string>
    <string name="comment_send_empty_comment">Keine leeren Kommentare!</string>
-    <string name="comment_view_mention_user_search">Möchten du nach dem Benutzernamen suchen?</string>
-    <string name="comment_view_mention_hash_search">Möchten du nach dem Hashtag suchen?</string>
-    <string name="comment_view_mention_location_search">Möchten du nach dem Ort suchen?</string>
+    <string name="comment_view_mention_user_search">Möchtest du nach dem Benutzernamen suchen?</string>
+    <string name="comment_view_mention_hash_search">Möchtest du nach dem Hashtag suchen?</string>
+    <string name="comment_view_mention_location_search">Möchtest du nach dem Ort suchen?</string>
    <string name="followers_type_followers">Abonnenten</string>
    <string name="followers_type_following">Abonniert</string>
    <string name="followers_compare">Vergleiche Abonnenten &amp; abonnierte Accounts</string>
@ -242,25 +242,25 @@
    <string name="activity_count_likes">%d Likes</string>
    <string name="activity_notloggedin">Hast du dich abgemeldet, bevor du auf diese Benachrichtigung geklickt hast?</string>
    <string name="feed">Feed</string>
-    <string name="profile">Profile</string>
-    <string name="more">More</string>
+    <string name="profile">Profil</string>
+    <string name="more">Mehr</string>
    <string name="title_dm">DM</string>
    <string name="number_selected">%d selected</string>
-    <string name="relogin">Relogin</string>
+    <string name="relogin">Erneut anmelden</string>
    <string name="relogin_summary">Refresh your cookies if facing any issues</string>
-    <string name="logout_success">Successfully logged out!</string>
+    <string name="logout_success">Erfolgreich abgemeldet!</string>
    <string name="dm_thread_info">Info</string>
-    <string name="mark_as_seen">Mark as seen</string>
+    <string name="mark_as_seen">Als gesehen markieren</string>
    <string name="skip_update_checkbox">Do not show again until next update</string>
    <string name="version">Version</string>
-    <string name="pref_start_screen">Start screen</string>
-    <string name="pref_category_general">General</string>
-    <string name="pref_category_theme">Theme</string>
+    <string name="pref_start_screen">Startbildschirm</string>
+    <string name="pref_category_general">Allgemein</string>
+    <string name="pref_category_theme">Design</string>
    <string name="pref_category_downloads">Downloads</string>
    <string name="pref_category_locale">Locale</string>
    <string name="account">Account</string>
    <string name="account_hint">Current login not working? Simply add the account again.</string>
-    <string name="add_account">Add account</string>
+    <string name="add_account">Account hinzufügen</string>
    <string name="about_category_license">License (English only)</string>
    <string name="about_documentation">Visit our website</string>
    <string name="about_documentation_summary">Get support, discuss, meet others, and have fun!</string>
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Black</string>
    <string name="light_theme_settings">Light theme</string>
    <string name="dark_theme_settings">Dark theme</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>
--- a/app/src/main/res/values-es/arrays.xml
+++ b/app/src/main/res/values-es/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Predeterminado del sistema</item>
        <item>Inglés</item>
-        <item>Francés [Gracias a @kernoeb (Telegram)]</item>
-        <item>Español [Gracias a @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Chino Simplificado</item>
-        <item>Indonesio [Gracias a @Galang23 (GitLab)]</item>
-        <item>Italiano [Gracias a @RAR_Ramar (Telegram)]</item>
-        <item>Alemán [Gracias a @peterge1998 (GitHub)]</item>
-        <item>Polaco [Gracias a @Lego8486 (GitHub)]</item>
-        <item>Turco [Gracias a @faydin90 (Telegram)]</item>
-        <item>Portugués brasileño [Gracias a @wagnim (GitHub)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Black</string>
    <string name="light_theme_settings">Light theme</string>
    <string name="dark_theme_settings">Dark theme</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>
--- a/app/src/main/res/values-fa/arrays.xml
+++ b/app/src/main/res/values-fa/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>پیش فرض سیستم</item>
        <item>انگلیسی</item>
-        <item>فرانسوی [ با سپاس از kernoeb@ (تلگرام)]</item>
-        <item>اسپانیایی [ با سپاس از sguinetti@ (گیت هاب)]</item>
+        <item>فرانسوی [ با سپاس از kernoeb@ ]</item>
+        <item>اسپانیایی [ با سپاس از sguinetti@ ]</item>
        <item>چینی ساده شده</item>
-        <item>اندونزیایی [ با سپاس از Galang23@ (گیت هاب)]</item>
-        <item>ایتالیایی [ با سپاس از RAR_Ramar@ (تلگرام)]</item>
-        <item>آلمانی [ با سپاس از peterge1998@ (گیت هاب)]</item>
-        <item>لهستانی [ با سپاس از Lego8486@ (گیت هاب)]</item>
-        <item>ترکی [ با سپاس از faydin90@ (تلگرام)]</item>
-        <item>برزیلی پرتغالی [ با سپاس از wagnim@ (گیت هاب)]</item>
+        <item>اندونزیایی [ با سپاس از Galang23@ ]</item>
+        <item>ایتالیایی [ با سپاس از RAR_Ramar@ ]</item>
+        <item>آلمانی [ با سپاس از peterge1998@ ]</item>
+        <item>لهستانی [ با سپاس از Lego8486@ ]</item>
+        <item>ترکی [ با سپاس از faydin90@ ]</item>
+        <item>برزیلی پرتغالی [ با سپاس از wagnim@ ]</item>
+        <item>پارسی [ با سپاس از Frzking@ ]</item>
+        <item>مقدونی [ با تشکر از snajdovski@ ]</item>
    </string-array>
    <string-array name="languages_values">
        <item>۰</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -264,18 +264,18 @@
    <string name="add_account">افزودن حساب</string>
    <string name="about_category_license">مجوز (فقط انگلیسی)</string>
    <string name="about_documentation">از وبسایت ما بازدید کنید</string>
-    <string name="about_documentation_summary">Get support, discuss, meet others, and have fun!</string>
-    <string name="about_repository">See our source code on GitHub</string>
-    <string name="about_repository_summary">Audit, star, report bugs, contribute, and have fun (again)!</string>
+    <string name="about_documentation_summary">پشتیبانی دریافت کنید ، بحث کنید ، با دیگران ملاقات کنید و از آن لذت ببرید!</string>
+    <string name="about_repository">کد منبع ما را در GitHub ببینید</string>
+    <string name="about_repository_summary">حسابرسی ، ستاره گذاری ، گزارش اشکالات ، مشارکت و سرگرمی (دوباره)!</string>
    <string name="about_feedback">ارسال بازخورد با ایمیل</string>
-    <string name="about_category_3pt">Third-Party Attributions</string>
-    <string name="about_category_3pt_summary">The following third-party open-source libraries are used:</string>
+    <string name="about_category_3pt">اسناد شخص ثالث</string>
+    <string name="about_category_3pt_summary">از کتابخانه های منبع باز شخص ثالث زیر استفاده می شود:</string>
    <string name="reminder">یادآور</string>
-    <string name="reminder_summary">Please use this app responsibly. Downloaded images should only be used for purposes allowed by applicable laws.</string>
+    <string name="reminder_summary">لطفا با مسئولیت پذیری از این برنامه استفاده کنید. از تصاویر بارگیری شده فقط باید برای مقاصدی استفاده شود که طبق قوانین قابل اجرا است.</string>
    <string name="light_white_theme">سفید</string>
    <string name="dark_black_theme">مشکی</string>
    <string name="light_theme_settings">پوسته روشن</string>
    <string name="dark_theme_settings">پوسته تیره</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">باریستا</string>
    <string name="dark_material_dark_theme">متریال تیره</string>
 </resources>
--- a/app/src/main/res/values-fr/arrays.xml
+++ b/app/src/main/res/values-fr/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Par défaut (Système)</item>
        <item>Anglais</item>
-        <item>Français [Merci à @kernoeb (Telegram)]</item>
-        <item>Espagnol [Merci à @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Chinois Simplifié</item>
-        <item>Indonésien [Merci à @Galang23 (GitLab)]</item>
-        <item>Italien [Merci à @RAR_Ramar (Telegram)]</item>
-        <item>Allemand [Merci à @peterge1998 (GitHub)]</item>
-        <item>Polonais [Merci à @Lego8486 (GitHub)]</item>
-        <item>Turc [Merci à @faydin90 (Telegram)]</item>
-        <item>Portugais brésilien [Merci à @wagnim (GitHub)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Black</string>
    <string name="light_theme_settings">Light theme</string>
    <string name="dark_theme_settings">Dark theme</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>
--- a/app/src/main/res/values-in/arrays.xml
+++ b/app/src/main/res/values-in/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Bawaan Sistem</item>
        <item>Inggris</item>
-        <item>Prancis [Terima kasih @kernoeb (Telegram)]</item>
-        <item>Spanyol [Terima kasih @sguinetti (GitLab)]</item>
+        <item>Prancis [Terima kasih @kernoeb]</item>
+        <item>Spanyol [Terima kasih @sguinetti]</item>
        <item>Tiongkok Sederhana</item>
-        <item>Bahasa Indonesia [Terima kasih @Galang23 (GitLab)]</item>
-        <item>Italia [Terima kasih @RAR_Ramar (Telegram)]</item>
-        <item>Jerman [Terima kasih @peterge1998 (GitHub)]</item>
-        <item>Polandia [Terima kasih @Lego8486 (GitHub)]</item>
-        <item>Turki [Terima kasih @faydin90 (Telegram)]</item>
-        <item>Portugis Brasil [Terima kasih @wagnim (GitHub)]</item>
+        <item>Bahasa Indonesia [Terima kasih @Galang23]</item>
+        <item>Italia [Terima kasih @RAR_Ramar]</item>
+        <item>Jerman [Teirma kasih @peterge1998]</item>
+        <item>Polandia [Terima kasih @Lego8486]</item>
+        <item>Turki [Terima kasih @faydin90]</item>
+        <item>Portugis Brazil [Terima kasih @wagnim]</item>
+        <item>Persia [Terima kasih @farzadx]</item>
+        <item>Makedonia [Terima kasih @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -39,7 +41,7 @@
        <item>3</item>
    </string-array>
    <string-array name="anonymous_story_viewer">
-        <item>Disable</item>
+        <item>Nonaktifkan</item>
        <item>storiesig</item>
        <item>Aloinstagram</item>
        <item>Instadp</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -31,28 +31,28 @@
    <string name="title_user_story">Story</string>
    <string name="title_changelog">Catatan Perubahan</string>
    <string name="bottom_toolbar">Tampilkan bilah alat di bawah</string>
-    <string name="update_check">Check for updates at startup</string>
+    <string name="update_check">Cek pembaruan saat memulai</string>
    <string name="download_user_folder">Unduh kiriman ke folder nama pengguna di folder unduhan</string>
    <string name="autoload_posts">Muat otomatis semua kiriman dari pengguna</string>
-    <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
-    <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
-    <string name="dm_mark_as_seen_setting">Mark DM as seen after viewing</string>
-    <string name="dm_mark_as_seen_setting_summary">Other members will know you viewed it</string>
+    <string name="mark_as_seen_setting">Tandai cerita dibaca setelah melihat</string>
+    <string name="mark_as_seen_setting_summary">Pembuat cerita akan tahu Anda melihatnya</string>
+    <string name="dm_mark_as_seen_setting">Tandai DM dibaca setelah melihat</string>
+    <string name="dm_mark_as_seen_setting_summary">Peserta lain akan tahu Anda melihatnya</string>
    <string name="activity_setting">Nyalakan pemberitahuan aktivitas</string>
    <string name="error_loading_profile">Galat saat memuat profil!\nCoba masuk dan cari lagi.</string>
    <string name="error_creating_folders">Galat saat membuat folder unduhan.</string>
    <string name="show_feed">Tampilkan Beranda pengguna (hanya bisa saat anda sudah masuk)</string>
    <string name="save_to_folder">Simpan ke folder khusus</string>
    <string name="select_folder">Pilih folder</string>
-    <string name="theme_settings">Theme</string>
+    <string name="theme_settings">Tema</string>
    <string name="login_settings">Hanya memengaruhi pengguna yang sudah masuk:</string>
    <string name="anonymous_settings">Hanya memengaruhi pengguna anonim:</string>
    <string name="privacy_warning">Privasi</string>
    <string name="instadp_settings">Gunakan Instadp untuk foto profil kualitas tinggi</string>
    <string name="storiesig_settings">Gunakan storiesig untuk cerita dan sorotan dari pengguna publik</string>
-    <string name="stories_viewer_settings">Story viewer service</string>
+    <string name="stories_viewer_settings">Layanan penayang cerita</string>
    <string name="import_export">Ekspor/impor Pengaturan</string>
-    <string name="select_language">Language</string>
+    <string name="select_language">Bahasa</string>
    <string name="what_to_do_dialog">Apa yang harus dilakukan?</string>
    <string name="main_posts_count">%s\nkiriman</string>
    <string name="main_posts_followers">%s\npengikut</string>
@ -87,7 +87,7 @@
    <string name="story_mentions">Sebutan</string>
    <string name="priv_acc">Akun Ini Bersifat Pribadi</string>
    <string name="priv_acc_confirm">Anda tidak akan dapat mengakses kiriman setelah berhenti mengikuti! Anda yakin?</string>
-    <string name="no_acc">You can log in via More -&gt; Account on the bottom-right corner or you can view public accounts without login!</string>
+    <string name="no_acc">Anda bisa masuk melalui Lebih-&gt; Akun di pojok kanan bawah. Atau anda dapat melihat akun publik tanpa masuk!</string>
    <string name="no_acc_logged_in">Anda dapat mengusap ke kiri/kanan untuk jelajah/beranda, atau cari sesuatu di bawah!</string>
    <string name="empty_acc">Akun ini tidak memiliki kiriman</string>
    <string name="empty_list">Kiriman tidak ditemukan!</string>
@ -95,11 +95,11 @@
    <string name="read_more">selengkapnya…</string>
    <string name="login">Masuk</string>
    <string name="logout">Keluar</string>
-    <string name="logout_summary">Browse Instagram anonymously</string>
-    <string name="remove_all_acc">Remove all accounts</string>
-    <string name="remove_all_acc_warning">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?</string>
+    <string name="logout_summary">Jelajahi Instagram secara anonim</string>
+    <string name="remove_all_acc">Hapus semua akun</string>
+    <string name="remove_all_acc_warning">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?</string>
    <string name="send_logs">Kirim Jurnal [kalau sesuatu gak jalan]</string>
-    <string name="time_settings">Date format</string>
+    <string name="time_settings">Format tanggal</string>
    <string name="project_link">Kunjungi Laman Proyek</string>
    <string name="telegram_link">Gabung Grup Telegram</string>
    <string name="matrix_link">Gabung ke Ruangan Matrix</string>
@ -135,12 +135,12 @@
    <string name="refresh">Muat ulang</string>
    <string name="get_cookies">Dapatkan cookies</string>
    <string name="desktop_2fa">Desktop Mode\nuntuk 2FA</string>
-    <string name="time_settings_title_custom">Use custom format</string>
+    <string name="time_settings_title_custom">Gunakan format suaian</string>
    <string name="time_settings_title_separator">Pemisah</string>
    <string name="time_settings_title_time_format">Format Jam</string>
    <string name="time_settings_title_date_format">Format Tanggal</string>
    <string name="time_settings_title_preview">Pratinjau</string>
-    <string name="time_settings_swap_time">Swap Time and Date positions</string>
+    <string name="time_settings_swap_time">Tukar posisi jam dan tanggal</string>
    <string name="quick_access_info_dialog">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 &gt; 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!</string>
    <string name="quick_access_cannot_delete_curr">Tidak dapat menghapus akun yang sedang digunakan</string>
    <string name="quick_access_confirm_delete">Apakah anda yakin ingin menghapus %s?</string>
@ -241,40 +241,40 @@
    <string name="activity_count_usertags">%d sebutan pengguna</string>
    <string name="activity_count_likes">%d suka</string>
    <string name="activity_notloggedin">Anda keluar sebelum mengklik pemberitahuan ini?!</string>
-    <string name="feed">Feed</string>
-    <string name="profile">Profile</string>
-    <string name="more">More</string>
-    <string name="title_dm">DM</string>
-    <string name="number_selected">%d selected</string>
-    <string name="relogin">Relogin</string>
-    <string name="relogin_summary">Refresh your cookies if facing any issues</string>
-    <string name="logout_success">Successfully logged out!</string>
+    <string name="feed">Umpan</string>
+    <string name="profile">Profil</string>
+    <string name="more">Selengkapnya</string>
+    <string name="title_dm">Pesan Langsung</string>
+    <string name="number_selected">%d dipilih</string>
+    <string name="relogin">Masuk ulang</string>
+    <string name="relogin_summary">Segarkan cookies Anda bila menemui masalah</string>
+    <string name="logout_success">Berhasil keluar!</string>
    <string name="dm_thread_info">Info</string>
-    <string name="mark_as_seen">Mark as seen</string>
-    <string name="skip_update_checkbox">Do not show again until next update</string>
-    <string name="version">Version</string>
-    <string name="pref_start_screen">Start screen</string>
-    <string name="pref_category_general">General</string>
-    <string name="pref_category_theme">Theme</string>
-    <string name="pref_category_downloads">Downloads</string>
-    <string name="pref_category_locale">Locale</string>
-    <string name="account">Account</string>
-    <string name="account_hint">Current login not working? Simply add the account again.</string>
-    <string name="add_account">Add account</string>
-    <string name="about_category_license">License (English only)</string>
-    <string name="about_documentation">Visit our website</string>
-    <string name="about_documentation_summary">Get support, discuss, meet others, and have fun!</string>
-    <string name="about_repository">See our source code on GitHub</string>
-    <string name="about_repository_summary">Audit, star, report bugs, contribute, and have fun (again)!</string>
-    <string name="about_feedback">Send feedback by email</string>
-    <string name="about_category_3pt">Third-Party Attributions</string>
-    <string name="about_category_3pt_summary">The following third-party open-source libraries are used:</string>
-    <string name="reminder">Reminder</string>
-    <string name="reminder_summary">Please use this app responsibly. Downloaded images should only be used for purposes allowed by applicable laws.</string>
-    <string name="light_white_theme">White</string>
-    <string name="dark_black_theme">Black</string>
-    <string name="light_theme_settings">Light theme</string>
-    <string name="dark_theme_settings">Dark theme</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="mark_as_seen">Tandai sudah dibaca</string>
+    <string name="skip_update_checkbox">Jangan tampilkan lagi sampai pembaruan berikutnya</string>
+    <string name="version">Versi</string>
+    <string name="pref_start_screen">Layar mulai</string>
+    <string name="pref_category_general">Umum</string>
+    <string name="pref_category_theme">Tema</string>
+    <string name="pref_category_downloads">Unduhan</string>
+    <string name="pref_category_locale">Lokal</string>
+    <string name="account">Akun</string>
+    <string name="account_hint">Login saat ini tidak bekerja? Tambahkan akun lagi. Simpel.</string>
+    <string name="add_account">Tambah akun</string>
+    <string name="about_category_license">Lisensi (Hanya bahasa Inggris)</string>
+    <string name="about_documentation">Kunjungi situs web kami</string>
+    <string name="about_documentation_summary">Dapatkan bantuan, diskusi, bertemu lainnya, dan bersenang-senang!</string>
+    <string name="about_repository">Lihat kode sumber kami di GitHub</string>
+    <string name="about_repository_summary">Audit, bintangi, laporan masalah, kontribusi, dan bersenang-senanglah (lagi)!</string>
+    <string name="about_feedback">Kirim umpan balik melalui surel</string>
+    <string name="about_category_3pt">Atribusi Pihak Ketiga</string>
+    <string name="about_category_3pt_summary">Berikut adalah pustaka pihak ketiga bersumber terbuka yang digunakan:</string>
+    <string name="reminder">Pengingat</string>
+    <string name="reminder_summary">Gunakan aplikasi ini dengan bertanggung jawab. Gambar yang diunduh seharusnya digunakan sesuai dengan batasan-batasan yang ditetapkan oleh Undang-Undang.</string>
+    <string name="light_white_theme">Putih</string>
+    <string name="dark_black_theme">Hitam</string>
+    <string name="light_theme_settings">Tema terang</string>
+    <string name="dark_theme_settings">Tema gelap</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>
--- a/app/src/main/res/values-it/arrays.xml
+++ b/app/src/main/res/values-it/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Predefinito da sistema</item>
        <item>Inglese</item>
-        <item>Francese [Grazie a @kernoeb (Telegram)]</item>
-        <item>Spagnolo [Grazie a @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Cinese Semplificato</item>
-        <item>Indonesiano [Grazie a @Galang23 (GitLab)]</item>
-        <item>Italiano [Grazie a @RAR_Ramar (Telegram)]</item>
-        <item>Tedesco [Grazie a @peterge1998 (GitHub)]</item>
-        <item>Polacco [Grazie a @Lego8486 (GitHub)]</item>
-        <item>Turco [Grazie a @faydin90 (Telegram)]</item>
-        <item>Portoghese [Grazie a @wagnim (Telegram)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -40,7 +40,7 @@
    <string name="dm_mark_as_seen_setting_summary">Altri membri sapranno di averlo visto</string>
    <string name="activity_setting">Abilita notifiche attività</string>
    <string name="error_loading_profile">Errore durante il caricamento del profilo!\nProvare ad accedere e cercare nuovamente.</string>
-    <string name="error_creating_folders">Errore durante la creazione della cartella di scaricamento().</string>
+    <string name="error_creating_folders">Errore durante la creazione delle cartelle di scaricamento.</string>
    <string name="show_feed">Mostra feed utente (funziona solo quando l\'utente ha effettuato l\'accesso)</string>
    <string name="save_to_folder">Salva nella cartella personalizzata</string>
    <string name="select_folder">Seleziona cartella</string>
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Nero</string>
    <string name="light_theme_settings">Tema chiaro</string>
    <string name="dark_theme_settings">Tema scuro</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Materiale Scuro</string>
 </resources>
--- a/app/src/main/res/values-mk/arrays.xml
+++ b/app/src/main/res/values-mk/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Системски одбрано</item>
        <item>Англиски</item>
-        <item>Француски [Благодарност до @kernoeb (Telegram)]</item>
-        <item>Шпански [Благодарност до @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Кинески</item>
-        <item>Индонезиски [Благодарност до @Galang23 (GitLab)]</item>
-        <item>Италијански [Благодарност до @RAR_Ramar (Telegram)]</item>
-        <item>Германски [Благодарност до @peterge1998 (GitHub)]</item>
-        <item>Полски [Благодарност до @Lego8486 (GitHub)]</item>
-        <item>Турски [Благодарност до @faydin90 (Telegram)]</item>
-        <item>Португалски(Бразил) [Благодарност до @wagnim (GitHub)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Црна</string>
    <string name="light_theme_settings">Светла тема</string>
    <string name="dark_theme_settings">Темна тема</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Материјално Црна</string>
 </resources>
--- a/app/src/main/res/values-pl/arrays.xml
+++ b/app/src/main/res/values-pl/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Język urządzenia</item>
        <item>Angielski</item>
-        <item>Francuski [Podziękowania dla @kernoeb (Telegram)]</item>
-        <item>Hiszpański [Podziękowania dla @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Chiński uproszczony</item>
-        <item>Indonezyjski [Podziękowania dla @Galang23 (GitLab)]</item>
-        <item>Włoski [Podziękowania dla @RAR_Ramar (Telegram)]</item>
-        <item>Niemiecki [Podziękowania dla @peterge1998 (GitHub)]</item>
-        <item>Polski [Podziękowania dla @Lego8486 (GitHub)]</item>
-        <item>Turecki [Podziękowania dla @faydin90 (Telegram)]</item>
-        <item>Portugalski [Podziękowania dla @wagnim (GitHub)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Black</string>
    <string name="light_theme_settings">Light theme</string>
    <string name="dark_theme_settings">Dark theme</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>
--- a/app/src/main/res/values-pt/arrays.xml
+++ b/app/src/main/res/values-pt/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Padrão do sistema</item>
        <item>Inglês</item>
-        <item>Francês [Agradecimentos a @kernoeb (Telegram)]</item>
-        <item>Espanhol [Agradecimentos a @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Chinês (Simplificado)</item>
-        <item>Indonésio [Agradecimentos a @Galang23 (GitLab)]</item>
-        <item>Italiano [Agradecimentos a @RAR_Ramar (Telegram)]</item>
-        <item>Alemão [Agradecimentos a @peterge1998 (GitHub)]</item>
-        <item>Polonês [Agradecimentos a @Lego8486 (GitHub)]</item>
-        <item>Turco [Agradecimentos a @faydin90 (Telegram)]</item>
-        <item>Português (BR) [Agradecimentos a @wagnim (GitHub)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Black</string>
    <string name="light_theme_settings">Light theme</string>
    <string name="dark_theme_settings">Dark theme</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>
--- a/app/src/main/res/values-ru/arrays.xml
+++ b/app/src/main/res/values-ru/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>System Default</item>
        <item>English</item>
-        <item>French [Thanks to @kernoeb (Telegram)]</item>
-        <item>Spanish [Thanks to @sguinetti (GitLab)]</item>
+        <item>French [Thanks to @kernoeb]</item>
+        <item>Spanish [Thanks to @sguinetti]</item>
        <item>Chinese Simplified</item>
-        <item>Indonesian [Thanks to @Galang23 (GitLab)]</item>
-        <item>Italian [Thanks to @RAR_Ramar (Telegram)]</item>
-        <item>German [Thanks to @peterge1998 (GitHub)]</item>
-        <item>Polish [Thanks to @Lego8486 (GitHub)]</item>
-        <item>Turkish [Thanks to @faydin90 (Telegram)]</item>
-        <item>Portuguese (BR) [Thanks to @wagnim (GitHub)]</item>
+        <item>Indonesian [Thanks to @Galang23]</item>
+        <item>Italian [Thanks to @RAR_Ramar]</item>
+        <item>German [Thanks to @peterge1998]</item>
+        <item>Polish [Thanks to @Lego8486]</item>
+        <item>Turkish [Thanks to @faydin90]</item>
+        <item>Brazilian Portuguese [Thanks to @wagnim]</item>
+        <item>Persian [Thanks to @farzadx]</item>
+        <item>Macedonian [Thanks to @snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Black</string>
    <string name="light_theme_settings">Light theme</string>
    <string name="dark_theme_settings">Dark theme</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>
--- a/app/src/main/res/values-tr/arrays.xml
+++ b/app/src/main/res/values-tr/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>Sistem Varsayılanı</item>
        <item>İngilizce</item>
-        <item>Fransızca [@kernoeb (Telegram) sayesinde]</item>
-        <item>İspanyolca [@sguinetti (GitLab) sayesinde]</item>
+        <item>Fransızca [@kernoeb tarafından]</item>
+        <item>İspanyolca [@sguinetti tarafından]</item>
        <item>Basitleştirilmiş Çince</item>
-        <item>Endonezyaca [@Galang23 (GitLab) sayesinde]</item>
-        <item>İtalyaca [@RAR_Ramar (Telegram) sayesinde]</item>
-        <item>Almanca [@peterge1998 (GitHub) sayesinde]</item>
-        <item>Lehçe [@Lego8486 (GitHub) sayesinde]</item>
-        <item>Türkçe [@faydin90 (Telegram) sayesinde]</item>
-        <item>Portekizce [@wagnim (GitHub) sayesinde]</item>
+        <item>Endonezyaca [@Galang23 tarafından]</item>
+        <item>İtalyaca [@RAR_Ramar tarafından]</item>
+        <item>Almanca [@peterge1998 tarafından]</item>
+        <item>Lehçe [@Lego8486 tarafından]</item>
+        <item>Türkçe [@faydin90 tarafından]</item>
+        <item>Brezilya Portekizce [@wagnim tarafından]</item>
+        <item>Farsça [@farzadx tarafından]</item>
+        <item>Makedonyaca [@snajdovski tarafından]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">Siyah</string>
    <string name="light_theme_settings">Açık tema</string>
    <string name="dark_theme_settings">Koyu Tema</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Materyal Koyu</string>
 </resources>
--- a/app/src/main/res/values-zh/arrays.xml
+++ b/app/src/main/res/values-zh/arrays.xml
@ -3,15 +3,17 @@
    <string-array name="languages">
        <item>系统默认</item>
        <item>英文</item>
-        <item>法文 [感谢 @kernoeb (Telegram)]</item>
-        <item>西班牙文 [感谢 @sguinetti (GitLab)]</item>
+        <item>法文 [感谢 @kernoeb]</item>
+        <item>西班牙文 [感谢 @sguinetti]</item>
        <item>简体中文</item>
-        <item>印尼文 [感谢 @Galang23 (GitLab)]</item>
-        <item>意大利文 [感谢 @RAR_Ramar (Telegram)]</item>
-        <item>德文 [感谢 @peterge1998 (GitHub)]</item>
-        <item>波兰文 [感谢 @Lego8486 (GitHub)]</item>
-        <item>土耳其语 [感谢 @faydin90 (Telegram)]</item>
-        <item>巴西葡文 [感谢 @wagnim (GitHub)]</item>
+        <item>印尼文 [感谢 @Galang23]</item>
+        <item>意大利语 [感谢@RAR_Ramar]</item>
+        <item>德语 [感谢@peterge1998年]</item>
+        <item>波兰语 [谢谢@Lego8486]</item>
+        <item>土耳其语 [感谢@faydin90]</item>
+        <item>巴西葡萄牙语 [感谢@wagnim]</item>
+        <item>波斯语 [感谢@frazadx]</item>
+        <item>马其顿语 [感谢@snajdovski]</item>
    </string-array>
    <string-array name="languages_values">
        <item>0</item>
@ -109,10 +111,12 @@
    <string-array name="light_themes">
        <item>@string/light_white_theme</item>
        <item>@string/light_barinsta_theme</item>
+        <item>@string/light_bibliogram_theme</item>
    </string-array>
    <string-array name="light_theme_values">
        <item>@style/AppTheme.Light.White</item>
        <item>@style/AppTheme.Light.Barinsta</item>
+        <item>@style/AppTheme.Light.Bibliogram</item>
    </string-array>
    <string-array name="dark_themes">
        <item>@string/dark_black_theme</item>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@ -275,6 +275,6 @@
    <string name="dark_black_theme">黑色</string>
    <string name="light_theme_settings">浅色主题</string>
    <string name="dark_theme_settings">深色主题</string>
-    <string name="light_barinsta_theme">Barinsta</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
    <string name="dark_material_dark_theme">Material Dark</string>
 </resources>