Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	app/src/main/res/values-zh-rCN/strings.xml
  • Loading branch information
@fast4x
fast4x committed Aug 23, 2024
2 parents cee5c93 + c7fe1b4 commit b43e023
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 37 deletions.
20 changes: 10 additions & 10 deletions app/src/main/res/values-ia/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<string name="start_radio">Initiar le radio</string>
<string name="equalizer">Equalizer</string>
<string name="stop_sleep_timer">Do you want to stop the sleep timer?</string>
<string name="set_sleep_timer">Set sleep timer</string>
<string name="set_sleep_timer">Definir le temporisator de somno</string>
<string name="add_to_playlist">Adder al lista de reproduction</string>
<string name="go_to_album">Vader al album</string>
<string name="remove_from_queue">Remove from queue</string>
Expand All @@ -17,13 +17,13 @@
<string name="related_albums">Related albums</string>
<string name="similar_artists">Similar artists</string>
<string name="playlists_you_might_like">Playlists you might like</string>
<string name="an_error_has_occurred">An error has occurred</string>
<string name="albums">Albums</string>
<string name="artists">Artists</string>
<string name="an_error_has_occurred">Ocurreva un error</string>
<string name="albums">Albumes</string>
<string name="artists">Artistas</string>
<string name="enter_the_playlist_name">Insere le nomine del lista de reproduction</string>
<string name="playlists">Listas de reproduction</string>
<string name="favorites">Favorites</string>
<string name="quick_picks">Quick picks</string>
<string name="favorites">Favoritos</string>
<string name="quick_picks">Selectiones rapide</string>
<string name="songs">Cantos</string>
<string name="other_versions">Altere versiones</string>
<string name="album_no_alternative_version">Iste album non ha necun versiones alternative</string>
Expand All @@ -50,14 +50,14 @@
<string name="size">Dimension</string>
<string name="cached">Cached</string>
<string name="loudness">Loudness</string>
<string name="clear">Clear</string>
<string name="clear">Rader</string>
<string name="error">Ocurreva un error.</string>
<string name="online">In linea</string>
<string name="no_results_found">No results found. Please try a different query or category</string>
<string name="videos">Videos</string>
<string name="featured">Featured</string>
<string name="view_the_source_code">Vider le codice fonte</string>
<string name="report_an_issue">Report an issue</string>
<string name="report_an_issue">Signalar un defecto</string>
<string name="you_will_be_redirected_to_github">You will be redirected to GitHub</string>
<string name="request_a_feature_or_suggest_an_idea">Request a feature or suggest an idea</string>
<string name="theme">Thema</string>
Expand Down Expand Up @@ -106,8 +106,8 @@
<string name="save_and_restore_playing_songs">Save and restore playing songs</string>
<string name="resume_playback">Resume playback</string>
<string name="when_device_is_connected">When a wired or bluetooth device is connected</string>
<string name="skip_silence">Skip silence</string>
<string name="skip_silent_parts_during_playback">Skip silent parts during playback</string>
<string name="skip_silence">Saltar le silentio</string>
<string name="skip_silent_parts_during_playback">Saltar partes in silentio durante le reproduction</string>
<string name="loudness_normalization">Loudness normalization</string>
<string name="autoadjust_the_volume">Adjust the volume to a fixed level</string>
<string name="interact_with_the_system_equalizer">Interact with the system equalizer</string>
Expand Down
54 changes: 27 additions & 27 deletions app/src/main/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,34 +685,34 @@
<string name="fadingedge">渐变边缘</string>
<string name="carousel">轮播视图</string>
<string name="carouselsize">轮播视图大小</string>
<string name="addednext">Added to play next</string>
<string name="info_paused_with_volume_zero">Paused with volume zero</string>
<string name="effect_fade_audio">Fade audio</string>
<string name="effect_fade_audio_description">Fade audio when song is paused or played</string>
<string name="autosync">Auto Sync Imported Playlists</string>
<string name="message_type">Message type</string>
<string name="message_type_modern">Modern</string>
<string name="message_type_essential">Essential</string>
<string name="discoverinforadio">Removes Liked and Playlist songs from Radio</string>
<string name="discover_has_been_applied_to_radio">Discover has been applied to radio, removed songs: %s</string>
<string name="songs_number_to_show">Songs number to show</string>
<string name="discover_has_been_applied_to_queue">Discover has been applied to queue, removed songs: %s</string>
<string name="player_pause_on_volume_zero">Pause on volume zero</string>
<string name="info_pauses_player_when_volume_zero">Pauses the player when the volume reaches 0 and resumes when the volume is greater than 0</string>
<string name="quality">Quality</string>
<string name="value_must_be_ip_address">Value must be an ip address</string>
<string name="addednext">已添加到接下来播放</string>
<string name="info_paused_with_volume_zero">已暂停且静音</string>
<string name="effect_fade_audio">音频淡入淡出</string>
<string name="effect_fade_audio_description">当歌曲暂停或播放时，淡出或淡入音频</string>
<string name="autosync">自动同步已导入播放列表</string>
<string name="message_type">消息类型</string>
<string name="message_type_modern">现代风格信息</string>
<string name="message_type_essential">必要信息</string>
<string name="discoverinforadio">从电台中移除已喜欢和播放列表中的歌曲</string>
<string name="discover_has_been_applied_to_radio">发现功能已应用于电台，且已删除歌曲: %s</string>
<string name="songs_number_to_show">显示歌曲</string>
<string name="discover_has_been_applied_to_queue">发现功能已应用于队列，且已删除歌曲: %s</string>
<string name="player_pause_on_volume_zero">已静音且暂停</string>
<string name="info_pauses_player_when_volume_zero">当静音时停止播放，当取消静音时恢复播放</string>
<string name="quality">质量</string>
<string name="value_must_be_ip_address">输入值必须是一个IP地址</string>
<string name="swipe_up_to_open_the_queue">Swipe up to open the queue</string>
<string name="pinfo_show_icons">Show info with icons</string>
<string name="format_ms">%1$s ms</string>
<string name="minimum_silence_length">Minimum silence length</string>
<string name="minimum_silence_length_description">The minimum time the audio has to be silent to get skipped</string>
<string name="minimum_silence_length_warning">Player has to be restarted for the changes to be effective!</string>
<string name="restart_service">Restart service</string>
<string name="player_pause_listen_history">Pause listen history</string>
<string name="queuetype">Queue Type</string>
<string name="chart_top_songs">Top songs</string>
<string name="chart_top_artists">Top artists</string>
<string name="lang_interlingua">Interlingua</string>
<string name="pinfo_show_icons">以图标显示信息</string>
<string name="format_ms">%1$s 毫秒</string>
<string name="minimum_silence_length">最小静音长度</string>
<string name="minimum_silence_length_description">可以被跳过的音频中最小包含的静音时长</string>
<string name="minimum_silence_length_warning">播放器必须重启才能使更改生效！</string>
<string name="restart_service">重启服务</string>
<string name="player_pause_listen_history">暂停播放记录</string>
<string name="queuetype">队列类型</string>
<string name="chart_top_songs">热门歌曲</string>
<string name="chart_top_artists">热门艺人</string>
<string name="lang_interlingua">拉丁国际语</string>
<string name="error_no_internet">No network connection</string>
<string name="error_timeout">Connection timeout</string>
<string name="error_unknown">Unknown error</string>
Expand Down

0 comments on commit b43e023

Please sign in to comment.