Merge pull request #1224 from kiwix/990-unify-catalog-naming

990 unify catalog naming
This commit is contained in:
Kelson 2025-06-29 21:24:01 +02:00 committed by GitHub
commit 9f4cd54353
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
34 changed files with 20 additions and 50 deletions

View File

@ -77,7 +77,6 @@
"zim_file.download_task.action.pause" = "Pause";
"zim_file.download_task.action.downloading" = "Downloader...";
"zim_file.download_task.action.paused" = "Sat på pause";
"library_settings.tab.library.title" = "Bibliotek";
"settings.navigation.title" = "Indstillinger";
"catalog_settings.refreshing.text" = "Opdaterer...";
"catalog_settings.refresh_now.button" = "Opdater Nu";

View File

@ -119,7 +119,6 @@
"library_settings.auto_refresh.toggle" = "Toli kahigibu";
"library_settings.catalog_warning.text" = "A yi niŋ, karimbu shee yuya pii doli taba nyɛla din yɛn kahigi di toli";
"library_settings.languages.title" = "Balla";
"library_settings.tab.library.title" = "Karimbu shee";
"settings.navigation.title" = "Bintaɣindisi";
"library_settings.toggle.cellular" = "Zaŋmi cɛllular deegi";
"library_settings.new-download-task-description" = "Taɣibu nyɛla din yɛn niŋ n-ti deeri palli koŋko.";

View File

@ -130,7 +130,6 @@
"library_settings.auto_refresh.toggle" = "Automatisch aktualisieren";
"library_settings.catalog_warning.text" = "Wenn diese Option aktiviert ist, wird ein nicht aktueller Bibliothekskatalog automatisch aktualisiert.";
"library_settings.languages.title" = "Sprachen";
"library_settings.tab.library.title" = "Bibliothek";
"settings.navigation.title" = "Einstellungen";
"library_settings.toggle.cellular" = "Über Mobilfunk herunterladen";
"library_settings.new-download-task-description" = "Die Änderung gilt nur für neue Downloads.";

View File

@ -14,11 +14,11 @@
// along with Kiwix; If not, see https://www.gnu.org/licenses/.
/* Library Refresh Error */
"library_refresh_error.retrieve.description" = "Error retrieving library data.";
"library_refresh_error.retrieve.description" = "Error retrieving catalog data.";
/* Library Refresh Error */
"library_refresh_error.parse.description" = "Error parsing library data.";
"library_refresh_error.parse.description" = "Error parsing catalog data.";
/* Library Refresh Error */
"library_refresh_error.process.description" = "Error processing library data.";
"library_refresh_error.process.description" = "Error processing catalog data.";
"download_service.complete.title" = "Download Completed";
"download_service.complete.description" = "%@ has been downloaded successfully.";
@ -167,12 +167,12 @@
"reading_settings.search_snippet.title" = "Search snippet";
"reading_settings.tab.reading" = "Reading";
"library_settings.catalog.title" = "Catalog";
"library_settings.downloads.title" = "Downloads";
"library_settings.button.refresh_now" = "Refresh Now";
"library_settings.last_refresh.text" = "Last refresh";
"library_settings.auto_refresh.toggle" = "Auto refresh";
"library_settings.catalog_warning.text" = "When enabled, the library catalog will be refreshed automatically when outdated.";
"library_settings.languages.title" = "Languages";
"library_settings.tab.library.title" = "Library";
"settings.navigation.title" = "Settings";
"library_settings.toggle.cellular" = "Download using cellular";
"library_settings.new-download-task-description" = "Change will only apply to new download tasks.";

View File

@ -130,7 +130,6 @@
"library_settings.auto_refresh.toggle" = "Actualización automática";
"library_settings.catalog_warning.text" = "Si esta opción está activada, el catálogo de la biblioteca se actualizará automáticamente cuando quede obsoleto.";
"library_settings.languages.title" = "Idiomas";
"library_settings.tab.library.title" = "Biblioteca";
"settings.navigation.title" = "Ajustes";
"library_settings.toggle.cellular" = "Descargar usando el móvil";
"library_settings.new-download-task-description" = "El cambio sólo se aplicará a las nuevas tareas de descarga.";

