jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/374395 )
Change subject: Grand renaming: the sequel ...................................................................... Grand renaming: the sequel Update to align with current mocks. Also updates both code and presentation so as not to refer to the comp date as a download date. Bug: T172546 Change-Id: Ib59e20475530112fd5f60610bc75fb8549ccec6f --- M app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java M app/src/main/java/org/wikipedia/page/Page.java M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java M app/src/main/res/values-ar/strings.xml M app/src/main/res/values-ast/strings.xml M app/src/main/res/values-ca/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-de/strings.xml M app/src/main/res/values-es/strings.xml M app/src/main/res/values-eu/strings.xml M app/src/main/res/values-fa/strings.xml M app/src/main/res/values-fr/strings.xml M app/src/main/res/values-gl/strings.xml M app/src/main/res/values-hi/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-iw/strings.xml M app/src/main/res/values-jv/strings.xml M app/src/main/res/values-kab/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-ms/strings.xml M app/src/main/res/values-nb/strings.xml M app/src/main/res/values-nl/strings.xml M app/src/main/res/values-pt-rBR/strings.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values-ru/strings.xml M app/src/main/res/values-sd/strings.xml M app/src/main/res/values-su/strings.xml M app/src/main/res/values-sv/strings.xml M app/src/main/res/values-zh-rTW/strings.xml M app/src/main/res/values-zh/strings.xml M app/src/main/res/values/strings.xml M app/src/main/res/values/strings_no_translate.xml 34 files changed, 42 insertions(+), 65 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java b/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java index 0df6965..8049ac6 100644 --- a/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java +++ b/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java @@ -72,7 +72,7 @@ @NonNull final DialogInterface.OnClickListener onRemoveClick) { new AlertDialog.Builder(context) .setMessage(R.string.compilation_remove_confirm) - .setPositiveButton(R.string.compilation_remove_confirm_yes, new DialogInterface.OnClickListener() { + .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { remove(compilation); @@ -80,7 +80,7 @@ onRemoveClick.onClick(dialogInterface, i); } }) - .setNegativeButton(R.string.compilation_remove_confirm_no, null) + .setNegativeButton(android.R.string.no, null) .show(); } diff --git a/app/src/main/java/org/wikipedia/page/Page.java b/app/src/main/java/org/wikipedia/page/Page.java index 30836a7..77a11e6 100755 --- a/app/src/main/java/org/wikipedia/page/Page.java +++ b/app/src/main/java/org/wikipedia/page/Page.java @@ -4,9 +4,9 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; +import org.wikipedia.offline.Compilation; import org.wikipedia.settings.RbSwitch; -import java.util.Date; import java.util.List; /** @@ -20,7 +20,8 @@ @NonNull private final List<Section> sections; @NonNull private final PageProperties pageProperties; - @Nullable private Date compilationDownloadDate; + @Nullable private String compName; + @Nullable private long compTimestamp; /** * An indicator what payload version the page content was originally retrieved from. @@ -94,15 +95,20 @@ } public boolean isFromOfflineCompilation() { - return compilationDownloadDate != null; + return compName != null; } - @Nullable public Date getCompilationDownloadDate() { - return compilationDownloadDate; + @Nullable public long getCompilationTimestamp() { + return compTimestamp; } - public void setCompilationDownloadDate(@NonNull Date date) { - this.compilationDownloadDate = date; + @Nullable public String getCompilationName() { + return compName; + } + + public void setCompilation(@NonNull Compilation comp) { + this.compName = comp.name(); + this.compTimestamp = comp.timestamp(); } /** For old PHP API */ diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java index ae22167..a299b47 100644 --- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java +++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java @@ -58,7 +58,6 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Map; @@ -480,8 +479,7 @@ sendMarginPayload(); OfflineManager.HtmlResult result = OfflineManager.instance() .getHtmlForTitle(model.getTitle().getDisplayText()); - Date downloadDate = new Date(result.compilation().timestamp()); - page.setCompilationDownloadDate(downloadDate); + page.setCompilation(result.compilation()); JSONObject zimPayload = setLeadSectionMetadata(new JSONObject(), page) .put("zimhtml", result.html()) .put("fromRestBase", false) @@ -499,7 +497,7 @@ //give it our expected scroll position, in case we need the page to be pre-scrolled upon loading. zimPayload.put("scrollY", (int) (stagedScrollY / DimenUtil.getDensityScalar())); bridge.sendMessage("displayFromZim", zimPayload); - showOfflineCompilationMessage(downloadDate); + showOfflineCompilationMessage(result.compilation().name(), result.compilation().timestamp()); } catch (JSONException e) { throw new RuntimeException(e); } catch (IOException e) { @@ -644,11 +642,11 @@ } } - private void showOfflineCompilationMessage(@NonNull Date lastModified) { + private void showOfflineCompilationMessage(@NonNull String compName, @NonNull long timestamp) { if (fragment.isAdded()) { - String dateStr = DateUtil.getShortDateString(lastModified); + String dateStr = DateUtil.getShortDateString(timestamp); Toast.makeText(fragment.getContext().getApplicationContext(), - fragment.getString(R.string.page_offline_notice_compilation_download_date, dateStr), + fragment.getString(R.string.page_offline_notice_compilation_download_date, compName, dateStr), Toast.LENGTH_LONG).show(); } } diff --git a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java index 7a48a9e..8c5ffb3 100644 --- a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java +++ b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java @@ -52,6 +52,7 @@ import retrofit2.Call; +import static org.wikipedia.util.DateUtil.getShortDateString; import static org.wikipedia.util.L10nUtil.formatDateRelative; import static org.wikipedia.util.L10nUtil.getStringForArticleLanguage; import static org.wikipedia.util.UriUtil.visitInExternalBrowser; @@ -298,12 +299,12 @@ // content, or, for a ZIM compilation, a plain string (nothing to link) with the ZIM file's // local last modified date (most likely, the download date). private String getDateMessage(Page page) { - return page.isFromOfflineCompilation() ? compilationLastModifiedString(page) : lastUpdatedHtml(page); + return page.isFromOfflineCompilation() ? compilationInfoString(page) : lastUpdatedHtml(page); } - private String compilationLastModifiedString(Page page) { - return parentFragment.getContext().getString(R.string.bottom_content_date_downloaded, - formatDateRelative(page.getCompilationDownloadDate())); + private String compilationInfoString(Page page) { + return String.format(parentFragment.getString(R.string.offline_library_article_name_date), + page.getCompilationName(), getShortDateString(page.getCompilationTimestamp())); } private String lastUpdatedHtml(Page page) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ba9e431..b222fdd 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -238,7 +238,6 @@ <string name="page_offline_notice_cannot_load_while_offline">لا يمكن تحميل المقالة في حالة عدم الاتصال.</string> <string name="page_offline_notice_add_to_reading_list">ملحوظة: أضف المقالة إلى قائمة قراءة وسيتم تنزيلها حينما تعاود الاتصال بالشبكة.</string> <string name="page_offline_notice_last_date">أنت تقرأ نسخةً من هذه المقالة بوضع عدم الاتصال تم حفظها في %s.</string> - <string name="page_offline_notice_compilation_download_date">أنت تقرأ حالياً نسخة من هذه المقالة محفوظة مسبقاً، تم تحميلها في %s.</string> <string name="button_get_directions">احصل على الاتجاهات</string> <string name="error_no_maps_app">تعذّر إيجاد أي تطبيقٍ يوفر الاتجاهات</string> <string name="preference_title_show_link_previews">إظهار معايناتٍ للوصلة</string> diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index fdd6e88..91576a2 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Nun pué cargase l\'artículu en tando sin conexón.</string> <string name="page_offline_notice_add_to_reading_list">Gabitu: Añade l\'artículu a una llista de llectura y se descargará en coneutando.</string> <string name="page_offline_notice_last_date">Tas lleyendo una versión sin conexón d\'esti artículu guardada el %s.</string> - <string name="page_offline_notice_compilation_download_date">Tas lleyendo una versión sin conexón d\'esti artículu d\'una compilación descargada el %s.</string> <string name="button_get_directions">Recibir indicaciones</string> <string name="error_no_maps_app">Nun pudo alcontrase nenguna app qu\'ufra indicaciones</string> <string name="preference_title_show_link_previews">Amosar vistes previes de los enllaces</string> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 6e232cd..2d8019b 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">No es pot carregar l\'article mentre estigueu fora de línia.</string> <string name="page_offline_notice_add_to_reading_list">Pista: En afegir l\'article a una llista de lectura es baixarà una vegada torneu a estar en línia.</string> <string name="page_offline_notice_last_date">Esteu llegint una versió fora de línia de l\'article desada el %s.</string> - <string name="page_offline_notice_compilation_download_date">Esteu llegint una versió fora de línia de l\'article d\'una compilació baixada el %s.</string> <string name="button_get_directions">Obtén indicacions</string> <string name="error_no_maps_app">No es pot trobar cap aplicació que proporcioni direccions.</string> <string name="preference_title_show_link_previews">Mostra l\'enllaç de vistes prèvies</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 6345eca..4f08640 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Artiklen kan ikke indlæses offline.</string> <string name="page_offline_notice_add_to_reading_list">Fif: Tilføj artiklen til en læseliste, og den vil blive hentet når du er på nettet igen.</string> <string name="page_offline_notice_last_date">Du læser en offlineudgave af denne artikel gemt den %s.</string> - <string name="page_offline_notice_compilation_download_date">Du læser en lokal version af denne artikel fra en samling hentet den %s.</string> <string name="button_get_directions">Få rutevejledninger</string> <string name="error_no_maps_app">Kunne ikke finde nogen apps, der giver rutevejledninger.</string> <string name="preference_title_show_link_previews">Vis forhåndsvisning af links</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c4cb6a5..5fa305f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Der Artikel kann nicht geladen werden, während du offline bist.</string> <string name="page_offline_notice_add_to_reading_list">Hinweis: Füge den Artikel zu einer Leseliste hinzu und er wird heruntergeladen, sobald du wieder online bist.</string> <string name="page_offline_notice_last_date">Du liest eine Offline-Version dieses Artikels, die am %s gespeichert wurde.</string> - <string name="page_offline_notice_compilation_download_date">Du liest eine Offline-Version dieses Artikels aus einer Zusammenstellung, die am %s heruntergeladen wurde.</string> <string name="button_get_directions">Richtungen abrufen</string> <string name="error_no_maps_app">Es konnten keine Apps gefunden werden, die Richtungen zur Verfügung stellen.</string> <string name="preference_title_show_link_previews">Vorschaubilder von Links anzeigen</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e788086..6cebb27 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">El artículo no se puede cargar mientras no haya conexión.</string> <string name="page_offline_notice_add_to_reading_list">Pista: añade el artículo a una lista de lectura y se descargará cuando te vuelvas a conectar.</string> <string name="page_offline_notice_last_date">Estás leyendo una versión sin conexión de este artículo guardada el %s.</string> - <string name="page_offline_notice_compilation_download_date">Estás leyendo una versión sin conexión de este artículo de una recopilación descargada el %s.</string> <string name="button_get_directions">Obtener indicaciones</string> <string name="error_no_maps_app">No se pudo encontrar ninguna aplicación que proporcione indicaciones.</string> <string name="preference_title_show_link_previews">Mostrar vistas previas de enlaces</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index e180c15..bd219a4 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -193,7 +193,6 @@ <string name="text_copied">Testua klip-erretilura kopiatua.</string> <string name="button_continue_to_article">Artikulua irakurri</string> <string name="page_offline_notice_add_to_reading_list">Pista: artikulua irakurteka zerrendara gehitu eta konexioa duzunean jaitsiko da.</string> - <string name="page_offline_notice_compilation_download_date">%s-eko jaitsitako bildumaren konexio gabeko artikulu bat irakurtzen ari zara.</string> <string name="button_get_directions">Helbidea lortu</string> <string name="preference_title_show_link_previews">Lotura aurreikuspenak erakutsi</string> <string name="nav_item_donate">Wikipedia Lagundu</string> diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 9b8d809..6659207 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">امکان بارگیری مقاله در حالت آفلاین وجود ندارد.</string> <string name="page_offline_notice_add_to_reading_list">توجه: افزودن مقاله به فهرست خواندن و زمانی که برخط شدید، دانلود خواهد شد.</string> <string name="page_offline_notice_last_date">شما در حال خواندن نسخهٔ آفلاین مقاله هستید که بر روی %s ذخیره شدهاست.</string> - <string name="page_offline_notice_compilation_download_date">در حال مطالعهٔ نسخهٔ آفلاین این مقاله از گردآوری بارگیری شده %s هستید.</string> <string name="button_get_directions">دریافت مسیر</string> <string name="error_no_maps_app">نمی تواند اپلیکیشنی برای یافتن جهت پیدا کند.</string> <string name="preference_title_show_link_previews">نمایش پیوند پیشنمایشها</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 28aea89..fc50799 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">L’article ne peut pas être chargé hors connexion.</string> <string name="page_offline_notice_add_to_reading_list">Astuce: ajoutez l’article à une liste de lecture et il sera téléchargé une fois que vous serez à nouveau connecté.</string> <string name="page_offline_notice_last_date">Vous lisez une version hors ligne sauvegardée le %s.</string> - <string name="page_offline_notice_compilation_download_date">Vous lisez une version hors connexion de cet article, depuis une compilation téléchargée le %s.</string> <string name="button_get_directions">Obtenir les directions</string> <string name="error_no_maps_app">Impossible de trouver une application qui fournit des directions.</string> <string name="preference_title_show_link_previews">Afficher les aperçus de lien</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index bc98051..ff7721d 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">O artigo non se pode cargar mentres non haxa conexión.</string> <string name="page_offline_notice_add_to_reading_list">Pistaː Engade o artigo a unha lista de lectura e descargarase cando se volva conectar.</string> <string name="page_offline_notice_last_date">Está lendo unha versión sen conexión deste artigo gardado o %s.</string> - <string name="page_offline_notice_compilation_download_date">Está lendo unha versión sen conexión deste artigo, dunha recompilación descargada o %s.</string> <string name="button_get_directions">Obter as direccións</string> <string name="error_no_maps_app">Imposible atopar unha aplicación que proporcione as direccións.</string> <string name="preference_title_show_link_previews">Mostrar vistas previas de ligazóns</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index ca76015..d3b2751 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -238,7 +238,6 @@ <string name="page_offline_notice_cannot_load_while_offline">ऑफलाइन होने पर लेख लोड नहीं किया जा सकता।</string> <string name="page_offline_notice_add_to_reading_list">सहायता: लेख को अपनी पढ़ने वाली सूची में जोड़ें और जब आप वापस ऑनलाइन होंगे इसे डाउनलोड कर लिया जाएगा।</string> <string name="page_offline_notice_last_date">आप %s पर सहेजे गए लेख का ऑफ़लाइन वर्ज़न पढ़ रहे हैं।</string> - <string name="page_offline_notice_compilation_download_date">आप %s पर डाउनलोड किए गए संकलन से इस आलेख के एक ऑफ़लाइन संस्करण को पढ़ रहे हैं।</string> <string name="button_get_directions">दिशानिर्देश पाएं</string> <string name="error_no_maps_app">दिशानिर्देश देने वाली किसी एप को नहीं पाया जा सका।</string> <string name="preference_title_show_link_previews">कड़ी की झलक दिखायें</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 73587b9..f9f9d2a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Artikel tidak dapat dimuat saat luring.</string> <string name="page_offline_notice_add_to_reading_list">Petunjuk: Tambahkan artikel ke daftar bacaan dan akan diunduh setelah Anda kembali daring.</string> <string name="page_offline_notice_last_date">Anda sedang membaca versi luring dari artikel ini yang disimpan pada %s</string> - <string name="page_offline_notice_compilation_download_date">Anda sedang membaca versi luring artikel ini dari kompilasi yang diunduh pada %s.</string> <string name="button_get_directions">Dapatkan petunjuk arah</string> <string name="error_no_maps_app">Tidak dapat menemukan aplikasi yang memberikan petunjuk arah.</string> <string name="preference_title_show_link_previews">Tampilkan pratayang pranala</string> diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 696e2ed..de982ad 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">אי־אפשר לטעון ערך ללא חיבור לרשת.</string> <string name="page_offline_notice_add_to_reading_list">רמז: הוסף את הערך לרשימת הקריאה, והוא יוּרד כששוב יהיה חיבור לרשת.</string> <string name="page_offline_notice_last_date">זאת גרסה לקריאה ללא חיבור לרשת של הערך הזה, שנשמרה ב־%s.</string> - <string name="page_offline_notice_compilation_download_date">זוהי גרסה שמיועדת לקריאה ללא חיבור לרשת מתוך מהדורה שהוּרדה ב־%s.</string> <string name="button_get_directions">לקבל כיוונים</string> <string name="error_no_maps_app">לא מצאתי שום אפליקציה שנותנת כיוונים.</string> <string name="preference_title_show_link_previews">תצוגה מקדימה של קישורים</string> diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml index c29ce1e..055cedd 100644 --- a/app/src/main/res/values-jv/strings.xml +++ b/app/src/main/res/values-jv/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Artikel ora bisa dimot nalika ing njaban jaringan.</string> <string name="page_offline_notice_add_to_reading_list">Pasemon: Tambah artikel nyang pratélan wacan lan artikelé bakal kaundhuh nalika panjenengan bali nyang njeron jaringan.</string> <string name="page_offline_notice_last_date">Panjenengan lagi maca vèrsi njaban jaringan artikel iki sing disimpen nalika %s.</string> - <string name="page_offline_notice_compilation_download_date">Panjenengan pinuju maca vèrsi njaban jaringané artikel iki saka kompilasi sing diundhuh nalika %s.</string> <string name="button_get_directions">Golèk lor-kidul</string> <string name="error_no_maps_app">Ora bisa nemokaké apa aplikasi sing nyedhiyani pituduh.</string> <string name="preference_title_show_link_previews">Tampilake cuplikan pranala</string> diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 3994bfd..466ef18 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -238,7 +238,6 @@ <string name="page_offline_notice_cannot_load_while_offline">amagrad ur yezmir ara ad d-yali ticki ur teqqineḍ ara.</string> <string name="page_offline_notice_add_to_reading_list">Taxbalut: rnu amagrad ar tebdart n tɣuri sakin ad tettwasider ticki teqqneḍ tikelt-nniden.</string> <string name="page_offline_notice_last_date">Aqla-k teqqareḍ lqem yettwakelsen deg war tuqqna di %s.</string> - <string name="page_offline_notice_compilation_download_date">Aqla-k teqqaṛeḍ lqem n war tuqqna n umagrad-agi, seg tagrumma yettwasidren di %s.</string> <string name="button_get_directions">Awi iwellihen</string> <string name="error_no_maps_app">Ur izmir ara ad d-yaf asnas yettmuddun iwellihen.</string> <string name="preference_title_show_link_previews">Wali tiskanin n useɣwen</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index df11a1f..23ae00c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -238,7 +238,6 @@ <string name="page_offline_notice_cannot_load_while_offline">오프라인 상태에서는 글을 불러올 수 없습니다.</string> <string name="page_offline_notice_add_to_reading_list">참고: 문서를 읽기 목록에 추가하면 온라인에 있을 때 다운로드됩니다.</string> <string name="page_offline_notice_last_date">%s에 저장한 이 문서의 오프라인 버전을 읽고 있습니다.</string> - <string name="page_offline_notice_compilation_download_date">%s에 다운로드한 모음집에서 이 문서의 오프라인 버전을 읽고 있습니다.</string> <string name="button_get_directions">경로 얻기</string> <string name="error_no_maps_app">주어진 경로의 앱을 찾지 못하였습니다.</string> <string name="preference_title_show_link_previews">링크 미리보기 보이기</string> diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 5bed033..42c7436 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Статијата не може да се вчита додека не сте на линија.</string> <string name="page_offline_notice_add_to_reading_list">Совет: Додајте ја статијата во список за читање, па истата ќе биде преземена кога ќе добиете линија.</string> <string name="page_offline_notice_last_date">Читате вонмрежна верзија на статијава, зачувана на %s.</string> - <string name="page_offline_notice_compilation_download_date">Читате вонмрежна верзија на статијава од збирка преземена на %s.</string> <string name="button_get_directions">Дај насоки</string> <string name="error_no_maps_app">Не можев да најдам прилози што даваат насоки.</string> <string name="preference_title_show_link_previews">Прегледи на врски</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 269f3e5..ba8db40 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Rencana tidak boleh dimuatkan semasa di luar talian.</string> <string name="page_offline_notice_add_to_reading_list">Petunjuk: Menambah rencana ke senarai bacaan dan ia akan dimuat turun apabila anda kembali dalam talian.</string> <string name="page_offline_notice_last_date">Anda membaca versi luar talian artikel ini disimpan pada %s.</string> - <string name="page_offline_notice_compilation_download_date">Anda sedang membaca versi luar talian rencana ini dari kompilasi yang dimuat turun pada %s.</string> <string name="button_get_directions">Tunjuk jalan</string> <string name="error_no_maps_app">Tidak dapat menemui sebarang aplikasi yang boleh menunjukkan jalan.</string> <string name="preference_title_show_link_previews">Paparkan pratonton pautan</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 9015af1..436d189 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -230,7 +230,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Artikkelen kan ikke lastes uten nett</string> <string name="page_offline_notice_add_to_reading_list">Tips: Legger du til artikkelen i leselisten vil den bli lastet ned så fort du har nett igjen.</string> <string name="page_offline_notice_last_date">Du leser en offlineutgave av denne artikkelen som ble lagret %s.</string> - <string name="page_offline_notice_compilation_download_date">Du leser en offlineversion av denne artikkelen fra en sammenstilling lastet ned %s.</string> <string name="button_get_directions">Veibeskrivelse</string> <string name="error_no_maps_app">Fant ikke noen apper som kunne gi veibeskrivelse.</string> <string name="preference_title_show_link_previews">Forhåndsvis lenker</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6e761a7..1e41ab5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -230,7 +230,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Artikel kan niet geladen worden in een offline-modus.</string> <string name="page_offline_notice_add_to_reading_list" fuzzy="true">Voeg het artikel toe aan een leeslijst en deze zal toegevoegd worden eens u terug online bent.</string> <string name="page_offline_notice_last_date">U bent een offline-versie aan het lezen van dit artikel opgeslaan in %s.</string> - <string name="page_offline_notice_compilation_download_date">U bent een offline versie aan het lezen van dit artikel vanuit een gedowloade samenstelling op %s.</string> <string name="button_get_directions">Routebeschrijving</string> <string name="error_no_maps_app">Er zijn geen apps gevonden die routebeschrijvingen bieden.</string> <string name="preference_title_show_link_previews">Voorvertoningen van koppelingen weergeven</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2faec70..b3d875a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">O artigo não pode ser carregado enquanto estiver offline.</string> <string name="page_offline_notice_add_to_reading_list">Dica: Adicione o artigo a uma lista de leitura e ele será baixado assim que estiver online novamente.</string> <string name="page_offline_notice_last_date">Você está lendo uma versão offline deste artigo salvo em %s.</string> - <string name="page_offline_notice_compilation_download_date">Você está lendo uma versão offline deste artigo de uma compilação baixada em %s.</string> <string name="button_get_directions">Obter itinerário</string> <string name="error_no_maps_app">Não foi possível encontrar aplicativos que forneceçam rotas.</string> <string name="preference_title_show_link_previews">Mostrar pré-visualização de ligações</string> diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml index d116b9b..33f05a7 100644 --- a/app/src/main/res/values-qq/strings.xml +++ b/app/src/main/res/values-qq/strings.xml @@ -240,7 +240,7 @@ <string name="page_offline_notice_cannot_load_while_offline">Message informing the user that an article cannot be loaded while the app is offline. This message is followed by page_offline_notice_add_to_reading_list.</string> <string name="page_offline_notice_add_to_reading_list">Message inviting the user to add the requested article to a reading list to be downloaded when the app is online. This message follows {{msg-wm|Wikipedia-android-strings-page_offline_notice_cannot_load_while_offline}}.</string> <string name="page_offline_notice_last_date">Message that tells the user that the current article is loaded from offline storage. The %s symbol is replaced with the date when the article was saved.</string> - <string name="page_offline_notice_compilation_download_date">Message that tells the user that the current article is loaded from a downloaded offline compilation. The %s symbol is replaced with the date when the compilation was downloaded.</string> + <string name="page_offline_notice_compilation_download_date">Message that tells the user that the current article is loaded from a downloaded offline compilation. The %1$s symbol is replaced with the name of the article pack containing the article, and the %2$s symbol is replaced with the date when the compilation was downloaded.</string> <string name="button_get_directions">Button to obtain directions to the location specified in the link preview.</string> <string name="error_no_maps_app">Error displayed when the device does not have any apps installed that are capable of providing directions to a location.</string> <string name="preference_title_show_link_previews">Title of the preference for enabling or disabling link previews.\n\nShown in the preferences screen along with the following:\n* {{msg-wikimedia|Wikipedia-android-strings-preference title show images}}\n* {{msg-wikimedia|Wikipedia-android-strings-preference title language}}\n* {{msg-wikimedia|Wikipedia-android-strings-preference title show link previews}}\n* {{msg-wikimedia|Wikipedia-android-strings-preference title eventlogging opt in}}\n* {{msg-wikimedia|Wikipedia-android-strings-zero warn when leaving}}</string> @@ -421,13 +421,13 @@ <string name="offline_read_permission_rationale">Message explaining why we need permission to access the device storage when reading articles in offline mode.</string> <string name="offline_read_permission_error">Error shown when the app could not read from the internal or external storage of the device due to permission not being granted.</string> <string name="offline_card_text">Message shown in the Feed card that informs the user that they are now browsing Wikipedia in offline mode.</string> - <string name="offline_my_compilations">Button label for the user to access their list of article packs.</string> + <string name="offline_my_compilations">Button label for the user to navigate to the offline library screen.</string> <string name="offline_compilations_title">Title shown on the toolbar of the activity for managing article packs.</string> <string name="offline_compilations_search_by_name">Menu item for searching article packs by name.</string> - <string name="offline_compilations_found_count">Label that states how many article packs the user has available. The %d symbol is replaced with the number of article packs detected.</string> - <string name="offline_compilations_add">Button text for adding an offline article pack.</string> + <string name="offline_compilations_found_count">Label that states how many article packs the user has available in the Offline Library. The %d symbol is replaced with the number of article packs detected.</string> + <string name="offline_compilations_add">Button text for adding an offline article pack to the Offline Library.</string> <string name="remote_compilations_title">Title shown on the toolbar of the activity that shows all downloadable article packs.</string> - <string name="remote_compilations_description">Short description about article packs and their benefits.</string> + <string name="remote_compilations_description">Short description of the Offline Library.</string> <string name="offline_compilation_detail_date_size">Information about the date and size of an article pack. The %1$s and %2$.2f symbols will be replaced with the date and size. Only the \"GB\" unit needs to be translated (see storage_size_gb).</string> <string name="offline_compilation_detail_button_download">Label for a button for downloading an offline article pack. The %.2f symbol is replaced with the article pack size, in gigabytes (GB).</string> <string name="offline_compilation_detail_button_remove">Label for a button for removing an offline article pack from storage on the user\'s device.</string> @@ -449,8 +449,6 @@ <string name="compilation_share">Menu label for sharing the selected article pack through another app.</string> <string name="compilation_remove">Menu label for removing the selected article pack from the device.</string> <string name="compilation_remove_confirm">Confirmation message asking if the user really wants to remove the selected article pack from the device.</string> - <string name="compilation_remove_confirm_yes">Affirmative answer to remove the selected article pack.\n{{Identical|Yes}}</string> - <string name="compilation_remove_confirm_no">Negative answer to cancel the selected article pack.\n{{Identical|No}}</string> <string name="offline_library_title">Title shown at the top of the activity for managing the offline library.</string> <string name="offline_library_empty_title">Message shown when the offline library is empty.</string> <string name="offline_library_empty_description">Explanation encouraging the user to download an article pack for offline use later.</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0a93a3c..dcb33cb 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Статья не может быть загружена без подключения к Интернету.</string> <string name="page_offline_notice_add_to_reading_list">Подсказка: Добавьте эту статью в список к прочтению, и она будет загружена, как только появится подключение к сети.</string> <string name="page_offline_notice_last_date">Вы читаете офлайн-версия статьи, сохранённой %s.</string> - <string name="page_offline_notice_compilation_download_date">Вы читаете офлайн-версию этой статьи из компиляции, загруженной на %s.</string> <string name="button_get_directions">Проложить маршрут</string> <string name="error_no_maps_app">Не удалось найти ни одного приложения, которое бы прокладывало маршрут.</string> <string name="preference_title_show_link_previews">Показывать предпросмотр ссылок</string> diff --git a/app/src/main/res/values-sd/strings.xml b/app/src/main/res/values-sd/strings.xml index 053b9f2..c1ffd48 100644 --- a/app/src/main/res/values-sd/strings.xml +++ b/app/src/main/res/values-sd/strings.xml @@ -233,7 +233,6 @@ <string name="page_offline_notice_cannot_load_while_offline">آفلائين ھجڻ وقت صفحو لاھي نٿو سگھجي.</string> <string name="page_offline_notice_add_to_reading_list">اشارو:ڪو بہ مضمون پنھنجي پڙھڻ جي فھرست ۾ شامل ڪريو ان کي لاٿو ويندو جڏھن توھان ٻيھر آنلائين ٿيندئو.</string> <string name="page_offline_notice_last_date">توھان %s تي سانڍيل ھن مضمون جو ھڪ آفلائين ورزن پڙھي رھيا آھيو.</string> - <string name="page_offline_notice_compilation_download_date">توھان %s تي لاٿل ھڪ ميڙ مان ھن مضمون جو ھڪ آفلائين ورزن پڙھي رھيا آھيو.</string> <string name="button_get_directions">ھدايتون حاصل ڪريو</string> <string name="error_no_maps_app">ھدايتون مھيا ڪندڙ ڪي بہ ايپس لڀجي نہ سگھيون.</string> <string name="preference_title_show_link_previews">ڳنڍڻن جي پيش نگاھ ڏيکاريو</string> diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml index 337f5d6..ba90602 100644 --- a/app/src/main/res/values-su/strings.xml +++ b/app/src/main/res/values-su/strings.xml @@ -238,7 +238,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Artikel teu bisa dimuat mun keur luring.</string> <string name="page_offline_notice_add_to_reading_list">Pituduh: Tambahkeun artikel kana daptar bacaan sangkan bisa diundeur sanggeus anjeun onlén deui.</string> <string name="page_offline_notice_last_date">Anjeun keur maca vérsi luring tina ieu artikel nu disimpen dina %s</string> - <string name="page_offline_notice_compilation_download_date">Anjeun keur maca vérsi luring ieu artikel tina kompilasi anu diundeur dina %s.</string> <string name="button_get_directions">Beunangkeun pituduh arah</string> <string name="error_no_maps_app">Teu bisa manggihan aplikasi nu méré pituduh arah.</string> <string name="preference_title_show_link_previews">Témbongkeun pramidang tutumbu</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 03e1334..007b0d4 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">Artikeln kan inte läsas in i offlineläge.</string> <string name="page_offline_notice_add_to_reading_list">Tips: Lägg till artikeln i en läslista och den kommer att laddas ned så fort du blir online igen.</string> <string name="page_offline_notice_last_date">Du läser en offlineversion av denna artikel som sparades den %s.</string> - <string name="page_offline_notice_compilation_download_date">Du läser en offlineversion av denna artikel från en sammanställning som laddades ned den %s.</string> <string name="button_get_directions">Få vägbeskrivningar</string> <string name="error_no_maps_app">Kunde inte hitta några appar som kan ge vägbeskrivningar.</string> <string name="preference_title_show_link_previews">Visa förhandsvisning för länkar</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 89a7270..de24b20 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">條目不能在離線時載入。</string> <string name="page_offline_notice_add_to_reading_list">提示:將條目新增至閱讀清單,令您可在返回線上時下載。</string> <string name="page_offline_notice_last_date">您正閱讀此條目儲存於 %s 的離線版本。</string> - <string name="page_offline_notice_compilation_download_date">您正閱讀此條目來自下載於%s的匯編離線版本。</string> <string name="button_get_directions">取得路線</string> <string name="error_no_maps_app">無法找到任何提供路線的應用程式。</string> <string name="preference_title_show_link_previews">顯示連結預覽</string> diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 6811742..0ad8348 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -240,7 +240,6 @@ <string name="page_offline_notice_cannot_load_while_offline">条目不能在离线时加载。</string> <string name="page_offline_notice_add_to_reading_list">提示:添加条目至阅读列表,这样当您恢复在线时它将自动被下载。</string> <string name="page_offline_notice_last_date">您正在阅读该条目的离线版本,其保存于%s。</string> - <string name="page_offline_notice_compilation_download_date">您正在阅读此条目的离线版本,其从%s下载并汇编而来。</string> <string name="button_get_directions">路线导航</string> <string name="error_no_maps_app">找不到任何提供导航的应用程序。</string> <string name="preference_title_show_link_previews">显示链接预览</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c235df8..8e61537 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -254,7 +254,7 @@ <string name="page_offline_notice_cannot_load_while_offline">Article cannot be loaded while offline.</string> <string name="page_offline_notice_add_to_reading_list">Hint: Add the article to a reading list and it will be downloaded once you\'re back online.</string> <string name="page_offline_notice_last_date">You are reading an offline version of this article saved on %s.</string> - <string name="page_offline_notice_compilation_download_date">You are reading an offline version of this article from a compilation downloaded on %s.</string> + <string name="page_offline_notice_compilation_download_date">You\'re reading the version of this article from %1$s • %2$s.</string> <string name="button_get_directions">Get directions</string> <string name="error_no_maps_app">Could not find any apps that provide directions.</string> <string name="preference_title_show_link_previews">Show link previews</string> @@ -473,14 +473,14 @@ <!-- Offline --> <string name="offline_read_permission_rationale">Permission to access storage on your device is required for offline browsing.</string> <string name="offline_read_permission_error">Permission not granted to read from device storage.</string> - <string name="offline_card_text">You are now browsing Wikipedia in offline mode. Please note that offline articles may not be fully up to date with the online version.</string> - <string name="offline_my_compilations">My article packs</string> + <string name="offline_card_text">You are now browsing Wikipedia offline with articles in your Offline Library.</string> + <string name="offline_my_compilations">Manage my offline library</string> <string name="offline_compilations_title">Offline Library</string> <string name="offline_compilations_search_by_name">Search article packs by name</string> - <string name="offline_compilations_found_count">My article packs (%d)</string> - <string name="offline_compilations_add">Add article pack</string> - <string name="remote_compilations_title">All article packs</string> - <string name="remote_compilations_description">Article packs are large bundles of articles that can be downloaded as one file to your device, so you can continue browsing while offline.</string> + <string name="offline_compilations_found_count">In my library (%d)</string> + <string name="offline_compilations_add">Add to my Offline Library</string> + <string name="remote_compilations_title">Offline Library</string> + <string name="remote_compilations_description">With the Offline Library, you can now download packs of articles for reading when you have no internet connection available.</string> <string name="offline_compilation_detail_date_size">%1$s • %2$.2f GB</string> <string name="offline_compilation_detail_button_download">Download • %.2f GB</string> <string name="offline_compilation_detail_button_remove">Remove</string> @@ -501,14 +501,12 @@ <string name="compilation_download_cancel_confirm_no">No</string> <string name="compilation_share">Share</string> <string name="compilation_remove">Remove</string> - <string name="compilation_remove_confirm">Are you sure you want to remove this article pack from your device?</string> - <string name="compilation_remove_confirm_yes">Yes</string> - <string name="compilation_remove_confirm_no">No</string> + <string name="compilation_remove_confirm">Do you want to remove this from your Offline Library?</string> <string name="offline_library_title">Offline Library</string> <string name="offline_library_empty_title">Nothing in your Offline Library</string> <string name="offline_library_empty_description">Choose a pack of Wikipedia articles to download now, for data-free access later.</string> <string name="offline_library_empty_search">Search Offline Library</string> - <string name="offline_library_search_results_state">Search results from available offline library</string> + <string name="offline_library_search_results_state">Search results from your Offline Library</string> <string name="offline_library_onboarding_action">Find out more</string> <string name="offline_library_onboarding_text">Introducing Offline Library — download article packs now for offline reading later.</string> <string name="offline_library_onboarding_button_done">Done</string> diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml index d2454c1..18e379f 100644 --- a/app/src/main/res/values/strings_no_translate.xml +++ b/app/src/main/res/values/strings_no_translate.xml @@ -106,4 +106,7 @@ <string name="storage_size_format">%.2f</string> + <!-- Offline Library article bottom content --> + <string name="offline_library_article_name_date">%1$s • %2$s</string> + </resources> -- To view, visit https://gerrit.wikimedia.org/r/374395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib59e20475530112fd5f60610bc75fb8549ccec6f Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Cooltey <cf...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits