Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/renderer/common/components/ImportAnnotationsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ export const ImportAnnotationsDialog: React.FC<React.PropsWithChildren<{ winId:
<span>{originTitle ? __("dialog.annotations.origin", { title: originTitle, author: originCreator ? __("dialog.annotations.descAuthor", { author: originCreator }) : "" }) : ""}</span>
<span>{title ? `${__("dialog.annotations.descTitle")}'${title}'` : ""}</span>
<span>{annotationsList.length ? __("dialog.annotations.descList", {
nb: annotationsList.length,
count: annotationsList.length,
creator: creatorNameList.length ? `${__("dialog.annotations.descCreator")} '${creatorNameList.join(", ")}'` : "", // TODO i18n
title: convertMultiLangStringToString(publicationTitle, locale),
author: authorsLangString[0] ? __("dialog.annotations.descAuthor", { author: convertMultiLangStringToString(authorsLangString[0], locale) }) : "",
}) : <></>}</span>
<span>{annotationsConflictListNewer.length ? __("dialog.annotations.descNewer", { nb: annotationsConflictListNewer.length }) : <></>}</span>
<span>{annotationsConflictListOlder.length ? __("dialog.annotations.descOlder", { nb: annotationsConflictListOlder.length }) : <></>}</span>
<span>{annotationsConflictListNewer.length ? __("dialog.annotations.descNewer", { count: annotationsConflictListNewer.length }) : <></>}</span>
<span>{annotationsConflictListOlder.length ? __("dialog.annotations.descOlder", { count: annotationsConflictListOlder.length }) : <></>}</span>
</AlertDialog.Description>
<div className={stylesAlertModals.AlertDialogButtonContainer}>
<AlertDialog.Cancel asChild onClick={() => dispatch(annotationActions.importConfirmOrAbort.build("abort"))}>
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/reader/components/ReaderMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,7 @@ const AnnotationList: React.FC<{ /*annotationUUIDFocused: string, resetAnnotatio
<AlertDialog.Content className={stylesAlertModals.AlertDialogContent}>
<AlertDialog.Title className={stylesAlertModals.AlertDialogTitle}>{__("dialog.deleteAnnotations")}</AlertDialog.Title>
<AlertDialog.Description className={stylesAlertModals.AlertDialogDescription}>
{__("dialog.deleteAnnotationsText", { annotationListLength: annotationListFiltered.length })}
{__("dialog.deleteAnnotationsText", { count: annotationListFiltered.length })}
</AlertDialog.Description>
<div className={stylesAlertModals.AlertDialogButtonContainer}>
<AlertDialog.Cancel asChild>
Expand Down Expand Up @@ -2267,7 +2267,7 @@ const BookmarkList: React.FC<{ popoverBoundary: HTMLDivElement, hideBookmarkOnCh
<AlertDialog.Content className={stylesAlertModals.AlertDialogContent}>
<AlertDialog.Title className={stylesAlertModals.AlertDialogTitle}>{__("dialog.deleteBookmarks")}</AlertDialog.Title>
<AlertDialog.Description className={stylesAlertModals.AlertDialogDescription}>
{__("dialog.deleteBookmarksText", { bookmarkListLength: bookmarkListFiltered.length })}
{__("dialog.deleteBookmarksText", { count: bookmarkListFiltered.length })}
</AlertDialog.Description>
<div className={stylesAlertModals.AlertDialogButtonContainer}>
<AlertDialog.Cancel asChild>
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/reader/components/ReaderMenuSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class ReaderMenuSearch extends React.Component<IProps, IState> {
const { __ } = this.props;

const label = this.props.foundArray?.length ?
__("reader.picker.search.founds", {nResults: this.props.foundArray.length}) :
__("reader.picker.search.founds", {count: this.props.foundArray.length}) :
__("reader.picker.search.notFound");

const memoJsx = renderSearchLinks(label, this.props.foundArray, this.state.nMatchPage, this.props.readingOrder, this.props.toc, this.props.dockedMode, this);
Expand Down Expand Up @@ -300,7 +300,7 @@ class ReaderMenuSearch extends React.Component<IProps, IState> {
margin: 0,
marginTop: "-16px",
marginBottom: "20px",
}}>{`[ ${begin === end ? `${end}` : `${begin} ... ${end}`} ] / ${__("reader.picker.search.founds", {nResults: this.props.foundArray.length})}`}</p>
}}>{`[ ${begin === end ? `${end}` : `${begin} ... ${end}`} ] / ${__("reader.picker.search.founds", {count: this.props.foundArray.length})}`}</p>
: <></>
}
</>);
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/reader/components/picker/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class SearchPicker extends React.Component<IProps, IState> {

const found = foundNumber === 0 ?
__("reader.picker.search.notFound") :
__("reader.picker.search.founds", {nResults: foundNumber});
__("reader.picker.search.founds", {count: foundNumber});

this.loadSeq = this.props.isPdf ? 999 : (this.loadSeq || 0) + 1;

Expand Down
12 changes: 6 additions & 6 deletions src/resources/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
"annotations": {
"descAuthor": "تأليف '{{- author}}'",
"descCreator": "أنشأه",
"descList": "سيتم استيراد {{- nb}} ملاحظة (ملاحظات) من {{- creator}} إلى '{{- title}}' لـ {{- author}}",
"descNewer": "تعارض: {{- nb}} ملاحظة (ملاحظات) أحدث",
"descOlder": "تعارض: {{- nb}} ملاحظة (ملاحظات) أقدم",
"descList": "سيتم استيراد {{- count}} ملاحظة (ملاحظات) من {{- creator}} إلى '{{- title}}' لـ {{- author}}",
"descNewer": "تعارض: {{- count}} ملاحظة (ملاحظات) أحدث",
"descOlder": "تعارض: {{- count}} ملاحظة (ملاحظات) أقدم",
"descTitle": "عنوان التعليقات: ",
"importAll": "استيراد كل الملاحظات",
"importWithoutConflict": "استيراد الملاحظات غير المتعارضة فقط",
Expand All @@ -157,9 +157,9 @@
}
},
"deleteAnnotations": "حذف التعليقات؟",
"deleteAnnotationsText": "هل أنت متأكد من حذف {{- annotationListLength}} ملاحظة (ملاحظات)؟",
"deleteAnnotationsText": "هل أنت متأكد من حذف {{- count}} ملاحظة (ملاحظات)؟",
"deleteBookmarks": "حذف الإشارات المرجعية؟",
"deleteBookmarksText": "هل أنت متأكد من حذف {{- bookmarkListLength}} إشارة (إشارات) مرجعية؟",
"deleteBookmarksText": "هل أنت متأكد من حذف {{- count}} إشارة (إشارات) مرجعية؟",
"deleteFeed": "حذف الفهرس؟",
"deletePublication": "حذف المنشور؟",
"deletePublicationWithNotes": "تحذير: يحتوي هذا المنشور على تعليقات و/أو إشارات مرجعية، سيتم حذفها أيضًا! (إذا كنت ترغب في الاحتفاظ بها، تأكد من تصدير الملاحظات قبل إزالة المنشور)",
Expand Down Expand Up @@ -768,7 +768,7 @@
},
"picker": {
"search": {
"founds": "تم العثور على {{- nResults}} تطابقات",
"founds": "تم العثور على {{- count}} تطابقات",
"input": "النص المطلوب مطابقته",
"next": "التالي",
"notFound": "لم يتم العثور على تطابقات",
Expand Down
2 changes: 1 addition & 1 deletion src/resources/locales/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@
},
"picker": {
"search": {
"founds": "{{- nResults}} съвпадение(ия)",
"founds": "{{- count}} съвпадение(ия)",
"input": "текст за търсене",
"next": "Следващ",
"notFound": "няма съвпадения",
Expand Down
2 changes: 1 addition & 1 deletion src/resources/locales/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@
},
"picker": {
"search": {
"founds": "{{- nResults}} trobat/s",
"founds": "{{- count}} trobat/s",
"input": "text de cerca",
"next": "Següent",
"notFound": "no hi ha coincidències",
Expand Down
12 changes: 6 additions & 6 deletions src/resources/locales/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
"annotations": {
"descAuthor": "autor: {{- author}}",
"descCreator": "vytvořil(a)",
"descList": "{{- nb}} poznámek od {{- creator}} bude importováno do „{{- title}}“, {{- author}}",
"descNewer": "Konflikt(y): {{- nb}} novější poznámka (novější poznámky)",
"descOlder": "Konflikt(y): {{- nb}} starší poznámka (starší poznámky)",
"descList": "{{- count}} poznámek od {{- creator}} bude importováno do „{{- title}}“, {{- author}}",
"descNewer": "Konflikt(y): {{- count}} novější poznámka (novější poznámky)",
"descOlder": "Konflikt(y): {{- count}} starší poznámka (starší poznámky)",
"descTitle": "Anotace titulu: ",
"importAll": "Importovat všechny poznámky",
"importWithoutConflict": "Importovat pouze poznámky bez konfliktů",
Expand All @@ -157,9 +157,9 @@
}
},
"deleteAnnotations": "Odstranit anotace?",
"deleteAnnotationsText": "Opravdu chcete odstranit {{- annotationListLength}} poznámek?",
"deleteAnnotationsText": "Opravdu chcete odstranit {{- count}} poznámek?",
"deleteBookmarks": "Odstranit záložky?",
"deleteBookmarksText": "Jste si jisti, že chcete odstranit {{- bookmarkListLength}} záložek?",
"deleteBookmarksText": "Jste si jisti, že chcete odstranit {{- count}} záložek?",
"deleteFeed": "Odstranit katalog?",
"deletePublication": "Odstranit publikaci?",
"deletePublicationWithNotes": "Upozornění: tato publikace obsahuje anotace a/nebo záložky, které budou taktéž smazány! (pokud si je chcete ponechat, před odstraněním publikace poznámky exportujte)",
Expand Down Expand Up @@ -768,7 +768,7 @@
},
"picker": {
"search": {
"founds": "{{- nResults}} shod",
"founds": "{{- count}} shod",
"input": "přesná shoda",
"next": "Další",
"notFound": "žádná shoda",
Expand Down
12 changes: 6 additions & 6 deletions src/resources/locales/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
"annotations": {
"descAuthor": "af {{- author}}",
"descCreator": "lavet af",
"descList": "{{- nb}} note(r) fra {{- creator}} vil blive associeret med {{- title}} {{- author}}",
"descNewer": "{{- nb}} nyere version af disse noter er allerede associeret med denne bog",
"descOlder": "{{- nb}} ældre version af disse noter er allerede associeret med denne bog",
"descList": "{{- count}} note(r) fra {{- creator}} vil blive associeret med {{- title}} {{- author}}",
"descNewer": "{{- count}} nyere version af disse noter er allerede associeret med denne bog",
"descOlder": "{{- count}} ældre version af disse noter er allerede associeret med denne bog",
"descTitle": "Navn på notesamling: ",
"importAll": "Importér alle noter",
"importWithoutConflict": "Importér noter uden sammenfald",
Expand All @@ -157,9 +157,9 @@
}
},
"deleteAnnotations": "Slet alle noter?",
"deleteAnnotationsText": "Vil du slette {{- annotationListLength}} note(r)?",
"deleteAnnotationsText": "Vil du slette {{- count}} note(r)?",
"deleteBookmarks": "Slet bogmærker?",
"deleteBookmarksText": "Er du sikker på at du vil slette {{- bookmarkListLength}} bogmærke(r)?",
"deleteBookmarksText": "Er du sikker på at du vil slette {{- count}} bogmærke(r)?",
"deleteFeed": "Er du sikker på at du vil slette dette katalog?",
"deletePublication": "Er du sikker på at du vil fjerne bogen?",
"deletePublicationWithNotes": "Advarsel: denne bog har noter og/eller bogmærker, som også vil blive slettet! (hvis du vil beholde dem, så eksporter dem venligst inden du sletter bogen)",
Expand Down Expand Up @@ -768,7 +768,7 @@
},
"picker": {
"search": {
"founds": "{{- nResults}} resultat(er)",
"founds": "{{- count}} resultat(er)",
"input": "søgetekst",
"next": "Næste",
"notFound": "ingen resultater",
Expand Down
10 changes: 5 additions & 5 deletions src/resources/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
"annotations": {
"descAuthor": "nach '{{- author}}'",
"descCreator": "Erstellt von",
"descList": "{{- nb}} Notiz(en) {{- creator}} werden nach '{{- title}}' {{- author}} importiert",
"descNewer": "Konflikt: {{- nb}} neuere Notiz(en)",
"descOlder": "Konflikt: {{- nb}} ältere Notiz(en)",
"descList": "{{- count}} Notiz(en) {{- creator}} werden nach '{{- title}}' {{- author}} importiert",
"descNewer": "Konflikt: {{- count}} neuere Notiz(en)",
"descOlder": "Konflikt: {{- count}} ältere Notiz(en)",
"descTitle": "Titel der Notiz: ",
"importAll": "Importiere alle Notizen",
"importWithoutConflict": "Importiere nur konfliktfreie Notizen",
Expand All @@ -157,7 +157,7 @@
}
},
"deleteAnnotations": "Anmerkungen löschen?",
"deleteAnnotationsText": "Sind Sie sicher, dass Sie {{- annotationListLength}} Notiz(en) löschen wollen?",
"deleteAnnotationsText": "Sind Sie sicher, dass Sie {{- count}} Notiz(en) löschen wollen?",
"deleteBookmarks": "",
"deleteBookmarksText": "",
"deleteFeed": "Willst du diesen Katalog wirklich löschen?",
Expand Down Expand Up @@ -768,7 +768,7 @@
},
"picker": {
"search": {
"founds": "{{- nResults}} Fundstelle(n)",
"founds": "{{- count}} Fundstelle(n)",
"input": "Text suchen",
"next": "Nächste",
"notFound": "keine Treffer",
Expand Down
12 changes: 6 additions & 6 deletions src/resources/locales/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
"annotations": {
"descAuthor": "από '{{- author}}'",
"descCreator": "δημιουργήθηκε από",
"descList": "{{- nb}} σημειώσεις {{- creator}} θα εισαγχθούν στον τίτλο '{{- title}}' {{- author}}",
"descNewer": "Συγκρούσεις: {{- nb}} νεώτερες σημειώσεις",
"descOlder": "Συγκρούσεις: {{- nb}} παλιότερες σημειώσεις",
"descList": "{{- count}} σημειώσεις {{- creator}} θα εισαγχθούν στον τίτλο '{{- title}}' {{- author}}",
"descNewer": "Συγκρούσεις: {{- count}} νεώτερες σημειώσεις",
"descOlder": "Συγκρούσεις: {{- count}} παλιότερες σημειώσεις",
"descTitle": "Τίτλος σχολιασμών: ",
"importAll": "Εισαγωγή όλων των σημειώσεων",
"importWithoutConflict": "Εισαγωγή μόνο των σημειώσεων απαλλαγμένων από συγκρούσεις",
Expand All @@ -157,9 +157,9 @@
}
},
"deleteAnnotations": "Διαγραφή σχολίων;",
"deleteAnnotationsText": "Είσαι σίγουρος/η για τη διαγραφή σημειώσεων {{- annotationListLength}};",
"deleteAnnotationsText": "Είσαι σίγουρος/η για τη διαγραφή σημειώσεων {{- count}};",
"deleteBookmarks": "Διαγραφή σελιδοδεικτών;",
"deleteBookmarksText": "Είστε σίγουροι ότι θέλετε να διαγράψετε {{- bookmarkListLength}} σελιδοδείκτες;",
"deleteBookmarksText": "Είστε σίγουροι ότι θέλετε να διαγράψετε {{- count}} σελιδοδείκτες;",
"deleteFeed": "Διαγραφή καταλόγου;",
"deletePublication": "Διαγραφή βιβλίου;",
"deletePublicationWithNotes": "Προειδοποίηση: αυτή η δημοσίευση έχει σχολιασμούς ή/και σελιδοδείκτες, θα διαγραφούν και αυτοί! (αν θέλετε να τους κρατήσετε, φροντίστε να εξάγετε τις σημειώσεις πριν τη διαγραφή της δημοσίευσης)",
Expand Down Expand Up @@ -768,7 +768,7 @@
},
"picker": {
"search": {
"founds": "{{- nResults}} αποτελέσματα",
"founds": "{{- count}} αποτελέσματα",
"input": "κείμενο προς ανάκτηση",
"next": "Επόμενο",
"notFound": "καμία αντιστοιχία",
Expand Down
18 changes: 12 additions & 6 deletions src/resources/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,12 @@
"annotations": {
"descAuthor": "by '{{- author}}'",
"descCreator": "created by",
"descList": "{{- nb}} note(s) {{- creator}} will be imported into '{{- title}}' {{- author}}",
"descNewer": "Conflict(s): {{- nb}} newer note(s)",
"descOlder": "Conflict(s): {{- nb}} older note(s)",
"descList_one": "{{- count}} note {{- creator}} will be imported into '{{- title}}' {{- author}}",
"descList_other": "{{- count}} notes {{- creator}} will be imported into '{{- title}}' {{- author}}",
"descNewer_one": "Conflict(s): {{- count}} newer note",
"descNewer_other": "Conflict(s): {{- count}} newer notes",
"descOlder_one": "Conflict(s): {{- count}} older note",
"descOlder_other": "Conflict(s): {{- count}} older notes",
"descTitle": "Annotations title: ",
"importAll": "Import all notes",
"importWithoutConflict": "Import only conflict-free notes",
Expand All @@ -157,9 +160,11 @@
}
},
"deleteAnnotations": "Delete annotations?",
"deleteAnnotationsText": "Are you sure you want to delete {{- annotationListLength}} note(s)?",
"deleteAnnotationsText_one": "Are you sure you want to delete {{- count}} note?",
"deleteAnnotationsText_other": "Are you sure you want to delete {{- count}} notes?",
"deleteBookmarks": "Delete bookmarks?",
"deleteBookmarksText": "Are you sure you want to delete {{- bookmarkListLength}} bookmark(s)?",
"deleteBookmarksText_one": "Are you sure you want to delete {{- count}} bookmark?",
"deleteBookmarksText_other": "Are you sure you want to delete {{- count}} bookmarks?",
"deleteFeed": "Delete catalog?",
"deletePublication": "Delete publication?",
"deletePublicationWithNotes": "Warning: this publication has annotations and/or bookmarks, they will be deleted too! (if you want to keep them, make sure to export the notes before removing the publication)",
Expand Down Expand Up @@ -768,7 +773,8 @@
},
"picker": {
"search": {
"founds": "{{- nResults}} match(es)",
"founds_one": "{{- count}} match",
"founds_other": "{{- count}} matches",
"input": "text to match",
"next": "Next",
"notFound": "no matches",
Expand Down
Loading
Loading