View File

@ -72,7 +72,6 @@
"zim_file.download_task.action.paused" = "Pysäytetty";
"reading_settings.external_link.title" = "Ulkoinen linkki";
"library_settings.languages.title" = "Kielet";
"library_settings.tab.library.title" = "Kirjasto";
"settings.navigation.title" = "Asetukset";
"settings.miscellaneous.button.feedback" = "Palaute";
"settings.miscellaneous.button.rate_app" = "Arvostele sovellus";

View File

@ -146,7 +146,6 @@
"library_settings.auto_refresh.toggle" = "Actualisation automatique";
"library_settings.catalog_warning.text" = "Lorsqu'il est activé, le catalogue de la bibliothèque sera actualisé automatiquement lorsqu'il sera obsolète.";
"library_settings.languages.title" = "Langues";
"library_settings.tab.library.title" = "Bibliothèque";
"settings.navigation.title" = "Paramètres";
"library_settings.toggle.cellular" = "Télécharger en utilisant un téléphone cellulaire";
"library_settings.new-download-task-description" = "Le changement ne s'appliquera qu'aux nouvelles tâches de téléchargement.";

View File

@ -127,7 +127,6 @@
"library_settings.auto_refresh.toggle" = "Wartsakewa auto";
"library_settings.catalog_warning.text" = "In an yarda, dakin karatun katalog zai wartsake otomatic in ya tashi a aiki";
"library_settings.languages.title" = "Yaruka";
"library_settings.tab.library.title" = "Reinbun karatu";
"settings.navigation.title" = "Setuka";
"library_settings.toggle.cellular" = "Zazzagewa ta cellula";
"library_settings.new-download-task-description" = "Chanji zai shafi sababin abin da aka saukar";

View File

@ -128,7 +128,6 @@
"library_settings.auto_refresh.toggle" = "רענון אוטומטי";
"library_settings.catalog_warning.text" = "כשזה מופעל, קטלוג הספרייה ירוענן אוטומטית כאשר הוא מתיישן.";
"library_settings.languages.title" = "שפות";
"library_settings.tab.library.title" = "ספרייה";
"settings.navigation.title" = "הגדרות";
"library_settings.toggle.cellular" = "להוריד באמצעות הרשת הסלולרית";
"library_settings.new-download-task-description" = "השינוי יחול רק על משימות הורדה חדשות.";

View File

@ -47,7 +47,6 @@
"reading_settings.zoom.reset.button" = "रीसेट करें";
"reading_settings.tab.reading" = "पढ़ना";
"library_settings.languages.title" = "भाषाएँ";
"library_settings.tab.library.title" = "पुस्तकालय";
"settings.navigation.title" = "सेटिंग्स";
"library_settings.toggle.cellular" = "सेलुलर का उपयोग करके डाउनलोड करें";
"settings.miscellaneous.navigation.about" = "विवरण";

View File

@ -127,7 +127,6 @@
"library_settings.auto_refresh.toggle" = "Auto-refrescar";
"library_settings.catalog_warning.text" = "Si es activate, le catalogo del bibliotheca essera refrescate automaticamente quando es obsolete.";
"library_settings.languages.title" = "Linguas";
"library_settings.tab.library.title" = "Bibliotheca";
"settings.navigation.title" = "Parametros";
"library_settings.toggle.cellular" = "Discargar per rete mobile";
"library_settings.new-download-task-description" = "Le cambiamento se applicara solmente al nove discargamentos.";

View File

@ -131,7 +131,6 @@
"library_settings.auto_refresh.toggle" = "Pemuatan ulang otomatis";
"library_settings.catalog_warning.text" = "Jika diaktifkan, katalog perpustakaan akan diperbarui secara otomatis jika sudah kadaluwarsa.";
"library_settings.languages.title" = "Bahasa";
"library_settings.tab.library.title" = "Perpustakaan";
"settings.navigation.title" = "Pengaturan";
"library_settings.toggle.cellular" = "Unduh menggunakan seluler";
"library_settings.new-download-task-description" = "Perubahan hanya akan berlaku untuk tugas pengunduhan baru.";

