Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd915b70 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch 'v1-q' into '115-Q-fix_merge_conflict_for_automatic_update'

# Conflicts:
#   res/values-nl/strings.xml
parents f118364e f9ef85cf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@
    <string name="playlist_top_tracks">Canzoni preferite</string>
    <string name="new_playlist">Nuova playlist</string>
    <string name="save">Salva</string>
    <string name="cancel">Annulla</string>
    <string name="cancel">Cancella</string>
    <string name="overwrite">Sovrascrivi</string>
    <string name="clear">Annulla</string>
    <string name="new_playlist_name_template">Playlist <xliff:g id="number">%d</xliff:g></string>
+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">Muziek</string>
    <string name="page_artists">Artiesten</string>
    <string name="page_albums">Albums</string>
@@ -32,7 +31,7 @@
    <string name="menu_shuffle_album">Shuffle album</string>
    <string name="menu_shuffle_artist">Shuffle artiest</string>
    <string name="menu_shuffle_top_tracks">Shuffle beste nummers</string>
    <string name="menu_shuffle_recent">Shuffle recente nrs.</string>
    <string name="menu_shuffle_recent">Shuffle recente nummers</string>
    <string name="menu_shuffle_last_added">Shuffle laatst toegevoegd</string>
    <string name="menu_sort_by">Sorteren op</string>
    <string name="menu_clear_list">Lijst wissen</string>
@@ -137,5 +136,6 @@
    <string name="header_5_plus_albums">5+ albums</string>
    <string name="header_other">"Overig"</string>
    <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
    <string name="channel_music">Afspelen van muziek</string>
    <string name="channel_music">Muziek afspelen</string>
    <string name="settings_use_blur_title">Achtergrond vervagen</string>
</resources>