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

Commit 5a582710 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts... 

Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts when merging upstream changes
parent 161925a5

res/values-fr/strings.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
     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">Musique</string>

    <string name="page_artists">Artistes</string>

    <string name="page_albums">Albums</string>
@@ -68,6 +69,7 @@ 
    <string name="delete_warning">Cette action supprimera définitivement le cache des images</string>

    <string name="new_photo">Choisir une photo de la Galerie</string>

    <string name="use_default">Utiliser la photo par défaut</string>

    <string name="visualizer_perm_denied">L\'autorisation d\'enregistrement audio a été refusée, activez-la depuis l\'application Paramètres pour permettre la visualisation de la musique</string>

    <string name="context_menu_play_selection">Lire</string>

    <string name="context_menu_play_next">Lire le suivant</string>

    <string name="context_menu_play_album">Lire l\'album</string>
@@ -135,7 +137,6 @@ 
    <string name="header_5_plus_albums">Plus de 5 albums</string>

    <string name="header_other">"Autres"</string>

    <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>

    <string name="visualizer_perm_denied">La permission d\'enregistrer des contenus audio a été refusée, activez-la depuis les Paramètres du téléphone pour afficher les animations musicales.</string>

    <string name="channel_music">Lecture de musique</string>

    <string name="widget_track_name">Nom de la piste</string>

    <string name="widget_artist_name">Nom de l\'artiste</string>

res/values-nl/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
     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>

res/values-ru/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
     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">Музыка</string>

    <string name="page_artists">Исполнители</string>

    <string name="page_albums">Альбомы</string>

res/values/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 


    <string name="channel_music">Music playback</string>



    <string name="unknown_metadata">Unknown</string>

    <string name="widget_track_name">Track name</string>

    <string name="widget_artist_name">Artist name</string>

    <string name="widget_album_name">Album name</string>