Skip to content

Merge Upstream Changes. #1

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
HassanSardar wants to merge 3 commits into
base: own-n
Choose a base branch
from
Open

Merge Upstream Changes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
700ded3
Automatic translation import
ciwrl Jul 22, 2017
7a3ed55
Automatic translation import
ciwrl Aug 4, 2017
5104561
Merge branch 'cm-14.1' of https://github.com/LineageOS/android_packag…
HassanSardar Aug 8, 2017
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
1 change: 1 addition & 0 deletions res/values-ast-rES/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<!-- In-call screen: call failure reason (radio is off) -->
<!-- In-call screen: call failure reason (SIM error) -->
<!-- In-call screen: call failure reason (out of service) -->
<string name="callFailed_outOfService">Rede móvil non disponible</string>
<!-- In-call screen: call failure reason (call denied because of current FDN setting) -->
<!-- In-call screen: call failure reason (call modified to USSD request) -->
<!-- In-call screen: call failure reason (call modified to SS request) -->
Expand Down
2 changes: 1 addition & 1 deletion res/values-pl/qtistrings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<!-- Text for CallFailCause.PREEMPTION = 25 -->
<string name="callFailed_preemption">Wywłaszczenie</string>
<!-- Text for CallFailCause.CALL_FAIL_DESTINATION_OUT_OF_ORDER = 27 -->
<string name="callFailed_destination_out_of_order">Cel połączenia jest nieczynny</string>
<!-- Text for CallFailCause.INVALID_NUMBER = 28 -->
<string name="callFailed_invalid_number_format">Nieprawidłowy format numeru (numer niekompletny)</string>
<!-- Text for CallFailCause.FACILITY_REJECTED = 29 -->
Expand All @@ -67,6 +66,7 @@
<!-- Text for CallFailCause.TEMPORARY_FAILURE = 41 -->
<string name="callFailed_tempopary_failure">Tymczasowa awaria</string>
<!-- Text for CallFailCause.SWITCHING_CONGESTION = 42 -->
<string name="callFailed_switching_equipment_congestion">Przeciążenie urządzenia przełączającego</string>
<!-- Text for CallFailCause.ACCESS_INFORMATION_DISCARDED = 43 -->
<string name="callFailed_access_information_discarded">Informacja dostępowa odrzucona</string>
<!-- Text for CallFailCause.CHANNEL_NOT_AVAIL = 44 -->
Expand Down
6 changes: 3 additions & 3 deletions res/values-tr/qtistrings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<!-- Text for CallFailCause.OPERATOR_DETERMINED_BARRING = 8 -->
<string name="callFailed_operator_determined_barring">Operatör engelleme belirlendi</string>
<!-- Text for CallFailCause.NORMAL_CLEARING = 16 -->
<string name="callFailed_normal">Normal çağrı temizleme</string>
<string name="callFailed_normal">Normal arama temizleme</string>
<!-- Text for CallFailCause.CALL_FAIL_NO_USER_RESPONDING = 18 -->
<string name="callFailed_no_user_responding">Yanıt yok</string>
<!-- Text for CallFailCause.CALL_FAIL_NO_ANSWER_FROM_USER = 19 -->
Expand Down Expand Up @@ -79,15 +79,15 @@
<!-- Text for CallFailCause.REQUESTED_FACILITY_NOT_SUBSCRIBED = 50 -->
<string name="callFailed_requested_facility_not_subscribed">İstenen tesise abone olunmadı</string>
<!-- Text for CallFailCause.INCOMING_CALLS_BARRED_WITHIN_CUG = 55 -->
<string name="callFailed_incoming_calls_barred_within_CUG">Gelen çağrılar CUG ile yasaklanmış</string>
<string name="callFailed_incoming_calls_barred_within_CUG">Gelen aramalar CUG ile yasaklanmış</string>
<!-- Text for CallFailCause.BEARER_CAPABILITY_NOT_AUTHORIZED = 57 -->
<string name="callFailed_bearer_capability_not_authorized">Yetkilendirilmemiş taşıyıcı özelliği</string>
<!-- Text for CallFailCause.BEARER_NOT_AVAIL = 58 -->
<string name="callFailed_bearer_capability_unavailable">Taşıyıcı özelliği şu anda mevcut değil</string>
<!-- Text for CallFailCause.SERVICE_OPTION_NOT_AVAILABLE = 63 -->
<string name="callFailed_service_option_not_available">Servis veya seçenek kullanılabilir değil veya belirtilmemiş</string>
<!-- Text for CallFailCause.BEARER_SERVICE_NOT_IMPLEMENTED = 65 -->
<string name="callFailed_bearer_service_not_implemented">Taşıyıcı hizmet uygulanmadı</string>
<string name="callFailed_bearer_service_not_implemented">Taşıyıcı hizmeti uygulanmadı</string>
<!-- Text for CallFailCause.REQUESTED_FACILITY_NOT_IMPLEMENTED = 69 -->
<string name="callFailed_requested_facility_not_implemented">İstenen tesis uygulanmadı</string>
<!-- Text for CallFailCause.ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE = 70 -->
Expand Down