View File

@ -135,7 +135,6 @@
"library_settings.auto_refresh.toggle" = "mmeghagharị nke jị aka ya";
"library_settings.catalog_warning.text" = "Mgbe enyere ya ikike, katalọgụ ọba akwụkwọ ga-eji aka emeghagharị ihe mgbe ọ pụrụ na nke a na-akọ.";
"library_settings.languages.title" = "Asụsụga";
"library_settings.tab.library.title" = "Ọ́bá Akwụkwọ";
"settings.navigation.title" = "Ndoziga";
"library_settings.toggle.cellular" = "Budata site na iji ekwentị";
"library_settings.new-download-task-description" = "Mgbanwe ga-emetụta naanị ọrụ mbudata ọhụrụ.";

View File

@ -129,7 +129,6 @@
"library_settings.auto_refresh.toggle" = "自動更新";
"library_settings.catalog_warning.text" = "有効にすると、新しいライブラリカタログに自動更新します。";
"library_settings.languages.title" = "言語";
"library_settings.tab.library.title" = "ライブラリ";
"settings.navigation.title" = "設定";
"library_settings.toggle.cellular" = "モバイル通信でダウンロード";
"library_settings.new-download-task-description" = "変更は新規ダウンロードにのみ適用されます。";

View File

@ -124,7 +124,6 @@
"library_settings.button.refresh_now" = "지금 새로 고침";
"library_settings.auto_refresh.toggle" = "자동 새로 고침";
"library_settings.languages.title" = "언어";
"library_settings.tab.library.title" = "라이브러리";
"settings.navigation.title" = "설정";
"library_settings.toggle.cellular" = "셀룰러를 사용하여 다운로드";
"library_settings.new-download-task-description" = "변경사항은 새로운 다운로드 작업에만 적용됩니다.";

View File

@ -95,7 +95,6 @@
"library_settings.catalog.title" = "Katalog";
"library_settings.button.refresh_now" = "Elo aktualiséieren";
"library_settings.languages.title" = "Sproochen";
"library_settings.tab.library.title" = "Bibliothéik";
"settings.navigation.title" = "Astellungen";
"catalog_settings.refreshing.text" = "Aktualiséieren...";
"catalog_settings.header.text" = "Katalog";

View File

@ -132,7 +132,6 @@
"library_settings.auto_refresh.toggle" = "Автоподнова";
"library_settings.catalog_warning.text" = "Кога е овозможен, библиотечниот каталог ќе биде автоматски подновуван кога ќе застари.";
"library_settings.languages.title" = "Јазици";
"library_settings.tab.library.title" = "Библиотека";
"settings.navigation.title" = "Нагодувања";
"library_settings.toggle.cellular" = "Преземи на мобилен";
"library_settings.new-download-task-description" = "Промената ќе важи само за новите задачи за преземање.";

View File

@ -85,7 +85,6 @@
"reading_settings.tab.reading" = "ਪੜ੍ਹ ਰਿਹਾ ਐ";
"library_settings.button.refresh_now" = "ਹੁਣੇ ਤਾਜ਼ਾ ਕਰੋ";
"library_settings.languages.title" = "ਬੋਲੀਆਂ";
"library_settings.tab.library.title" = "ਕਿਤਾਬਘਰ";
"settings.navigation.title" = "ਤਰਜੀਹਾਂ";
"library_settings.toggle.cellular" = "ਸੈਲੂਲਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਲਾਹੋ (ਉਤਾਰਾ ਕਰੋ)";
"library_settings.new-download-task-description" = "ਬਦਲਾਅ ਸਿਰਫ਼ ਨਵੇਂ ਲਾਹੇ ਕਾਰਜਾਂ 'ਤੇ ਲਾਗੂ ਹੋਵੇਗਾ।";

View File

