Skip to content
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

Merge duplicated duration plurals and introduce new plurals for selected count #3230

Merged
merged 13 commits into from
Mar 19, 2020
Merged

Merge duplicated duration plurals and introduce new plurals for selected count #3230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
878a5db
Translated using Weblate (German)
nautilusx Mar 13, 2020
dc1312d
Translated using Weblate (Esperanto)
B0pol Mar 13, 2020
0486ccb
Translated using Weblate (Macedonian)
Mar 13, 2020
fcc8066
Translated using Weblate (Polish)
weblate Mar 12, 2020
0876cdd
Translated using Weblate (Interlingua)
softinterlingua Mar 12, 2020
373ec96
Translated using Weblate (Nepali)
hemanta212 Mar 13, 2020
0f96f3b
Translated using Weblate (Nepali)
hemanta212 Mar 15, 2020
436b08a
Translated using Weblate (Nepali)
hemanta212 Mar 16, 2020
b1c72ba
Merge remote-tracking branch 'weblate/dev'
mauriciocolli Mar 19, 2020
d0f2a02
delete «seconds» plural string in favor of «dynamic_seek_duration_des…
B0pol Mar 15, 2020
0ae4d13
use plural string for feed_group_dialog_selection_count
B0pol Mar 15, 2020
85e16af
use val instead of val, make sentence more natural
B0pol Mar 18, 2020
27fc0d5
Make duration plurals naming consistent
mauriciocolli Mar 19, 2020
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
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
.putBoolean(getString(R.string.feed_use_dedicated_fetch_method_key), !usingDedicatedMethod)
.apply()
}
.setPositiveButton(android.R.string.ok, null)
.setPositiveButton(resources.getString(R.string.finish), null)
.create()
.show()
return true
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ class FeedGroupDialog : DialogFragment() {
val groupAdapter = GroupAdapter<GroupieViewHolder>()
groupAdapter.spanCount = if (useGridLayout) 4 else 1

val selectedCountText = getString(R.string.feed_group_dialog_selection_count, this.selectedSubscriptions.size)
val subscriptionsCount = this.selectedSubscriptions.size
val selectedCountText = resources.getQuantityString(R.plurals.feed_group_dialog_selection_count, subscriptionsCount, subscriptionsCount)
selected_subscription_count_view.text = selectedCountText
subscriptions_selector_header_info.text = selectedCountText

Expand Down Expand Up @@ -234,7 +235,8 @@ class FeedGroupDialog : DialogFragment() {
item.isSelected = isSelected
item.notifyChanged(PickerSubscriptionItem.UPDATE_SELECTED)

val updateSelectedCountText = getString(R.string.feed_group_dialog_selection_count, this.selectedSubscriptions.size)
val subscriptionsCount = this.selectedSubscriptions.size
val updateSelectedCountText = resources.getQuantityString(R.plurals.feed_group_dialog_selection_count, subscriptionsCount, subscriptionsCount)
selected_subscription_count_view.text = updateSelectedCountText
subscriptions_selector_header_info.text = updateSelectedCountText
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private void updateSeekOptions() {
displayedDurationValues.add(durationsValue);
try {
displayedDescriptionValues.add(String.format(
res.getQuantityString(R.plurals.dynamic_seek_duration_description,
res.getQuantityString(R.plurals.seconds,
currentDurationValue),
currentDurationValue));
} catch (Resources.NotFoundException ignored) {
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,12 @@
<string name="subtitle_activity_recaptcha">اضغط على \"تم\" عند حلها</string>
<string name="recaptcha_done_button">منجز</string>
<string name="videos_string">الفيديوهات</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="zero">%s ثوانٍ</item>
<item quantity="one">%s ثوانٍ</item>
<item quantity="two">%s ثوانٍ</item>
<item quantity="few">%s ثوانٍ</item>
<item quantity="many">%s ثوانٍ</item>
<item quantity="other">%s ثوانٍ</item>
<plurals name="seconds">
<item quantity="zero">%d ثوانٍ</item>
<item quantity="one">%d ثوانٍ</item>
<item quantity="two">%d ثوانٍ</item>
<item quantity="few">%d ثوانٍ</item>
<item quantity="many">%d ثوانٍ</item>
<item quantity="other">%d ثوانٍ</item>
</plurals>
</resources>
6 changes: 3 additions & 3 deletions app/src/main/res/values-b+ast/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@
<string name="app_language_title">Llingua de l\'aplicación</string>
<string name="systems_language">La predeterminada del sistema</string>
<string name="videos_string">Vídeos</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s segundos</item>
<item quantity="other">%s segundos</item>
<plurals name="seconds">
<item quantity="one">%d segundos</item>
<item quantity="other">%d segundos</item>
</plurals>
<string name="playback_tempo">Tempu</string>
<string name="playback_pitch">Tonu</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-b+zh+HANS+CN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,8 @@
<string name="subtitle_activity_recaptcha">完成后请按\"完成(Done)\"</string>
<string name="recaptcha_done_button">完成</string>
<string name="videos_string">视频</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="other">%s秒</item>
<plurals name="seconds">
<item quantity="other">%d秒</item>
</plurals>
<string name="new_seek_duration_toast">由于ExoPlayer的限制，搜寻间隔设置为％d秒</string>
<string name="mute">静音</string>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,10 @@ otevření ve vyskakovacím okně</string>
<string name="subtitle_activity_recaptcha">Po vyřešení stiskni \"Hotovo\"</string>
<string name="recaptcha_done_button">Hotovo</string>
<string name="videos_string">Videa</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s sekund</item>
<item quantity="few">%s sekund</item>
<item quantity="other">%s sekund</item>
<plurals name="seconds">
<item quantity="one">%d sekund</item>
<item quantity="few">%d sekund</item>
<item quantity="other">%d sekund</item>
</plurals>
<string name="new_seek_duration_toast">Kvůli omezením ExoPlayer bylo prohledávání nastaveno na %d vteřin</string>
<string name="mute">Umlčet</string>
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,10 +545,11 @@
<string name="subtitle_activity_recaptcha">\"Fertig\" drücken, wenn es gelöst wurde</string>
<string name="recaptcha_done_button">Fertig</string>
<string name="videos_string">Videos</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s Sekunde</item>
<item quantity="other">%s Sekunden</item>
<plurals name="seconds">
<item quantity="one">%d Sekunde</item>
<item quantity="other">%d Sekunden</item>
</plurals>
<string name="new_seek_duration_toast">Aufgrund von ExoPlayer-Einschränkungen wurde die Suchdauer auf %d Sekunden gesetzt</string>
<string name="mute">Stumm</string>
<string name="mute">Stummschaltung</string>
<string name="unmute">Stummschaltung aufheben</string>
</resources>
57 changes: 50 additions & 7 deletions app/src/main/res/values-eo/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
<string name="black_theme_title">Nigra</string>
<string name="popup_remember_size_pos_title">Memoru ŝprucfenestran grandecon kaj pozicion</string>
<string name="popup_remember_size_pos_summary">Memoru lastan grandecon kaj pozicion de ŝprucfenestro</string>
<string name="use_inexact_seek_title">Uzu rapide, ne preciza serĉon</string>
<string name="use_inexact_seek_summary">Ne preciza serĉo permesas al la ludanto serĉi poziciojn pli rapide kun malalta precizeco</string>
<string name="use_inexact_seek_title">Uzi rapide, ne precizan serĉon</string>
<string name="use_inexact_seek_summary">Ne preciza serĉo permesas al la ludanto serĉi poziciojn pli rapide kun malalta precizeco. Serĉi por 5, 15 kaj 25 sekundoj ne funckios kun tio opcio.</string>
<string name="download_thumbnail_title">Ŝarĝi bildetojn</string>
<string name="could_not_setup_download_menu">Ne povis konstrui la dosierujon de elŝuto</string>
<string name="live_streams_not_supported">Nunaj filmetoj ne estas ankoraŭ subtenataj</string>
Expand Down Expand Up @@ -292,7 +292,7 @@
\nElektu AFM se vi volas elŝuti al ekstera SD-karto</string>
<string name="downloads_storage_use_saf_title">Uzu AFM</string>
<string name="downloads_storage_use_saf_summary">La \"Atinga Framo al la Memoro\" ebligas elŝuti al ekstera SD-karto.
\nKomento: kelkaj aparatoj malkongruas</string>
\nKelkaj aparatoj malkongruas</string>
<string name="clear_playback_states_title">Forviŝi ludajn poziciojn</string>
<string name="clear_playback_states_summary">Forviŝi la totalon de ludaj pozicioj</string>
<string name="delete_playback_states_alert">Ĉu vi volas forviŝi ĉiujn ludajn poziciojn \?</string>
Expand Down Expand Up @@ -516,7 +516,7 @@
<item quantity="other">%s aŭskultantoj</item>
</plurals>
<string name="localization_changes_requires_app_restart">La lingvo ŝanĝos kiam la apo restartos.</string>
<string name="seek_duration_title">Rapida antaŭen / posten daŭron</string>
<string name="seek_duration_title">Rapida antaŭen / posten serĉan daŭron</string>
<string name="peertube_instance_url_title">Instancoj de PeerTube</string>
<string name="peertube_instance_url_summary">Elekti viajn preferitajn instancojn de PeerTube</string>
<string name="peertube_instance_url_help">Trovu la instancojn ke vi ŝatas ĉe %s</string>
Expand All @@ -543,8 +543,51 @@
<string name="systems_language">Sistemnormo</string>
<string name="subtitle_activity_recaptcha">Premu « Finita » kiam solvita</string>
<string name="recaptcha_done_button">Finita</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s sekundo</item>
<item quantity="other">%s sekundoj</item>
<plurals name="seconds">
<item quantity="one">%d sekundo</item>
<item quantity="other">%d sekundoj</item>
</plurals>
<plurals name="minutes">
<item quantity="one">%d minuto</item>
<item quantity="other">%d minutoj</item>
</plurals>

<plurals name="hours">
<item quantity="one">%d horo</item>
<item quantity="other">%d horoj</item>
</plurals>

<plurals name="days">
<item quantity="one">%d tago</item>
<item quantity="other">%d tagoj</item>
</plurals>

<!-- Feed -->
<string name="feed_groups_header_title">Abonfluoj grupoj</string>
<string name="feed_oldest_subscription_update">Lasta ĝisdatigo: %s</string>
<string name="feed_subscription_not_loaded_count">Ne ŝarĝitaj: %d</string>
<string name="feed_notification_loading">Ŝarĝante abonfluon…</string>
<string name="feed_processing_message">Procesante abonfluon…</string>
<string name="feed_group_dialog_select_subscriptions">Seletkti abonojn</string>
<plurals name="feed_group_dialog_selection_count">
<item quantity="one">%d selektita</item>
<item quantity="other">%d selektitaj</item>
</plurals>
<string name="feed_group_dialog_empty_selection">No subscription selected</string>
<string name="feed_group_dialog_empty_name">Malplena grupa nomo</string>
<string name="feed_group_dialog_name_input">Nomo</string>
<string name="feed_group_dialog_delete_message">Ĉu vi volas forviŝi tion grupon?</string>
<string name="feed_create_new_group_button_title">Nova</string>

<string name="settings_category_feed_title">Abonfluo</string>
<string name="feed_update_threshold_title">Abonflua ĝisdatiga sojlo</string>
<string name="feed_update_threshold_summary">Tempo post lasta ĝisdatigo antaŭ abono estas konsiderita malĝisdatigita — %s</string>
<string name="feed_update_threshold_option_always_update">Ĉiam ĝisdatigi</string>
<string name="feed_use_dedicated_fetch_method_title">Ŝarĝi el dediĉita abonfluo kiam ĝi haveblas</string>
<string name="feed_use_dedicated_fetch_method_summary">Havebla en kelkaj servoj, ĝi estas ĝenerale multe pli rapida, sed povas doni limigita kvanto da aĵoj kaj ofte malpreciza informoj (ekzemple: neniu duracio, ajâ tipo, neniu « nuna » statuso).</string>
<string name="feed_use_dedicated_fetch_method_enable_button">Ŝalti rapidan modon</string>
<string name="feed_use_dedicated_fetch_method_disable_button">Malŝati rapidan modon</string>
<string name="new_seek_duration_toast">Pro ExoPlayer limoj, la serĉa daŭro estas metita %d sekundojn</string>
<string name="mute">Mutigi</string>
<string name="unmute">Malmutigi</string>
</resources>
6 changes: 3 additions & 3 deletions app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,9 @@
<string name="subtitle_activity_recaptcha">Pulse en «Hecho» cuando esté resuelto</string>
<string name="recaptcha_done_button">Hecho</string>
<string name="videos_string">Vídeos</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s segundo</item>
<item quantity="other">%s segundos</item>
<plurals name="seconds">
<item quantity="one">%d segundo</item>
<item quantity="other">%d segundos</item>
</plurals>
<string name="new_seek_duration_toast">Debido a limitaciones de ExoPlayer la duración de la búsqueda fue fijada en %d segundos</string>
<string name="mute">Silenciar</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-eu/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,9 @@
<string name="subtitle_activity_recaptcha">Sakatu \"Egina\" konponduta dagoenean</string>
<string name="recaptcha_done_button">Egina</string>
<string name="videos_string">Bideoak</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s segundu</item>
<item quantity="other">%s segundu</item>
<plurals name="seconds">
<item quantity="one">%d segundu</item>
<item quantity="other">%d segundu</item>
</plurals>
<string name="new_seek_duration_toast">ExoPlayer-en mugak direla eta bilaketaren iraupena %d segundotan ezarri da</string>
</resources>
63 changes: 58 additions & 5 deletions app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
<string name="channel_unsubscribed">Désabonné de la chaîne</string>
<string name="tab_main">Principal</string>
<string name="tab_subscriptions">Abonnements</string>
<string name="fragment_feed_title">Nouveautés</string>
<string name="settings_category_downloads_title">Téléchargement</string>
<string name="action_settings">Paramètres</string>
<string name="action_about">À propos</string>
Expand Down Expand Up @@ -544,11 +543,65 @@
<string name="subtitle_activity_recaptcha">Appuyez sur « Terminé » une fois résolu</string>
<string name="recaptcha_done_button">Terminé</string>
<string name="videos_string">Vidéos</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s seconde</item>
<item quantity="other">%s secondes</item>
</plurals>
<string name="new_seek_duration_toast">En raison des contraintes d’ExoPlayer, le pas de déplacement a été réglée à %d secondes</string>
<string name="mute">Couper le son</string>
<string name="unmute">Remettre le son</string>
<plurals name="seconds">
<item quantity="one">%d seconde</item>
<item quantity="other">%d secondes</item>
</plurals>

<!-- Time duration plurals -->
<plurals name="minutes">
<item quantity="one">%d minute</item>
<item quantity="other">%d minutes</item>
</plurals>

<plurals name="hours">
<item quantity="one">%d heure</item>
<item quantity="other">%d heures</item>
</plurals>

<plurals name="days">
<item quantity="one">%d jour</item>
<item quantity="other">%d jours</item>
</plurals>

<!-- feed -->
<string name="fragment_feed_title">Nouveautés</string>
<string name="feed_groups_header_title">Groupes d\'abonnements</string>
<string name="feed_oldest_subscription_update">Dernière mise à jour : %s</string>
<string name="feed_subscription_not_loaded_count">Pas chargés : %d</string>
<string name="feed_notification_loading">Chargement du flux…</string>
<string name="feed_processing_message">Préparation du flux…</string>
<string name="feed_group_dialog_select_subscriptions">Choisir les abonnements</string>
<string name="feed_group_dialog_empty_selection">Aucun abonnement sélectionné</string>
<plurals name="feed_group_dialog_selection_count">
<item quantity="one">%d sélectionné</item>
<item quantity="other">%d sélectionnés</item>
</plurals>
<string name="feed_group_dialog_empty_name">Nom de groupe vide</string>
<string name="feed_group_dialog_name_input">Nom</string>
<string name="feed_group_dialog_delete_message">Voulez-vous supprimer ce groupe ?</string>
<string name="feed_create_new_group_button_title">Nouveau</string>

<string name="settings_category_feed_title">Flux</string>
<string name="feed_update_threshold_title">Seuil de mise à jour du flux</string>
<string name="feed_update_threshold_summary">Temps depuis la dernière mise à jour pour que le flux ne soit plus considéré comme à jour — %s</string>
<string name="feed_update_threshold_option_always_update">Toujours mettre à jour</string>
<string name="feed_use_dedicated_fetch_method_title">Charger depuis un service dédié quand c\'est possible</string>
<string name="feed_use_dedicated_fetch_method_summary">Disponible pour quelques services, c\'est généralement bien plus rapide mais peut retourner un nombre d\'élements limité et des informations souvent incomplètes (ex : pas de durée, pas de statut « En direct ».</string>
<string name="feed_use_dedicated_fetch_method_enable_button">Activer le mode rapide</string>
<string name="feed_use_dedicated_fetch_method_disable_button">Désactiver le mode rapide</string>
<string name="feed_use_dedicated_fetch_method_help_text">Pensez vous que la chargement du flux est trop lent ? Si c\'est le cas, essayez le mode rapide (vous pouvez changer le mode dans les paramètres ou en pressant le bouton en dessous).\n\n

NewPipe propose deux manières de charger le flux :\n
• Charger toutes les chaines auquelles vous êtes abonnés, cette manière est lente mais complète.\n
• Charger depuis un service dédié, cette manière est plus rapide mais souvent incomplète.\n\n

La différence entre les deux est que la méthode rapide manque souvent de quelques informations, comme la durée d\'un élément ou le type (nous ne pouvons pas différencier les vidéos en direct des vidéos normales) et pourrait retourner moins d\'éléments.\n\n

YouTube est un exemple qui offre cette méthode rapide avec le flux RSS.\n\n

Donc le choix vous revient : Preferrez-vous la vitesse où des informations précises ?</string>
</resources>
10 changes: 5 additions & 5 deletions app/src/main/res/values-he/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,11 @@
<string name="subtitle_activity_recaptcha">יש ללחוץ על „סיום” לאחר הפתירה</string>
<string name="recaptcha_done_button">סיום</string>
<string name="videos_string">סרטונים</string>
<plurals name="dynamic_seek_duration_description">
<item quantity="one">%s שניות</item>
<item quantity="two">%s שניות</item>
<item quantity="many">%s שניות</item>
<item quantity="other">%s שניות</item>
<plurals name="seconds">
<item quantity="one">%d שניות</item>
<item quantity="two">%d שניות</item>
<item quantity="many">%d שניות</item>
<item quantity="other">%d שניות</item>
</plurals>
<string name="new_seek_duration_toast">עקב מגבלות של ExoPlayer מגבלות טווחי החיפוש הוגדרו לכדי %d שניות</string>
<string name="mute">השתקה</string>
Expand Down
Loading