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

Commit 58b92f33 authored by Amit Kumar's avatar Amit Kumar
Browse files

Remove git conflict marker

Change-Id: If72bf1ccccc9896611327cd8bd0c7e0ce549738c
parent 98e88c3e
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -261,12 +261,7 @@
    <string name="profile_setup_setup_triggers_title_config">Triggers aanpassen: <xliff:g id="profile_name">%1$s</xliff:g></string>
    <string name="profile_setup_actions_title">Stap 2: acties instellen</string>
    <string name="profile_setup_actions_title_config">Acties aanpassen</string>
<<<<<<< HEAD
    <string name="wireless_networks_settings_title">Draadloos &amp; netwerken</string>
    <!-- Profile triggers -->
=======
    <string name="wireless_networks_settings_title">Draadloos en netwerken</string>
>>>>>>> lineage-15.1
    <string name="no_bluetooth_triggers">Geen Bluetooth-apparaten gekoppeld.\nTik om Bluetooth-apparaat te koppelen alvorens triggers in te stellen.</string>
    <string name="no_wifi_triggers">Geen draadloze toegangspunten ingesteld.\nTik om met wifi te verbinden alvorens triggers in te stellen.</string>
    <string name="no_triggers_configured">Geen triggers ingesteld. Tik om toe te voegen.</string>
@@ -447,11 +442,7 @@
    <string name="network_traffic_units_kilobytes">Kilobyte per seconde (kB/s)</string>
    <string name="network_traffic_units_megabytes">Megabyte per seconde (MB/s)</string>
    <string name="network_traffic_show_units">Eenheden weergeven</string>
<<<<<<< HEAD
    <!-- Protected apps -->
=======
    <string name="network_traffic_show_units_summary">Eenheid van netwerkverkeer weergeven in de statusbalk</string>
>>>>>>> lineage-15.1
    <string name="protected_apps_manager_title">Beschermde apps</string>
    <string name="protected_apps_manager_summary">Beheren welke apps beschermd zijn</string>
    <!-- Contributors cloud activity -->