@ -93,7 +93,6 @@
"library_settings.auto_refresh.toggle" = "Automatyczne odświeżanie";
"library_settings.catalog_warning.text" = "Gdy ta opcja jest włączona, katalog biblioteki będzie automatycznie odświeżany, jeśli będzie nieaktualny.";
"library_settings.languages.title" = "Języki";
"library_settings.tab.library.title" = "Biblioteka";
"settings.navigation.title" = "Ustawienia";
"library_settings.toggle.cellular" = "Pobierz za pomocą sieci komórkowej";
"library_settings.new-download-task-description" = "Zmiana będzie miała zastosowanie tylko do nowych zadań pobierania.";

View File

@ -90,7 +90,6 @@
"reading_settings.external_link.title" = "Link externo";
"library_settings.catalog.title" = "Catálogo";
"library_settings.languages.title" = "Idiomas";
"library_settings.tab.library.title" = "Biblioteca";
"settings.navigation.title" = "Configurações";
"catalog_settings.header.text" = "Catálogo";
"settings.miscellaneous.navigation.about" = "Sobre";

View File

@ -3,9 +3,9 @@
// Author: Amire80
// Author: Beracy
"library_refresh_error.retrieve.description" = "Alert description, when refreshing the library failed, due to a connection error to the server";
"library_refresh_error.parse.description" = "Alert description, when refreshing the library failed, due to an error when parsing the response from the server";
"library_refresh_error.process.description" = "Alert description, when refreshing the library failed, due to an error while processing the data from the server";
"library_refresh_error.retrieve.description" = "Alert description, when refreshing the catalog failed, due to a connection error to the server";
"library_refresh_error.parse.description" = "Alert description, when refreshing the catalog failed, due to an error when parsing the response from the server";
"library_refresh_error.process.description" = "Alert description, when refreshing the catalog failed, due to an error while processing the data from the server";
"download_service.complete.title" = "Title of the notification a user receives, once the started download completes";
"download_service.complete.description" = "%@ is a file name.";
"download_service.failed.description" = "Description of an alert pop up, the user see if an item cannot be downloaded.";
@ -131,13 +131,13 @@
"reading_settings.external_link.title" = "Label title for option picker. External Link: Always Ask | Always Load | Never Load";
"reading_settings.search_snippet.title" = "Label title for option picker. Search snippet: Disabled | First Paragraph | First Sentence | Matches";
"reading_settings.tab.reading" = "Settings page tab title";
"library_settings.catalog.title" = "In settings: Label next to button Catalog: [Refresh] Last Refresh: 30 minutes ago";
"library_settings.catalog.title" = "In settings: Both a Tab title, and the label next to button Catalog: [Refresh] Last Refresh: 30 minutes ago";
"library_settings.downloads.title" = "In Settings, on iOS, a section title for downloads related setting values";
"library_settings.button.refresh_now" = "In settings a button title";
"library_settings.last_refresh.text" = "Label title in settings, eg: Last refresh: 30 minutes ago";
"library_settings.auto_refresh.toggle" = "Label next to tickbox in settings: [X] Auto refresh";
"library_settings.catalog_warning.text" = "Settings, Description below the tickbox 'Auto refresh'";
"library_settings.languages.title" = "Settings, Label next to a table listing Languages each with a tickbox and the ZIM files count supported in that language";
"library_settings.tab.library.title" = "Settings page tab title";
"settings.navigation.title" = "Title of navigation item to Settings";
"library_settings.toggle.cellular" = "Label for toggle in settings";
"library_settings.new-download-task-description" = "Small print under the toggle 'Download using cellular'";

View File

@ -127,7 +127,6 @@
"library_settings.auto_refresh.toggle" = "Reîmprospătare automată";
"library_settings.catalog_warning.text" = "Când este activat, catalogul bibliotecii va fi reîmprospătat automat când este învechit.";
"library_settings.languages.title" = "Limbile";
"library_settings.tab.library.title" = "Bibliotecă";
"settings.navigation.title" = "Setări";
"library_settings.toggle.cellular" = "Descărcați folosind telefonul mobil";
"library_settings.new-download-task-description" = "Modificarea se va aplica numai noilor sarcini de descărcare.";

