Finishing moving all the relevant strings to strings_mo.xml
This commit is contained in:
parent
26831c3375
commit
aac4f412bd
|
@ -948,8 +948,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
|
||||||
&& statusVisibility != StatusPrivacy.DIRECT
|
&& statusVisibility != StatusPrivacy.DIRECT
|
||||||
&& !attachments.stream().allMatch(attachment -> attachment.description != null && !attachment.description.isBlank())) {
|
&& !attachments.stream().allMatch(attachment -> attachment.description != null && !attachment.description.isBlank())) {
|
||||||
new M3AlertDialogBuilder(getActivity())
|
new M3AlertDialogBuilder(getActivity())
|
||||||
.setTitle(R.string.sk_no_image_desc_title)
|
.setTitle(R.string.mo_no_image_desc_title)
|
||||||
.setMessage(R.string.sk_no_image_desc)
|
.setMessage(R.string.mo_no_image_desc)
|
||||||
.setNegativeButton(R.string.cancel, null)
|
.setNegativeButton(R.string.cancel, null)
|
||||||
.setPositiveButton(R.string.publish, (dialog, i)-> publish())
|
.setPositiveButton(R.string.publish, (dialog, i)-> publish())
|
||||||
.show();
|
.show();
|
||||||
|
|
|
@ -157,7 +157,7 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(ErrorResponse result) {
|
public void onError(ErrorResponse result) {
|
||||||
Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
|
Toast.makeText(getActivity(), getString(R.string.mo_personal_note_update_failed), Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
}).exec(accountID);
|
}).exec(accountID);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,13 +17,11 @@ import android.os.Bundle;
|
||||||
import android.text.SpannableStringBuilder;
|
import android.text.SpannableStringBuilder;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.text.style.ImageSpan;
|
import android.text.style.ImageSpan;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.Gravity;
|
import android.view.Gravity;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuInflater;
|
import android.view.MenuInflater;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.MotionEvent;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.view.ViewOutlineProvider;
|
import android.view.ViewOutlineProvider;
|
||||||
|
@ -371,7 +369,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(ErrorResponse result) {
|
public void onError(ErrorResponse result) {
|
||||||
Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
|
Toast.makeText(getActivity(), getString(R.string.mo_personal_note_update_failed), Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
}).exec(accountID);
|
}).exec(accountID);
|
||||||
}
|
}
|
||||||
|
|
|
@ -146,7 +146,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
|
||||||
updatePublishText(b);
|
updatePublishText(b);
|
||||||
if (GlobalUserPreferences.relocatePublishButton) {
|
if (GlobalUserPreferences.relocatePublishButton) {
|
||||||
b.setOnClickListener(l -> {
|
b.setOnClickListener(l -> {
|
||||||
Toast.makeText(getActivity(), R.string.sk_disable_relocate_publish_button_to_enable_customization,
|
Toast.makeText(getActivity(), R.string.mo_disable_relocate_publish_button_to_enable_customization,
|
||||||
Toast.LENGTH_LONG).show();
|
Toast.LENGTH_LONG).show();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
@ -295,7 +295,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
|
||||||
GlobalUserPreferences.recentLanguages.remove(accountID);
|
GlobalUserPreferences.recentLanguages.remove(accountID);
|
||||||
GlobalUserPreferences.save();
|
GlobalUserPreferences.save();
|
||||||
})));
|
})));
|
||||||
items.add(new TextItem(R.string.sk_clear_recent_emoji, ()-> {
|
items.add(new TextItem(R.string.mo_clear_recent_emoji, ()-> {
|
||||||
GlobalUserPreferences.recentEmojis.clear();
|
GlobalUserPreferences.recentEmojis.clear();
|
||||||
GlobalUserPreferences.save();
|
GlobalUserPreferences.save();
|
||||||
}));
|
}));
|
||||||
|
|
|
@ -99,7 +99,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
|
||||||
Optional<Emoji> element = allAvailableEmojis.stream().filter(e -> e.shortcode.equals(emojiCode)).findFirst();
|
Optional<Emoji> element = allAvailableEmojis.stream().filter(e -> e.shortcode.equals(emojiCode)).findFirst();
|
||||||
element.ifPresent(recentEmojiList::add);
|
element.ifPresent(recentEmojiList::add);
|
||||||
}
|
}
|
||||||
emojis.add(0, new EmojiCategory(activity.getString(R.string.sk_emoji_recent), recentEmojiList));
|
emojis.add(0, new EmojiCategory(activity.getString(R.string.mo_emoji_recent), recentEmojiList));
|
||||||
}
|
}
|
||||||
|
|
||||||
for(EmojiCategory category:emojis)
|
for(EmojiCategory category:emojis)
|
||||||
|
|
|
@ -278,7 +278,7 @@
|
||||||
android:paddingHorizontal="16dp"
|
android:paddingHorizontal="16dp"
|
||||||
android:elevation="0dp"
|
android:elevation="0dp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:hint="@string/sk_personal_note"/>
|
android:hint="@string/mo_personal_note"/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/note_edit_confirm"
|
android:id="@+id/note_edit_confirm"
|
||||||
|
@ -289,8 +289,8 @@
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
android:backgroundTint="?colorBackgroundLightest"
|
android:backgroundTint="?colorBackgroundLightest"
|
||||||
android:layout_gravity="right|center_vertical"
|
android:layout_gravity="right|center_vertical"
|
||||||
android:tooltipText="@string/sk_personal_note_confirm"
|
android:tooltipText="@string/mo_personal_note_confirm"
|
||||||
android:contentDescription="@string/sk_personal_note_confirm"
|
android:contentDescription="@string/mo_personal_note_confirm"
|
||||||
android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
|
android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
|
||||||
/>
|
/>
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
android:paddingHorizontal="16dp"
|
android:paddingHorizontal="16dp"
|
||||||
android:elevation="0dp"
|
android:elevation="0dp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:hint="@string/sk_personal_note"/>
|
android:hint="@string/mo_personal_note"/>
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/note_edit_confirm"
|
android:id="@+id/note_edit_confirm"
|
||||||
|
@ -39,8 +39,8 @@
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
android:layout_marginEnd="20dp"
|
android:layout_marginEnd="20dp"
|
||||||
android:layout_gravity="right|center_vertical"
|
android:layout_gravity="right|center_vertical"
|
||||||
android:tooltipText="@string/sk_personal_note_confirm"
|
android:tooltipText="@string/mo_personal_note_confirm"
|
||||||
android:contentDescription="@string/sk_personal_note_confirm" />
|
android:contentDescription="@string/mo_personal_note_confirm" />
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
|
|
|
@ -67,9 +67,9 @@
|
||||||
<string name="sk_example_domain">beispiel.social</string>
|
<string name="sk_example_domain">beispiel.social</string>
|
||||||
<string name="sk_tabs_disable_swipe">Wischen zwischen Tabs deaktivieren</string>
|
<string name="sk_tabs_disable_swipe">Wischen zwischen Tabs deaktivieren</string>
|
||||||
<string name="sk_settings_profile">Profil einrichten</string>
|
<string name="sk_settings_profile">Profil einrichten</string>
|
||||||
<string name="sk_personal_note">Notiz zu diesem Profil hinzufügen</string>
|
<string name="mo_personal_note">Notiz zu diesem Profil hinzufügen</string>
|
||||||
<string name="sk_personal_note_confirm">Änderungen der Notiz bestätigen</string>
|
<string name="mo_personal_note_confirm">Änderungen der Notiz bestätigen</string>
|
||||||
<string name="sk_personal_note_update_failed">Speichern der Notiz fehlgeschlagen</string>
|
<string name="mo_personal_note_update_failed">Speichern der Notiz fehlgeschlagen</string>
|
||||||
<string name="sk_settings_posting">Einstellungen für Beiträge</string>
|
<string name="sk_settings_posting">Einstellungen für Beiträge</string>
|
||||||
<string name="sk_settings_filters">Filter konfigurieren</string>
|
<string name="sk_settings_filters">Filter konfigurieren</string>
|
||||||
<string name="sk_settings_auth">Sicherheits-Einstellungen</string>
|
<string name="sk_settings_auth">Sicherheits-Einstellungen</string>
|
||||||
|
@ -133,11 +133,11 @@
|
||||||
<string name="sk_compose_no_draft">Nicht entwerfen</string>
|
<string name="sk_compose_no_draft">Nicht entwerfen</string>
|
||||||
<string name="sk_settings_reduce_motion">Bewegung in Animationen reduzieren</string>
|
<string name="sk_settings_reduce_motion">Bewegung in Animationen reduzieren</string>
|
||||||
<string name="sk_bot_account">Dies ist ein Bot-Konto</string>
|
<string name="sk_bot_account">Dies ist ein Bot-Konto</string>
|
||||||
<string name="sk_no_image_desc_title">Keine Bildbeschreibung</string>
|
<string name="mo_no_image_desc_title">Keine Bildbeschreibung</string>
|
||||||
<string name="sk_no_image_desc">Die enthaltenen Bilder haben keine Beschreibung. Bitte füge eine Beschreibung hinzu, damit auch sehbehinderte Personen teilnehmen können.</string>
|
<string name="mo_no_image_desc">Die enthaltenen Bilder haben keine Beschreibung. Bitte füge eine Beschreibung hinzu, damit auch sehbehinderte Personen teilnehmen können.</string>
|
||||||
<string name="sk_emoji_recent">Kürzlich verwendet</string>
|
<string name="mo_emoji_recent">Kürzlich verwendet</string>
|
||||||
<string name="sk_clear_recent_emoji">Kürzlich verwendete Emojis löschen</string>
|
<string name="mo_clear_recent_emoji">Kürzlich verwendete Emojis löschen</string>
|
||||||
<string name="sk_disable_relocate_publish_button_to_enable_customization">Deaktiviere die Funktion "Veröffentlichen Schaltfläche verschieben", um eine Anpassung zu ermöglichen.</string>
|
<string name="mo_disable_relocate_publish_button_to_enable_customization">Deaktiviere die Funktion "Veröffentlichen Schaltfläche verschieben", um eine Anpassung zu ermöglichen.</string>
|
||||||
<string name="sk_keep_only_latest_notification">Nur neueste Benachrichtigung behalten</string>
|
<string name="sk_keep_only_latest_notification">Nur neueste Benachrichtigung behalten</string>
|
||||||
<string name="sk_announcements">Ankündigungen</string>
|
<string name="sk_announcements">Ankündigungen</string>
|
||||||
<string name="sk_mark_as_read">Als gelesen markieren</string>
|
<string name="sk_mark_as_read">Als gelesen markieren</string>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="mo_app_name" translatable="false">Megalodon</string>
|
<string name="mo_app_name" translatable="false">Moshidon</string>
|
||||||
|
|
||||||
<string name="mo_color_palette_nord">Nord</string>
|
<string name="mo_color_palette_nord">Nord</string>
|
||||||
<string name="mo_app_username" translatable="false">\@moshidon</string>
|
<string name="mo_app_username" translatable="false">\@moshidon</string>
|
||||||
|
@ -10,11 +10,19 @@
|
||||||
<string name="mo_welcome_text">To get started, please enter your home instance’s domain name below.</string>
|
<string name="mo_welcome_text">To get started, please enter your home instance’s domain name below.</string>
|
||||||
|
|
||||||
<!-- Setting this as non-translatable as it simply doesnt change with language-->
|
<!-- Setting this as non-translatable as it simply doesnt change with language-->
|
||||||
<string name="mo_settings_app_version" translatable="false">Megalodon v%1$s (%2$d)</string>
|
<string name="mo_settings_app_version" translatable="false">Moshidon v%1$s (%2$d)</string>
|
||||||
|
|
||||||
<string name="mo_settings_contribute">Contribute to Megalodon</string>
|
<string name="mo_personal_note">Add a note about this profile</string>
|
||||||
<string name="mo_update_available">Megalodon %s is ready to download.</string>
|
<string name="mo_personal_note_confirm">Confirm changes to note</string>
|
||||||
<string name="mo_update_ready">Megalodon %s is downloaded and ready to install.</string>
|
<string name="mo_personal_note_update_failed">Failed to save note</string>
|
||||||
|
<string name="mo_settings_contribute">Contribute to Moshidon</string>
|
||||||
|
<string name="mo_update_available">Moshidon %s is ready to download.</string>
|
||||||
|
<string name="mo_update_ready">Moshidon %s is downloaded and ready to install.</string>
|
||||||
|
<string name="mo_no_image_desc_title">No Image description</string>
|
||||||
|
<string name="mo_no_image_desc">The included images have no description. Please consider adding one, to allow visually impaired people to participate.</string>
|
||||||
|
<string name="mo_emoji_recent">Recently used</string>
|
||||||
|
<string name="mo_clear_recent_emoji">Clear recently used emoji</string>
|
||||||
|
<string name="mo_disable_relocate_publish_button_to_enable_customization">Disable "Relocate publish button" to allow customization</string>
|
||||||
|
|
||||||
<!-- accessibility labels-->
|
<!-- accessibility labels-->
|
||||||
<string name="mo_poll_option_add">Add new poll option</string>
|
<string name="mo_poll_option_add">Add new poll option</string>
|
||||||
|
|
Loading…
Reference in New Issue