Merge branch 'fix-merge-conflicts' into 'v1-q'

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <plurals name="backlight_timeout_time">

        <item quantity="one"><xliff:g id="seconds">%d</xliff:g> segundu</item>

        <item quantity="other"><xliff:g id="seconds">%d</xliff:g> segundos</item>

    </plurals>

    <plurals name="app_ops_count">

        <item quantity="one">una vegada</item>

        <item quantity="other">%d vegaes</item>