View File

@ -133,7 +133,6 @@
"library_settings.auto_refresh.toggle" = "Автообновление";
"library_settings.catalog_warning.text" = "Если эта опция включена, каталог библиотеки будет обновляться автоматически, если он устареет.";
"library_settings.languages.title" = "Языки";
"library_settings.tab.library.title" = "Библиотека";
"settings.navigation.title" = "Настройки";
"library_settings.toggle.cellular" = "Загрузка через мобильный интернет";
"library_settings.new-download-task-description" = "Изменение будет применяться только к новым задачам загрузки.";

View File

@ -49,7 +49,6 @@
"zim_file.bool_info.details" = "Lassedieđut";
"zim_file.download_task.action.title.cancel" = "Gaskkalduhte";
"library_settings.languages.title" = "Gielat";
"library_settings.tab.library.title" = "Girjerádju";
"settings.navigation.title" = "Ásahusat";
"settings.miscellaneous.button.feedback" = "Máhcahat";
"settings.miscellaneous.navigation.about" = "Lassedieđut";

View File

@ -65,7 +65,6 @@
"library_settings.catalog.title" = "کیٹا لاگ";
"library_settings.button.refresh_now" = "ہݨ تازہ کرو";
"library_settings.languages.title" = "زباناں";
"library_settings.tab.library.title" = "لائبریری";
"settings.navigation.title" = "ترتیباں";
"catalog_settings.refresh_now.button" = "ہݨ تازہ کرو";
"catalog_settings.header.text" = "کیٹا لاگ";

View File

@ -125,7 +125,6 @@
"library_settings.auto_refresh.toggle" = "Samodejno osveževanje";
"library_settings.catalog_warning.text" = "Če je omogočeno, se bo knjižnični katalog samodejno osvežil, ko bo zastarel.";
"library_settings.languages.title" = "Jeziki";
"library_settings.tab.library.title" = "Knjižnica";
"settings.navigation.title" = "Nastavitve";
"library_settings.toggle.cellular" = "Mobilni prenos";
"library_settings.new-download-task-description" = "Sprememba bo veljala samo za nova opravila prenosa.";

View File

@ -125,7 +125,6 @@
"library_settings.auto_refresh.toggle" = "Vetërifreskoje";
"library_settings.catalog_warning.text" = "Kur aktivizohet, katalogu i bibliotekës do të rifreskohet vetvetiu, kur vjetrohet.";
"library_settings.languages.title" = "Gjuhë";
"library_settings.tab.library.title" = "Bibliotekë";
"settings.navigation.title" = "Rregullime";
"library_settings.toggle.cellular" = "Shkarkojeni duke përdorur celularin";
"library_settings.new-download-task-description" = "Ndryshimi do të aplikohet vetëm mbi akte të rinj shkarkimesh.";

View File

@ -130,7 +130,6 @@
"library_settings.auto_refresh.toggle" = "Uppdatera automatiskt";
"library_settings.catalog_warning.text" = "När den är aktiverad uppdateras bibliotekskatalogen automatiskt när den är föråldrad.";
"library_settings.languages.title" = "Språk";
"library_settings.tab.library.title" = "Bibliotek";
"settings.navigation.title" = "Inställningar";
"library_settings.toggle.cellular" = "Ladda ned med mobildata";
"library_settings.new-download-task-description" = "Ändring kommer endast att gälla för nya nedladdningsuppgifter.";

View File

@ -131,7 +131,6 @@
"library_settings.auto_refresh.toggle" = "Otomatik yenileme";
"library_settings.catalog_warning.text" = "Etkinleştirildiğinde kütüphane kataloğu güncelliğini yitirdiğinde otomatik olarak yenilenecektir.";
"library_settings.languages.title" = "Diller";
"library_settings.tab.library.title" = "Kütüphane";
"settings.navigation.title" = "Ayarlar";
"library_settings.toggle.cellular" = "Hücresel kullanarak indir";
"library_settings.new-download-task-description" = "Değişiklik yalnızca yeni indirme görevlerine uygulanacaktır.";

