Skip to content

A
apk
Commit d8c2966e authored by DrKLO's avatar DrKLO
Browse files
Options

Revert italian localization to previous release, add some new strings

parent c125097b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 87 deletions
TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java
View file @ d8c2966e
......@@ -374,9 +374,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
getSupportActionBar().setTitle(String.format("%d %s %d", pos, LocaleController.getString("Of", R.string.Of), totalCount));
getSupportActionBar().setTitle(LocaleController.formatString("Of", R.string.Of, pos, totalCount));
if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", pos, LocaleController.getString("Of", R.string.Of), totalCount));
fakeTitleView.setText(LocaleController.formatString("Of", R.string.Of, pos, totalCount));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
......@@ -866,9 +866,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
getSupportActionBar().setTitle(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, LocaleController.getString("Of", R.string.Of), totalCount));
getSupportActionBar().setTitle(LocaleController.formatString("Of", R.string.Of, (totalCount - imagesArr.size()) + position + 1, totalCount));
if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, LocaleController.getString("Of", R.string.Of), totalCount));
fakeTitleView.setText(LocaleController.formatString("Of", R.string.Of, (totalCount - imagesArr.size()) + position + 1, totalCount));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
......@@ -885,9 +885,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
getSupportActionBar().setTitle(String.format("%d %s %d", position + 1, LocaleController.getString("Of", R.string.Of), imagesArrLocations.size()));
getSupportActionBar().setTitle(LocaleController.formatString("Of", R.string.Of, position + 1, imagesArrLocations.size()));
if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", position + 1, LocaleController.getString("Of", R.string.Of), imagesArrLocations.size()));
fakeTitleView.setText(LocaleController.formatString("Of", R.string.Of, position + 1, imagesArrLocations.size()));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
......
TMessagesProj/src/main/res/values-ar/strings.xml
View file @ d8c2966e
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">Arabic</string>
<string name="LanguangeNameInEnglish">Arabic</string>
<!--signin view-->
<string name="YourPhone">رقم هاتفك المحمول</string>
<string name="StartText">يرجى التحقق من صحة رمز بلدك وإدخال رقم هاتفك المحمول</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">حذف المجموعة</string>
<string name="SlideToCancel">قم بالسحب للإلغاء</string>
<string name="SaveToDownloads">حفظ في الجهاز</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">تم طلب محادثة سرية</string>
......@@ -250,6 +254,7 @@
<string name="Events">الأحداث</string>
<string name="ContactJoined">اشترك صديق في تيليجرام</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Language</string>
<!--media view-->
<string name="NoMedia">لا توجد وسائط بعد</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">عرض كافة الوسائط</string>
<string name="SaveToGallery">حفظ في الجهاز</string>
<string name="Of">من</string>
<string name="Of">%1$d من %2$d</string>
<string name="Gallery">الألبوم</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values-de/strings.xml
View file @ d8c2966e
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">German</string>
<string name="LanguangeNameInEnglish">German</string>
<!--signin view-->
<string name="YourPhone">Dein Telefon</string>
<string name="StartText">Bitte bestätige deine Landesvorwahl und deine Telefonnummer.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Diese Gruppe löschen</string>
<string name="SlideToCancel">WISCHEN UM ABZUBRECHEN</string>
<string name="SaveToDownloads">In Ordner Downloads speichern</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Geheimen Chat angefordert</string>
......@@ -250,6 +254,7 @@
<string name="Events">EREIGNISSE</string>
<string name="ContactJoined">Kontakt ist Telegram beigetreten</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Language</string>
<!--media view-->
<string name="NoMedia">Noch keine geteilten Medien vorhanden</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Zeige alle Medien</string>
<string name="SaveToGallery">In der Galerie speichern</string>
<string name="Of">von</string>
<string name="Of">%1$d von %2$d</string>
<string name="Gallery">Galerie</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values-es/strings.xml
View file @ d8c2966e
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">Spanish</string>
<string name="LanguangeNameInEnglish">Spanish</string>
<!--signin view-->
<string name="YourPhone">Tu teléfono</string>
<string name="StartText">Por favor, confirma tu código de país\ne introduce tu número.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Eliminar este grupo</string>
<string name="SlideToCancel">DESLIZA PARA CANCELAR</string>
<string name="SaveToDownloads">Guardar en descargas</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Chat secreto solicitado</string>
......@@ -250,6 +254,7 @@
<string name="Events">EVENTOS</string>
<string name="ContactJoined">Un contacto se unió a Telegram</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Language</string>
<!--media view-->
<string name="NoMedia">No hay fotos ni vídeos compartidos aún</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Mostrar todas las fotos y vídeos</string>
<string name="SaveToGallery">Guardar en galería</string>
<string name="Of">de</string>
<string name="Of">%1$d de %2$d</string>
<string name="Gallery">Galería</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values-nl/strings.xml
View file @ d8c2966e
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">Dutch</string>
<string name="LanguangeNameInEnglish">Dutch</string>
<!--signin view-->
<string name="YourPhone">Uw telefoon</string>
<string name="StartText">Bevestig uw landcode\nen voer uw telefoonnummer in.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Deze groep verwijderen</string>
<string name="SlideToCancel">SLEEP OM TE ANNULEREN</string>
<string name="SaveToDownloads">Opslaan in downloads</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Privégesprek aangevraagd</string>
......@@ -250,6 +254,7 @@
<string name="Events">GEBEURTENISSEN</string>
<string name="ContactJoined">Contact lid geworden van Telegram</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Language</string>
<!--media view-->
<string name="NoMedia">Nog geen media gedeeld</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Alle media weergeven</string>
<string name="SaveToGallery">Opslaan in galerij</string>
<string name="Of">van</string>
<string name="Of">%1$d van %1$d</string>
<string name="Gallery">Galerij</string>
<!--button titles-->
......
TMessagesProj/src/main/res/values/strings.xml
View file @ d8c2966e
......@@ -5,6 +5,9 @@
<resources>
<string name="AppName">Telegram</string>
<string name="LanguangeName">English</string>
<string name="LanguangeNameInEnglish">English</string>
<!--signin view-->
<string name="YourPhone">Your phone</string>
<string name="StartText">Please confirm your country code\nand enter your phone number.</string>
......@@ -107,6 +110,7 @@
<string name="DeleteThisGroup">Delete this group</string>
<string name="SlideToCancel">SLIDE TO CANCEL</string>
<string name="SaveToDownloads">Save to downloads</string>
<string name="ApplyLocalizationFile">Apply localization file</string>
<!--notification-->
<string name="EncryptedChatRequested">Secret chat requested</string>
......@@ -250,6 +254,7 @@
<string name="Events">EVENTS</string>
<string name="ContactJoined">Contact joined Telegram</string>
<string name="Pebble">PEBBLE</string>
<string name="Language">Language</string>
<!--media view-->
<string name="NoMedia">No shared media yet</string>
......@@ -268,7 +273,7 @@
<!--photo gallery view-->
<string name="ShowAllMedia">Show all media</string>
<string name="SaveToGallery">Save to gallery</string>
<string name="Of">of</string>
<string name="Of">%1$d of %2$d</string>
<string name="Gallery">Gallery</string>
<!--button titles-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment