Skip to content

Commit 05a5e43

Browse files
authored
Merge pull request #7976 from Stypox/remove-yes-string
Replace `R.string.yes` with `R.string.ok`
2 parents b8e389c + 5f16e4e commit 05a5e43

76 files changed

Lines changed: 3 additions & 76 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
350350
new AlertDialog.Builder(requireContext())
351351
.setMessage(R.string.remove_watched_popup_warning)
352352
.setTitle(R.string.remove_watched_popup_title)
353-
.setPositiveButton(R.string.yes,
353+
.setPositiveButton(R.string.ok,
354354
(DialogInterface d, int id) -> removeWatchedStreams(false))
355355
.setNeutralButton(
356356
R.string.remove_watched_popup_yes_and_partially_watched_videos,

app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private void restoreDefaults() {
191191
.setTitle(R.string.restore_defaults)
192192
.setMessage(R.string.restore_defaults_confirmation)
193193
.setNegativeButton(R.string.cancel, null)
194-
.setPositiveButton(R.string.yes, (dialog, which) -> {
194+
.setPositiveButton(R.string.ok, (dialog, which) -> {
195195
sharedPreferences.edit().remove(savedInstanceListKey).apply();
196196
selectInstance(PeertubeInstance.defaultInstance);
197197
updateInstanceList();

app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private void restoreDefaults() {
136136
.setTitle(R.string.restore_defaults)
137137
.setMessage(R.string.restore_defaults_confirmation)
138138
.setNegativeButton(R.string.cancel, null)
139-
.setPositiveButton(R.string.yes, (dialog, which) -> {
139+
.setPositiveButton(R.string.ok, (dialog, which) -> {
140140
tabsManager.resetTabs();
141141
updateTabList();
142142
selectedTabsAdapter.notifyDataSetChanged();

app/src/main/res/values-ar/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
<string name="show_age_restricted_content_title">محتوى مقيد للبالغين</string>
9292
<string name="duration_live">بث مباشر</string>
9393
<string name="error_report_title">تقرير عن المشكلة</string>
94-
<string name="yes">نعم</string>
9594
<string name="disabled">متوقف</string>
9695
<string name="clear">تنظيف</string>
9796
<string name="best_resolution">أفضل دقة</string>

app/src/main/res/values-az/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@
169169
<string name="best_resolution">Ən yaxşı görüntü keyfiyyəti</string>
170170
<string name="clear">Təmizlə</string>
171171
<string name="disabled">Deaktiv edilib</string>
172-
<string name="yes">Bəli</string>
173172
<string name="artists">İfaçılar</string>
174173
<string name="albums">Albomlar</string>
175174
<string name="songs">Mahnılar</string>

app/src/main/res/values-b+ast/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<string name="detail_dislikes_img_view_description">Tarrezmes</string>
4545
<string name="default_video_format_title">Formatu de videu predetermináu</string>
4646
<string name="black_theme_title">Prietu</string>
47-
<string name="yes">Sí</string>
4847
<string name="short_thousand">mil</string>
4948
<string name="short_million">mill.</string>
5049
<string name="short_billion">mil mill.</string>

app/src/main/res/values-b+uz+Latn/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
<string name="best_resolution">Eng yaxshi qaror</string>
113113
<string name="clear">Tozalash</string>
114114
<string name="disabled">Ijrochilar o\'chirib qo\'yilgan</string>
115-
<string name="yes">Ha</string>
116115
<string name="artists">Artistlar</string>
117116
<string name="albums">Albomlar</string>
118117
<string name="songs">Qo\'shiqlar</string>

app/src/main/res/values-b+zh+HANS+CN/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<string name="unsupported_url">不支持的 URL</string>
2929
<string name="settings_category_appearance_title">外观</string>
3030
<string name="all">全部</string>
31-
<string name="yes">是</string>
3231
<string name="network_error">网络错误</string>
3332
<plurals name="videos">
3433
<item quantity="other">%s 个视频</item>

app/src/main/res/values-be/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
<string name="playlists">Плэйлісты</string>
9898
<string name="tracks">Дарожкі</string>
9999
<string name="users">Карыстальнікі</string>
100-
<string name="yes">Так</string>
101100
<string name="disabled">Адключана</string>
102101
<string name="clear">Ачысціць</string>
103102
<string name="best_resolution">Лепшае разрозненне</string>

app/src/main/res/values-ber/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<string name="file">ⴰⴼⴰⵢⵍⵓ</string>
5757
<string name="play_all">ⵖⵔ ⵎⴰⵕⵕⴰ</string>
5858
<string name="file_deleted">ⵉⵜⵜⵡⴰⴽⴽⵙ ⵓⴼⴰⵢⵍⵓ</string>
59-
<string name="yes">ⵢⴰⵀ</string>
6059
<string name="videos_string">ⵉⴼⵉⴷⵢⵓⵜⵏ</string>
6160
<string name="all">ⵎⴰⵕⵕⴰ</string>
6261
<string name="downloads_title">ⵓⴳⴳⴰⵎⵏ</string>

0 commit comments

Comments
 (0)