View File

@ -119,7 +119,6 @@
"library_settings.auto_refresh.toggle" = "Автоматичне оновлення";
"library_settings.catalog_warning.text" = "Коли ввімкнено, каталог бібліотеки оновлюватиметься автоматично, якщо він застарів.";
"library_settings.languages.title" = "Мови";
"library_settings.tab.library.title" = "Бібліотека";
"settings.navigation.title" = "Налаштування";
"library_settings.toggle.cellular" = "Завантажувати використовуючи стільникові дані";
"library_settings.new-download-task-description" = "Зміни застосовуватимуться лише до нових завантажень.";

View File

@ -137,7 +137,6 @@
"library_settings.auto_refresh.toggle" = "自动刷新";
"library_settings.catalog_warning.text" = "启用后,图书馆目录将在过期时自动刷新。";
"library_settings.languages.title" = "语言";
"library_settings.tab.library.title" = "图书馆";
"settings.navigation.title" = "设置";
"library_settings.toggle.cellular" = "使用蜂窝数据下载";
"library_settings.new-download-task-description" = "更改仅适用于新的下载任务。";

View File

@ -132,7 +132,6 @@
"library_settings.auto_refresh.toggle" = "自動重整";
"library_settings.catalog_warning.text" = "啟用後,在圖書館目錄過期時會自動重整。";
"library_settings.languages.title" = "語言";
"library_settings.tab.library.title" = "圖書館";
"settings.navigation.title" = "設定";
"library_settings.toggle.cellular" = "使用蜂巢式網路下載";
"library_settings.new-download-task-description" = "更改內容僅套用到新的下載任務。";

View File

@ -110,7 +110,7 @@ final class LibraryRefreshViewModelTest: XCTestCase {
XCTAssert(viewModel.error is LibraryRefreshError)
XCTAssertEqual(
viewModel.error?.localizedDescription,
"Error retrieving library data. The operation couldnt be completed. (NSURLErrorDomain error -1001.)"
"Error retrieving catalog data. The operation couldnt be completed. (NSURLErrorDomain error -1001.)"
)
}
@ -136,7 +136,7 @@ final class LibraryRefreshViewModelTest: XCTestCase {
XCTAssert(viewModel.error is LibraryRefreshError)
XCTAssertEqual(
viewModel.error?.localizedDescription,
"Error retrieving library data. HTTP Status 404."
"Error retrieving catalog data. HTTP Status 404."
)
}

View File

@ -106,7 +106,7 @@ struct LibrarySettings: View {
}
}
.padding()
.tabItem { Label(LocalString.library_settings_tab_library_title, systemImage: "folder.badge.gearshape") }
.tabItem { Label(LocalString.library_settings_catalog_title, systemImage: "folder.badge.gearshape") }
}
}
@ -164,7 +164,7 @@ struct Settings: View {
if FeatureFlags.hasLibrary {
List {
readingSettings
librarySettings
downloadSettings
catalogSettings
backupSettings
miscellaneous
@ -216,16 +216,11 @@ struct Settings: View {
}
}
var librarySettings: some View {
var downloadSettings: some View {
Section {
NavigationLink {
LanguageSelector()
} label: {
SelectedLanaguageLabel()
}.disabled(library.state != .complete)
Toggle(LocalString.library_settings_toggle_cellular, isOn: $downloadUsingCellular)
} header: {
Text(LocalString.library_settings_tab_library_title)
Text(LocalString.library_settings_downloads_title)
} footer: {
Text(LocalString.library_settings_new_download_task_description)
}
@ -233,6 +228,11 @@ struct Settings: View {
var catalogSettings: some View {
Section {
NavigationLink {
LanguageSelector()
} label: {
SelectedLanaguageLabel()
}.disabled(library.state != .complete)
HStack {
if library.state == .error {
Text(LocalString.library_refresh_error_retrieve_description).foregroundColor(.red)