Fix duplicates that were caught by linter

Also undo removals in this PR of translations that were being used.
Also changed :misc/copy translation since it didn't have a meaningful
description

docs/contributing-to-translations.md

@@ -82,9 +82,11 @@ Almost all translations are small. The only exceptions to this are the keys `:tu
 
 ## Fix Mistakes
 
-Sometimes, we typo a translation key or forget to use it. If this happens,
-the github CI step of `bb lang:validate-translations` will detect these errors
-and tell you what's wrong.
+Sometimes, we typo a translation key or forget to use it. If this happens, the
+github CI step of `bb lang:validate-translations` will detect these errors and
+tell you what's wrong. If you get an error about duplicate translations and this
+is a valid duplication for the language, then add it to `allowed-duplicates` in
+[lang.clj](https://github.com/logseq/logseq/blob/master/scripts/src/logseq/tasks/lang.clj).
 
 ## Add a Language
 

scripts/src/logseq/tasks/lang.clj

@@ -156,8 +156,20 @@
 
 (def allowed-duplicates
   "Allows certain keys in a language to have the same translation
-   as English. Rare but it does happen"
-  {:fr #{:port}})
+   as English. Happens more in romance languages but pretty rare otherwise"
+  {:fr #{:port :type :help/docs :search-item/page :shortcut.category/navigating :text/image
+         :settings-of-plugins}
+   :de #{:graph :host :plugins :port :right-side-bar/whiteboards :search-item/block
+         :settings-of-plugins :search-item/whiteboard :shortcut.category/navigating
+         :settings-page/enable-tooltip :settings-page/enable-whiteboards :settings-page/plugin-system}
+   :es #{:settings-page/tab-general :settings-page/tab-editor}
+   :it #{:plugins}
+   :nl #{:plugins :type :left-side-bar/nav-recent-pages :plugin/update}
+   :pl #{:port}
+   :pt-BR #{:plugins :right-side-bar/flashcards :settings-page/enable-flashcards}
+   :pt-PT #{:plugins :settings-of-plugins :plugin/downloads :right-side-bar/flashcards
+            :settings-page/enable-flashcards :settings-page/plugin-system}
+   })
 
 (defn- validate-languages-dont-have-duplicates
   "Looks up duplicates for all languages"

src/resources/dicts/de.edn

@@ -20,9 +20,11 @@
  :export-page "Seite exportieren"
  :export-public-pages "Öffentliche Seiten exportieren"
  :export-roam-json "Als Roam JSON exportieren"
+ :graph "Graph"
  :graph-search "Graph durchsuchen"
  :heading "Überschrift {1}"
  :highlight "Hervorhebung"
+ :host "Host"
  :import "Importieren"
  :importing "Importiere"
  :italics "Kursiv"
@@ -40,6 +42,8 @@
  :open-new-window "Neues Fenster"
  :page-search "In der aktuellen Seite suchen"
  :parsing-files "Dateien analysieren"
+ :plugins "Plugins"
+ :port "Port"
  :re-index "Neu indizieren"
  :re-index-detail "Graph neu aufbauen"
  :re-index-discard-unsaved-changes-warning "Bei der Neuindizierung wird der aktuelle Graph verworfen, und alle Dateien werden wieder so verarbeitet, wie sie derzeit auf der Festplatte gespeichert sind. Dabei gehen nicht gespeicherte Änderungen verloren und es kann eine Weile dauern. Fortfahren?"
@@ -259,14 +263,17 @@
  :right-side-bar/separator "Griff zur Größenänderung der rechten Seitenleiste"
  :right-side-bar/show-journals "Zeige Journale"
  :right-side-bar/switch-theme "Zu {1} Thema wechseln"
+ :right-side-bar/whiteboards "Whiteboards"
 
  :search/items "Einträge"
  :search/page-names "In Seitennamen suchen"
  :search/publishing "Suchen"
  :search/result-for "Suchergebnisse für"
 
+ :search-item/block "Block"
  :search-item/file "Datei"
  :search-item/page "Seite"
+ :search-item/whiteboard "Whiteboard"
 
  :select/default-prompt "Wählen Sie einen"
 
@@ -302,6 +309,8 @@
  :settings-page/enable-journals "Journale einschalten"
  :settings-page/enable-shortcut-tooltip "Tooltips für Verknüpfungen aktivieren"
  :settings-page/enable-timetracking "Zeiterfassung einschalten"
+ :settings-page/enable-tooltip "Tooltips"
+ :settings-page/enable-whiteboards "Whiteboards"
  :settings-page/export-theme "Theme exportieren"
  :settings-page/filename-format "Dateinamen-Format"
  :settings-page/git-commit-delay "Anzahl Sekunden für Git Auto Commit"
@@ -310,6 +319,7 @@
  :settings-page/home-default-page "Standard-Homepage einrichten"
  :settings-page/login-prompt "Um vor allen anderen auf neue Funktionen zugreifen zu können, müssen Sie ein Open Collective Sponsor oder Backer von Logseq sein und sich daher zuerst anmelden."
  :settings-page/network-proxy "Netzwerk-Proxy"
+ :settings-page/plugin-system "Plugins"
  :settings-page/preferred-file-format "Bevorzugtes Datei-Format"
  :settings-page/preferred-outdenting "Logische Ausrückung"
  :settings-page/preferred-pasting-file "Einfügen der Datei bevorzugen"

src/resources/dicts/en.edn

@@ -586,7 +586,7 @@
   :sidebar/open-today-page        "Open today's page in the right sidebar"
   :sidebar/close-top              "Closes the top item in the right sidebar"
   :sidebar/clear                  "Clear all in the right sidebar"
-  :misc/copy                      "mod+c"
+  :misc/copy                      "Copy"
   :command-palette/toggle         "Toggle command palette"
   :graph/export-as-html           "Export public graph pages as html"
   :graph/open                     "Select graph to open"
@@ -612,7 +612,6 @@
   :ui/toggle-help                 "Toggle help"
   :ui/toggle-theme                "Toggle between dark/light theme"
   :ui/toggle-contents             "Toggle Contents in sidebar"
-   ;;  :ui/open-new-window             "Open another window"
   :command/toggle-favorite        "Add to/remove from favorites"
   :editor/open-file-in-default-app "Open file in default app"
   :editor/open-file-in-directory   "Open file in parent directory"

src/resources/dicts/es.edn

@@ -142,6 +142,8 @@
  :settings-page/developer-mode "Modo desarrollador"
  :settings-page/developer-mode-desc "El modo desarrollador permite a los colaboradores y desarrolladores de extensiones probar sus integraciones con Logseq más eficientemente."
  :settings-page/current-version "Versión actual"
+ :settings-page/tab-general "General"
+ :settings-page/tab-editor "Editor"
  :settings-page/tab-version-control "Control de versiones"
  :settings-page/tab-advanced "Avanzado"
  :settings-page/plugin-system "Habilitar extensiones"
@@ -393,6 +395,7 @@
  :command.search/re-index                           "Reconstruir índice de búsqueda"
  :command.editor/bold                               "Negrita"
  :command.editor/italics                            "Cursiva"
+ :command.editor/insert-link                        "Enlace html"
  :command.editor/highlight                          "Resaltado"
  :command.editor/undo                               "Deshacer"
  :command.editor/redo                               "Rehacer"

src/resources/dicts/fr.edn

@@ -5,6 +5,7 @@
  :help/feature "Demander une fonctionnalité"
  :help/changelog "Journal des modifications"
  :help/blog "Blog de Logseq"
+ :help/docs "Documentation"
  :help/privacy "Politique de confidentialité"
  :help/terms "Conditions d'utilisation"
  :help/shortcuts "Raccourcis clavier"
@@ -107,6 +108,7 @@
  :open-a-directory "Ouvrir un dossier local"
  :open-new-window "Nouvelle fenêtre"
  :page-search "Chercher dans la page en cours"
+ :plugins "Extensions"
  :port "Port"
  :re-index-detail "Reconstruire le graphe"
  :re-index-discard-unsaved-changes-warning "La réindexation va effacer le graphe actuel, puis l'indéxer à nouveau. Ceci risque de vous faire perdre le travail non sauvegardé. Continuer ?"
@@ -115,11 +117,13 @@
  :remove-heading "Retirer les entêtes"
  :remove-orphaned-pages "Supprimer les pages orphelines"
  :save "Sauver"
+ :settings-of-plugins "Extensions"
  :sync-from-local-changes-detected "Le rafraîchissement va mettre à jour le contenu de Logseq en fonction des modifications réalisées sur les fichiers locaux. Voulez-vous continuer ?"
  :sync-from-local-files "Rafraîchir"
  :sync-from-local-files-detail "Importer les changements depuis les fichiers locaux"
  :themes "Thèmes"
  :untitled "Sans titre"
+ :type "Type"
  :accessibility/skip-to-main-content "Aller au contenu principal"
  :asset/confirm-delete "Êtes-vous sûr de vouloir supprimer {1} ?"
  :asset/copy "Copier l'image"
@@ -152,6 +156,7 @@
  :file-rn/legend "🟢 Actions de renommage facultatives; 🟡 Action de renommage requise"
  :file-rn/need-action "Les actions de renommage de fichier sont suggérées pour être compatibles avec le nouveau format. Une réindexation est requise sur tous les postes quand les fichiers renommés auront été "
  :file-rn/no-action "Bravo ! Aucune autre action requise"
+ :file-rn/optional-rename "Suggestion : "
  :file-rn/or-select-actions "ou renommez individuellement les fichiers suivants, puis "
  :file-rn/or-select-actions-2 ". Ces actions ne sont pas disponibles dès lors que vous fermez ce panneau."
  :file-rn/otherwise-breaking "Ou le titre deviendra"
@@ -169,7 +174,7 @@
  :graph/save "Enregistrement ..."
  :graph/save-error "Enregistrement échoué"
  :graph/save-success "Enregistrement réussi"
- :help/forum-community "Forum communautaire" 
+ :help/forum-community "Forum communautaire"
  :help/shortcut-page-title "Raccourcis clavier"
  :help/start "Démarrage"
  :left-side-bar/create "Créer"
@@ -199,7 +204,6 @@
  :page/updated-at "Mis à jour le"
  :page/version-history "Consulter l'historique de la page"
  :paginates/next "Suiv."
- :paginates/pages "Total {1} pages"
  :paginates/prev "Préc."
  :pdf/copy-ref "Copier la référence"
  :pdf/copy-text "Copier le texte"
@@ -249,6 +253,7 @@
  :search/result-for "Résultat de recherche pour "
  :search-item/block "Bloc"
  :search-item/file "Fichier"
+ :search-item/page "Page"
  :search-item/whiteboard "Tableau blanc"
  :select/default-prompt "Sélectionnez"
  :select.graph/add-graph "Oui, ajouter un autre graphe"
@@ -284,6 +289,7 @@
  :settings-page/home-default-page "Régler la page d'accueil par défaut"
  :settings-page/login-prompt "Pour accéder aux nouvelles fonctionnalités avant tout le monde, vous devez être sponsor ou \"backer\" (contributeur) sur Open Collective, puis vous connecter."
  :settings-page/network-proxy "Proxy réseau"
+ :settings-page/plugin-system "Extensions"
  :settings-page/preferred-outdenting "Mise en retrait logique"
  :settings-page/shortcut-settings "Personnaliser les raccourcis"
  :settings-page/show-brackets "Montrer les parenthèses, crochets et accolades"
@@ -295,6 +301,7 @@
  :settings-page/tab-features "Fonctionnalités"
  :settings-page/tab-general "Général"
  :settings-page/tab-version-control "Contrôle de version"
+ :text/image "Image"
  :tips/all-done "Tout terminé"
  :updater/new-version-install "Une nouvelle version a été téléchargée."
  :updater/quit-and-install "Relancez pour installer"
@@ -373,6 +380,7 @@
  :command.editor/forward-kill-word  "Supprimer un mot en avant"
  :command.editor/forward-word  "Déplacer le curseur d'un mot en avant"
  :command.editor/highlight  "Surlignage"
+ :command.editor/insert-link  "Lien HTML"
  :command.editor/insert-youtube-timestamp  "Insérer un horodatage YouTube"
  :command.editor/italics  "Italique"
  :command.editor/kill-line-after  "Effacer la ligne après position du curseur"
@@ -434,6 +442,8 @@
  :shortcut.category/block-command-editing  "Édition de commande de bloc"
  :shortcut.category/block-editing  "Édition de bloc en générale"
  :shortcut.category/block-selection  "Sélection de bloc (appuyer sur Esc pour quitter la sélection)"
+ :shortcut.category/formatting "Formats"
+ :shortcut.category/navigating  "Navigation"
  :shortcut.category/others  "Autres"
  :shortcut.category/toggle  "Basculer"
  :command.editor/select-parent "Sélectionnez le bloc parent"

src/resources/dicts/it.edn

@@ -162,6 +162,7 @@
  :all-journals "Tutte le pagine di diario"
  :settings "Impostazioni"
  :settings-of-plugins "Impostazioni plugin"
+ :plugins "Plugins"
  :themes "Temi"
  :relaunch-confirm-to-work "È necessario riavviare l'app per farla funzionare. Vuoi riavviarla ora?"
  :import "Importa"

src/resources/dicts/ja.edn

@@ -234,8 +234,6 @@
  :paginates/prev "前"
  :paginates/next "次"
 
- :tips/all-done "All Done"
-
  :command-palette/prompt "コマンドを入力"
  :select/default-prompt "選択してください"
  :select.graph/prompt "グラフを選んでください"
@@ -301,6 +299,7 @@
  :command.search/re-index                 "インデックス再構築"
  :command.editor/bold                     "太字"
  :command.editor/italics                  "斜体"
+ :command.editor/insert-link              "リンク挿入"
  :command.editor/highlight                "ハイライト"
  :command.editor/undo                     "元に戻す"
  :command.editor/redo                     "やり直し"
@@ -368,5 +367,6 @@
  :command.editor/open-file-in-default-app         "ファイルを規定のアプリで開く"
  :command.editor/open-file-in-directory           "ファイルをディレクトリで開く"
  :command.editor/strike-through                   "打ち消し線"
+ :command.misc/copy                               "コピー"
  :command.ui/goto-plugins                         "プラグインへ"
  :command.ui/select-theme-color                   "利用可能なテーマ色を選択"}

src/resources/dicts/ko.edn

@@ -383,7 +383,8 @@
  :command.search/re-index                 "다시 인덱스하기"
  :command.editor/bold                     "볼드체"
  :command.editor/italics                  "이탤릭체"
- :command.editor/highlight                "하이라이트"
+ :command.editor/insert-link              "링크 삽입"
+ :command.editor/highlight                "하이라"
  :command.editor/undo                     "실행 취소"
  :command.editor/redo                     "다시 실행"
  :command.editor/copy                     "복사"
@@ -443,6 +444,7 @@
  :command.editor/open-file-in-default-app         "기본 앱으로 파일 열기"
  :command.editor/open-file-in-directory           "파일 위치 열기"
  :command.editor/strike-through                   "취소선"
+ :command.misc/copy                               "복사"
  :command.ui/goto-plugins                         "플러그인 페이지로 이동"
  :command.ui/select-theme-color                   "테마 색상 선택"
  :command.editor/copy-text                        "선택한 영역을 텍스트로 복사"

src/resources/dicts/nb-no.edn

@@ -355,6 +355,7 @@
  :settings-page/tab-assets "Ressurser"
  :whiteboard/link-whiteboard-or-block "Lenk whiteboard/side/blokk"
 
+ :shortcut.category/formatting            "Formatering"
  :shortcut.category/basics                "Basis"
  :shortcut.category/navigating            "Navigasjon"
  :shortcut.category/block-editing         "Blokkredigering generelt"
@@ -393,6 +394,7 @@
  :command.search/re-index                 "Gjenoppbygg søkeindeks"
  :command.editor/bold                     "Fet"
  :command.editor/italics                  "Kursiv"
+ :command.editor/insert-link              "HTML lenke"
  :command.editor/highlight                "Markering"
  :command.editor/undo                     "Angre"
  :command.editor/redo                     "Gjør om"

src/resources/dicts/nl.edn

@@ -36,6 +36,7 @@
  :open-new-window "Nieuwe venster"
  :page-search "Zoek in de huidige pagina"
  :parsing-files "Bestanden analyseren"
+ :plugins "Plugins"
  :port "Poort"
  :re-index "Herindexeren"
  :re-index-detail "Grafiek herbouwen"
@@ -54,6 +55,7 @@
  :sync-from-local-files "Bijwerken"
  :sync-from-local-files-detail "Importeer veranderingen uit lokale bestanden"
  :themes "Thema's"
+ :type "Type"
  :yes "Ja"
 
  :asset/confirm-delete "Weet u zeker dat u dit wilt verwijderen {1}?"
@@ -99,14 +101,14 @@
  :help/shortcut "Snelkoppeling"
  :help/shortcut-page-title "Toetsenbord snelkoppelingen"
  :help/shortcuts "Toetsenbord snelkoppelingen"
- :help/shortcuts-triggers "Triggers"
  :help/slash-autocomplete "Slash-Autocomplete"
  :help/start "Aan de slag"
  :help/terms "Voorwaarden"
  :help/open-link-in-sidebar "Open link in zijbalk"
 
  :left-side-bar/journals "Journalen"
  :left-side-bar/nav-favorites "Favorieten"
+ :left-side-bar/nav-recent-pages "Recent"
  :left-side-bar/new-page "Nieuwe pagina"
 
  :linked-references/filter-search "Zoeken in gelinkte pagina's"
@@ -148,7 +150,6 @@
 
  :plugin/all "Alle"
  :plugin/check-all-updates "Check alle updates"
- :plugin/check-update "Check update"
  :plugin/contribute "✨ Schrijf en dien nieuwe plugin in"
  :plugin/custom-js-alert "custom.js bestand gevonden, mag deze uitgevoerd worden? (Als je niet begrijpt wat dit bestand inhoud is het aangeraden om het uivoeren hiervan niet toe te staan, dit is in verband met beveiligings risico's.)" ;; TODO
  :plugin/delete-alert "Weet je zeker dat je plugin [{1}] wilt verwijderen?"
@@ -158,7 +159,6 @@
  :plugin/installed "Geïnstalleerd"
  :plugin/installing "Installeren"
  :plugin/load-unpacked "Laad uitgepakte plugin"
- :plugin/marketplace "Marketplace"
  :plugin/not-installed "Niet geïnstalleerd"
  :plugin/open-package "Open pakket"
  :plugin/open-settings "Open instellingen"
@@ -325,6 +325,7 @@
  :command.graph/re-index                 "Huidige grafiek opnieuw indexeren"
  :command.graph/remove                   "Verwijder een grafiek"
  :command.graph/save                     "Huidige grafiek opslaan op schijf"
+ :command.misc/copy                      "Kopieer"
  :command.pdf/close                      "Huidige pdf-viewer sluiten"
  :command.pdf/next-page                  "Volgende pagina van huidige pdf doc"
  :command.pdf/previous-page              "Vorige pagina van huidige pdf doc"
@@ -339,7 +340,6 @@
  :command.ui/toggle-document-mode        "Schakel tussen documentmodus"
  :command.ui/toggle-left-sidebar         "Toggle linker zijbalk"
  :command.ui/toggle-right-sidebar        "Toggle rechter zijbalk"
- :command.ui/toggle-settings             "Toggle settings"
  :command.ui/toggle-theme                "Toggle tussen donker/licht thema"
  :command.ui/toggle-wide-mode            "Toggle brede modus"
  :shortcut.category/basics               "Basis"

src/resources/dicts/pl.edn

@@ -152,6 +152,7 @@
  :graph/save "Zapisuję..."
  :graph/save-success "Zmiany zostały zapisane"
  :graph/save-error "Zapisywanie zakończone niepowodzeniem"
+ :port "Port"
  :import "Importuj"
  :export "Eksport"
  :export-graph "Eksportuj graf"
@@ -204,7 +205,6 @@
  :plugin/title "Tytuł"
  :plugin/all "Wszystkie"
  :plugin/unpacked "Rozpakowany"
- :plugin/marketplace "Marketplace"
  :plugin/delete-alert "Czy na pewno chcesz usunąć plugin [{1}]?"
  :plugin/open-settings "Otwórz ustawienia"
  :plugin/open-package "Otwórz paczkę"
@@ -312,8 +312,6 @@
  :command.editor/undo                             "Cofnij"
  :command.editor/redo                             "Ponów"
  :command.editor/select-all-blocks                "Zaznacz wszystkie bloki"
- :command.editor/zoom-in                          "Zoom in editing block / Forwards otherwise"
- :command.editor/zoom-out                         "Zoom out editing block / Backwards otherwise"
  :command.ui/toggle-brackets                      "Pokaż / Ukrywaj kwadratowe nawiasy"
  :command.go/search-in-page                       "Szukaj na aktualnej stronie"
  :command.go/search                               "Wyszukiwanie tekstowe"
@@ -345,13 +343,11 @@
  :command.ui/toggle-left-sidebar                  "Pokaż / Ukryj lewy panel"
  :command.ui/toggle-help                          "Pogaż / Ukryj pomoc"
  :command.ui/toggle-theme                         "Zmień motyw graficzny na ciemny/jasny"
- :command.ui/toggle-contents                      "Toggle Contents in sidebar"
  :command.editor/open-file-in-default-app         "Otwórz plik w domyślnej aplikacji"
  :command.editor/open-file-in-directory           "Otwórz plik w nadrzędnym katalogu"
  :command.editor/copy-current-file                "Kopiuj aktualny plik"
  :command.editor/toggle-open-blocks               "Zwiń / Rozwiń otwarte bloki"
  :command.ui/toggle-wide-mode                     "Włącz / wyłącz tryb szeroki"
- :command.ui/select-theme-color                   "Select available theme colors"
  :command.ui/goto-plugins                         "Przejdź do dashboardu pluginów"
  :command.ui/toggle-cards                         "Pokaż / Ukryj karty"
  :command.git/commit                              "Wykonaj GIT COMMIT z wiadomością"}