Skip to content

Spezi stable #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Spezi stable #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3bcbdf8
Move CRT animation
codex-corp May 30, 2014
902e2a2
Move Third party apps/mods
codex-corp May 30, 2014
b449eb6
update UK translation
codex-corp May 30, 2014
0eec202
Settings: Remove Wallpaper selection from Display
romanbb Apr 16, 2014
0fa53a1
Fix MSIM Network Settings (1/2)
ciwrl Apr 22, 2014
554b439
Settings: Remove redundancy in description
elektroschmock May 5, 2014
1ef9bcb
settings: Various cleanups
hyperb1iss May 2, 2014
ded5df5
Revert "settings: Various cleanups"
spezi77 May 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions res/values-uk/cm_arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<!-- Copyright (C) 2012-2013 The CyanogenMod Project
=======
<!--Generated by crowdin.net-->
<!--
Copyright (C) 2012-2014 The CyanogenMod Project
>>>>>>> 565b300... Automatic translation import

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,12 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<<<<<<< HEAD

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


=======
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="wifi_countrycode_entries">
<item>США</item>
Expand All @@ -39,45 +29,19 @@
<item>Сингапур</item>
<item>Бразилія</item>
</string-array>
>>>>>>> 565b300... Automatic translation import
<string-array name="profile_entries">
<item>Увімкнути</item>
<item>Вимкнути</item>
<item>Залишити без змін</item>
</string-array>
<<<<<<< HEAD

=======
>>>>>>> 565b300... Automatic translation import
<string-array name="profile_connection_entries">
<item>Вимкнути</item>
<item>Увімкнути</item>
</string-array>
<<<<<<< HEAD

=======
>>>>>>> 565b300... Automatic translation import
<string-array name="entries_screentimeout_widget">
<item>15 сек. | 1 хв. | 5 хв.</item>
<item>30 сек. | 2 хв. | 5 хв.</item>
</string-array>
<<<<<<< HEAD

<string-array name="wifi_countrycode_entries">
<item>США</item>
<item>Канада, Тайвань</item>
<item>Германія</item>
<item>Європа</item>
<item>Японія, Росія</item>
<item>Австралія</item>
<item>Китай</item>
<item>Корея</item>
<item>Туреччина</item>
<item>Сингапур</item>
<item>Бразилія</item>
</string-array>

=======
<string-array name="data_usage_cycle_weekdays">
<item>Неділя</item>
<item>Понеділок</item>
Expand All @@ -92,5 +56,4 @@
<item>Відмовлено</item>
<item>Завжди питати</item>
</string-array>
>>>>>>> 565b300... Automatic translation import
</resources>
Loading