Fix rebase

This commit is contained in:
RedBlackAka 2026-05-16 17:50:06 +02:00 committed by GitHub
parent 118785bbc1
commit d673d67695
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -3,7 +3,7 @@
<!-- General application strings -->
<string name="app_name" translatable="false">Azahar</string>
<string name="app_disclaimer">This software will run applications for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Azahar\'s user data in.</string>
<string name="app_disclaimer">This software will run applications for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Azahar\'s user data in.\n\nWhat\'s this:\n<a href='https://github.com/azahar-emu/azahar/wiki/Android-User-Data-and-Storage'>Wiki - Citra Android user data and storage</a></string>
<string name="app_notification_channel_name" translatable="false">Azahar</string>
<string name="app_notification_channel_id" translatable="false">Azahar</string>
<string name="app_notification_channel_description">Azahar 3DS emulator notifications</string>
@ -95,14 +95,14 @@
<string name="warning_skip">Skip</string>
<string name="warning_cancel">Cancel</string>
<string name="select_citra_user_folder">Select User Folder</string>
<string name="select_citra_user_folder_description"><![CDATA[Select your user data directory with the button below.]]></string>
<string name="select_citra_user_folder_description"><![CDATA[Select your <a href="https://github.com/azahar-emu/azahar/wiki/Android-User-Data-and-Storage">user data</a> directory with the button below.]]></string>
<string name="select_which_user_directory_to_use">You appear to have user directories set for both Lime3DS and Azahar. This is likely because you upgraded to Azahar, and when prompted chose a different user directory than what was being used for Lime3DS.\n\nThis may have resulted in you thinking you lost saves or other settings - we apologize if that happened.\n\nWould you like to go back to using your original Lime3DS user directory, restoring settings and save games from Lime3DS, or keep your current Azahar user directory?\n\nNeither directory will be deleted, regardless of your choice, and you may freely switch between them using the Select User Folder option.</string>
<string name="keep_current_azahar_directory">Keep Current Azahar Directory</string>
<string name="use_prior_lime3ds_directory">Use Prior Lime3DS Directory</string>
<string name="select">Select</string>
<string name="cannot_skip">You can\'t skip setting up the user folder</string>
<string name="cannot_skip_directory_description">This step is required to allow Azahar to work. Please select a directory and then you can continue.</string>
<string name="selecting_user_directory_without_write_permissions">You have lost write permissions on your user data directory, where saves and other information are stored. This can happen after some app or Android updates. Please re-select the directory to regain permissions so you can continue.</string>
<string name="selecting_user_directory_without_write_permissions">You have lost write permissions on your <a href="https://github.com/azahar-emu/azahar/wiki/Android-User-Data-and-Storage">user data</a> directory, where saves and other information are stored. This can happen after some app or Android updates. Please re-select the directory to regain permissions so you can continue.</string>
<string name="invalid_selection">Invalid Selection</string>
<string name="invalid_user_directory">The user directory selection was invalid.\nPlease re-select the user directory, ensuring that you navigate to it from the root of your device\'s storage.</string>
<string name="filesystem_permission_lost">Azahar has lost permission to manage files on this device. This can happen after some app or Android updates. Please re-grant this permission on the next screen to continue using the app.</string>
@ -397,7 +397,6 @@
<string name="learn_more">Learn More</string>
<string name="close">Close</string>
<string name="reset_to_default">Reset to Default</string>
<string name="redump_games"><![CDATA[Please check the wiki and redump your <a href="https://github.com/azahar-emu/azahar/wiki/Dumping-Games">game titles</a>.]]></string>
<string name="option_default">Default</string>
<string name="none">None</string>
<string name="auto">Auto</string>