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

Commit a187b96a authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'cm-14.1' into v1-nougat

parents 9c59093a f5310ba0
Loading
Loading
Loading
Loading
+27 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
     Copyright (C) 2013-2014 The CyanogenMod Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     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">
    <plurals name="backlight_timeout_time">
        <item quantity="one"><xliff:g id="seconds">%d</xliff:g> saniyə</item>
        <item quantity="other"><xliff:g id="seconds">%d</xliff:g> saniyə</item>
    </plurals>
    <plurals name="app_ops_count">
        <item quantity="one">bir dəfə</item>
        <item quantity="other">%d dəfə</item>
    </plurals>
</resources>
+536 −0

File added.

Preview size limit exceeded, changes collapsed.

+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
     Copyright (C) 2013-2014 The CyanogenMod Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     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">
    <plurals name="backlight_timeout_time">
        <item quantity="one"><xliff:g id="seconds">%d</xliff:g> sekunda</item>
        <item quantity="few"><xliff:g id="seconds">%d</xliff:g> sekundy</item>
        <item quantity="many"><xliff:g id="seconds">%d</xliff:g> sekund</item>
        <item quantity="other"><xliff:g id="seconds">%d</xliff:g> sekund</item>
    </plurals>
    <plurals name="app_ops_count">
        <item quantity="one">jednou</item>
        <item quantity="few">%d krát</item>
        <item quantity="many">%d krát</item>
        <item quantity="other">%d krát</item>
    </plurals>
</resources>
+161 −134

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -404,8 +404,8 @@
    <string name="network_traffic_units_title">Verkkoliikenteen yksiköt</string>
    <string name="network_traffic_units_kilobits">Kilobittiä sekunnissa (kb/s)</string>
    <string name="network_traffic_units_megabits">Megabittiä sekunnissa (Mb/s)</string>
    <string name="network_traffic_units_kilobytes">Kilotavua sekunnissa (kB/s)</string>
    <string name="network_traffic_units_megabytes">Megatavua sekunnissa (MB/s)</string>
    <string name="network_traffic_units_kilobytes">Kilotavua sekunnissa (kt/s)</string>
    <string name="network_traffic_units_megabytes">Megatavua sekunnissa (Mt/s)</string>
    <string name="network_traffic_show_units">Näytä yksiköt</string>
    <string name="network_traffic_show_units_summary">Näytä verkkoliikenteen yksiköt tilapalkissa</string>
    <string name="protected_apps_manager_title">Suojatut sovellukset</string>
Loading