From e207276c93fe642465f0886f1fc21220450722e9 Mon Sep 17 00:00:00 2001 From: "J. Muller" Date: Wed, 22 May 2019 13:48:47 +0200 Subject: [PATCH 1/5] Correct typo : redimensionnement --- rtdata/languages/Francais | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 2036a2ce3..4c2fb8d9b 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -101,7 +101,7 @@ EXPORT_PIPELINE;Pipeline de Traitement EXPORT_PUTTOQUEUEFAST;Mettre dans la file de traitement\npour Export Rapide EXPORT_RAW_DMETHOD;Méthode de dématriçage EXPORT_USE_FAST_PIPELINE;Dédié\n(traitement complet sur une image rédimmentionnée) -EXPORT_USE_FAST_PIPELINE_TIP;Utilise un pipeline de traitement dédié pour les images en Export Rapide, qui priviliégie la vitesse sur la qualité. Le redimentionnement des images est fait dès que possible, au lieu d'être fait à la fin comme dans le pipeline normal. L'accélération peut être significative, mais soyez prêt à voir des artéfacts et une dégradation générale de la qualité de sortie. +EXPORT_USE_FAST_PIPELINE_TIP;Utilise un pipeline de traitement dédié pour les images en Export Rapide, qui privilégie la vitesse sur la qualité. Le redimensionnement des images est fait dès que possible, au lieu d'être fait à la fin comme dans le pipeline normal. L'accélération peut être significative, mais soyez prêt à voir des artéfacts et une dégradation générale de la qualité de sortie. EXPORT_USE_NORMAL_PIPELINE;Standard\n(ignore des étapes, redimentionne à la fin) EXTPROGTARGET_1;raw EXTPROGTARGET_2;file de traitement @@ -1017,7 +1017,7 @@ PARTIALPASTE_RAW_FALSECOLOR;Nbr d'itération des fausses couleurs PARTIALPASTE_RAW_IMAGENUM;Sub-image PARTIALPASTE_RAW_LMMSEITERATIONS;Niveau d'amélioration LMMSE PARTIALPASTE_RAW_PIXELSHIFT;PixelShift -PARTIALPASTE_RESIZE;Redimentionnement +PARTIALPASTE_RESIZE;Redimensionnement PARTIALPASTE_RETINEX;Retinex PARTIALPASTE_RGBCURVES;Courbes RVB PARTIALPASTE_ROTATION;Rotation @@ -1786,7 +1786,7 @@ TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Verticale TP_PREPROCESS_NO_FOUND;Aucun trouvé TP_PREPROCESS_PDAFLINESFILTER;Filtre de ligne PDAF TP_PRSHARPENING_LABEL;Netteté post-redimensionnement -TP_PRSHARPENING_TOOLTIP;Augmente la netteté de l'image après le redimentionnement. Ne fonctionne que si la méthode de redimensionnement "Lanczos" est utilisé. Il est impossible de prévisualiser les effets de cet outil. Cf. RawPedia pour les instructions d'utilisation. +TP_PRSHARPENING_TOOLTIP;Augmente la netteté de l'image après le redimensionnement. Ne fonctionne que si la méthode de redimensionnement "Lanczos" est utilisée. Il est impossible de prévisualiser les effets de cet outil. Cf. RawPedia pour les instructions d'utilisation. TP_RAWCACORR_AUTO;Correction automatique TP_RAWCACORR_AUTOIT;Itérations TP_RAWCACORR_AUTOIT_TOOLTIP;Ce réglage est disponible si "Correction-auto" est activé.\nCorrection-auto est conservatif, signifiant qu'il ne corrige souvent pas toute l'aberration chromatique.\nPour corriger l'aberration restante, vous pouvez uttiliser jusqu'à cinq itérations de de la correction automatique de l'aberration chromatique.\nChaque itération réduira l'aberration restante de l'itération précédente avec un prix d'un temps de traitement plus long. From 853b198b1eb4f2cbc5721d2d709207f6382dfa8e Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 24 May 2019 16:46:51 +0200 Subject: [PATCH 2/5] Clarify what is being deleted in Trash, fixes #5337 The message shown when deleting items in trash was ambiguous. --- rtdata/languages/Catala | 7 +++---- rtdata/languages/Chinese (Simplified) | 7 +++---- rtdata/languages/Czech | 7 +++---- rtdata/languages/Deutsch | 7 +++---- rtdata/languages/English (UK) | 7 +++---- rtdata/languages/English (US) | 7 +++---- rtdata/languages/Espanol | 7 +++---- rtdata/languages/Francais | 7 +++---- rtdata/languages/Italiano | 7 +++---- rtdata/languages/Japanese | 7 +++---- rtdata/languages/Magyar | 7 +++---- rtdata/languages/Nederlands | 7 +++---- rtdata/languages/Polish | 7 +++---- rtdata/languages/Portugues | 7 +++---- rtdata/languages/Portugues (Brasil) | 7 +++---- rtdata/languages/Russian | 7 +++---- rtdata/languages/Serbian (Cyrilic Characters) | 7 +++---- rtdata/languages/Swedish | 7 +++---- rtdata/languages/default | 9 +++++---- rtgui/filebrowser.cc | 4 ++-- rtgui/filebrowser.h | 2 +- rtgui/filecatalog.cc | 13 +++++++++---- rtgui/filecatalog.h | 2 +- 23 files changed, 72 insertions(+), 84 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 1a8a7ccac..7814d80dd 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -83,11 +83,10 @@ FILEBROWSER_CLEARPROFILE;Neteja FILEBROWSER_COPYPROFILE;Copia FILEBROWSER_CURRENT_NAME;Nom actual: FILEBROWSER_DARKFRAME;Marc fosc -FILEBROWSER_DELETEDLGLABEL;Confirmació d'esborrar fitxer -FILEBROWSER_DELETEDLGMSG;Segur que voleu esborrar els %1 fitxers? -FILEBROWSER_DELETEDLGMSGINCLPROC;Segur que voleu suprimir els fitxers %1 seleccionats incloent la versió processada a la cua? +FILEBROWSER_DELETEDIALOG_HEADER;Confirmació d'esborrar fitxer +FILEBROWSER_DELETEDIALOG_SELECTED;Segur que voleu esborrar els %1 fitxers? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Segur que voleu suprimir els fitxers %1 seleccionats incloent la versió processada a la cua? FILEBROWSER_EMPTYTRASH;Buida paperera -FILEBROWSER_EMPTYTRASHHINT;Buida permanentment la paperera FILEBROWSER_EXTPROGMENU;Obre amb FILEBROWSER_FLATFIELD;Camp pla FILEBROWSER_MOVETODARKFDIR;Canvia al directori de camps foscos diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index 45d9b912a..17601d763 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -95,11 +95,10 @@ FILEBROWSER_CLEARPROFILE;清空配置 FILEBROWSER_COPYPROFILE;复制配置 FILEBROWSER_CURRENT_NAME;当前名称： FILEBROWSER_DARKFRAME;暗场 -FILEBROWSER_DELETEDLGLABEL;确认删除 -FILEBROWSER_DELETEDLGMSG;确定删除所选的%1个文件？ -FILEBROWSER_DELETEDLGMSGINCLPROC;你确认要删除选择的 %1 文件 包括 一个处理队列中的版本? +FILEBROWSER_DELETEDIALOG_HEADER;确认删除 +FILEBROWSER_DELETEDIALOG_SELECTED;确定删除所选的%1个文件？ +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;你确认要删除选择的 %1 文件 包括 一个处理队列中的版本? FILEBROWSER_EMPTYTRASH;清空垃圾箱 -FILEBROWSER_EMPTYTRASHHINT;永久清空垃圾箱 FILEBROWSER_EXTPROGMENU;调用程序... FILEBROWSER_FLATFIELD;平场 FILEBROWSER_MOVETODARKFDIR;移动到暗场路径 diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 3ac2273c0..862e4ecd2 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -163,11 +163,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Barevný štítek.\n\nPoužijte výběr ze seznam FILEBROWSER_COPYPROFILE;Kopírovat FILEBROWSER_CURRENT_NAME;Současné jméno: FILEBROWSER_DARKFRAME;Tmavý snímek -FILEBROWSER_DELETEDLGLABEL;Potvrzení smazání souboru -FILEBROWSER_DELETEDLGMSG;Jste si jisti, že chcete vymazat %1 vybraných souborů? -FILEBROWSER_DELETEDLGMSGINCLPROC;Jste si jisti, že chcete vymazat %1 vybraných souborů včetně výstupů dávkového zpracování? +FILEBROWSER_DELETEDIALOG_HEADER;Potvrzení smazání souboru +FILEBROWSER_DELETEDIALOG_SELECTED;Jste si jisti, že chcete vymazat %1 vybraných souborů? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Jste si jisti, že chcete vymazat %1 vybraných souborů včetně výstupů dávkového zpracování? FILEBROWSER_EMPTYTRASH;Vysypat koš -FILEBROWSER_EMPTYTRASHHINT;Trvale smazat soubory z koše, FILEBROWSER_EXTPROGMENU;Otevřít pomocí FILEBROWSER_FLATFIELD;Flat Field FILEBROWSER_MOVETODARKFDIR;Přesunout do složky tmavých snímků diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 2398c1bb6..9e2217fb2 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -200,11 +200,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Farbmarkierung\n\nTaste: Strg + FILEBROWSER_COPYPROFILE;Profil kopieren FILEBROWSER_CURRENT_NAME;Aktueller Name: FILEBROWSER_DARKFRAME;Dunkelbild -FILEBROWSER_DELETEDLGLABEL;Dateien löschen -FILEBROWSER_DELETEDLGMSG;Möchten Sie wirklich %1 Datei(en) unwiderruflich löschen? -FILEBROWSER_DELETEDLGMSGINCLPROC;Möchten Sie wirklich %1 Datei(en) unwiderruflich löschen, mit allen aus der Stapelverarbeitung resultierenden zugehörigen Ausgabedateien? +FILEBROWSER_DELETEDIALOG_HEADER;Dateien löschen +FILEBROWSER_DELETEDIALOG_SELECTED;Möchten Sie wirklich %1 Datei(en) unwiderruflich löschen? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Möchten Sie wirklich %1 Datei(en) unwiderruflich löschen, mit allen aus der Stapelverarbeitung resultierenden zugehörigen Ausgabedateien? FILEBROWSER_EMPTYTRASH;Papierkorb leeren -FILEBROWSER_EMPTYTRASHHINT;Dateien endgültig aus Papierkorb löschen FILEBROWSER_EXTPROGMENU;Öffnen mit FILEBROWSER_FLATFIELD;Weißbild FILEBROWSER_MOVETODARKFDIR;In Dunkelbild-Verzeichnis verschieben diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 45493ac97..282098f87 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -239,11 +239,10 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !FILEBROWSER_COPYPROFILE;Copy !FILEBROWSER_CURRENT_NAME;Current name: !FILEBROWSER_DARKFRAME;Dark-frame -!FILEBROWSER_DELETEDLGLABEL;File delete confirmation -!FILEBROWSER_DELETEDLGMSG;Are you sure you want to delete the selected %1 files? -!FILEBROWSER_DELETEDLGMSGINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? +!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation +!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected %1 files? +!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? !FILEBROWSER_EMPTYTRASH;Empty trash -!FILEBROWSER_EMPTYTRASHHINT;Permanently delete the files from trash. !FILEBROWSER_EXTPROGMENU;Open with !FILEBROWSER_FLATFIELD;Flat-Field !FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 4d510c4b5..0791f37fa 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -122,11 +122,10 @@ !FILEBROWSER_COPYPROFILE;Copy !FILEBROWSER_CURRENT_NAME;Current name: !FILEBROWSER_DARKFRAME;Dark-frame -!FILEBROWSER_DELETEDLGLABEL;File delete confirmation -!FILEBROWSER_DELETEDLGMSG;Are you sure you want to delete the selected %1 files? -!FILEBROWSER_DELETEDLGMSGINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? +!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation +!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected %1 files? +!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? !FILEBROWSER_EMPTYTRASH;Empty trash -!FILEBROWSER_EMPTYTRASHHINT;Permanently delete the files from trash. !FILEBROWSER_EXTPROGMENU;Open with !FILEBROWSER_FLATFIELD;Flat-Field !FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index dfb4d8acc..fac1b9d3f 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -179,11 +179,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Etiquetar con color\n\nUse menú desplegable o at FILEBROWSER_COPYPROFILE;Copiar perfil FILEBROWSER_CURRENT_NAME;Nombre actual: FILEBROWSER_DARKFRAME;Toma Negra -FILEBROWSER_DELETEDLGLABEL;Confirmación de borrar archivos -FILEBROWSER_DELETEDLGMSG;¿Seguro que quiere borrar los %1 archivos seleccionados? -FILEBROWSER_DELETEDLGMSGINCLPROC;¿Seguro que quiere borrar los %1 archivos seleccionados incluyendo la versión procesada en la cola? +FILEBROWSER_DELETEDIALOG_HEADER;Confirmación de borrar archivos +FILEBROWSER_DELETEDIALOG_SELECTED;¿Seguro que quiere borrar los %1 archivos seleccionados? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;¿Seguro que quiere borrar los %1 archivos seleccionados incluyendo la versión procesada en la cola? FILEBROWSER_EMPTYTRASH;Vaciar papelera -FILEBROWSER_EMPTYTRASHHINT;Borrar definitivamente los archivos en la papelera FILEBROWSER_EXTPROGMENU;Abrir con FILEBROWSER_FLATFIELD;Campo plano FILEBROWSER_MOVETODARKFDIR;Mover a carpeta de Tomas Negras diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 4c2fb8d9b..abca556ff 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -118,11 +118,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Label couleur\n\nUtilisez le menu déroulant ou l FILEBROWSER_COPYPROFILE;Copier le profil FILEBROWSER_CURRENT_NAME;Nom courant: FILEBROWSER_DARKFRAME;Trame Noire -FILEBROWSER_DELETEDLGLABEL;Confirmation de la suppression de fichier -FILEBROWSER_DELETEDLGMSG;Êtes-vous sûr de vouloir supprimer les %1 fichiers selectionnés? -FILEBROWSER_DELETEDLGMSGINCLPROC;Êtes-vous sûr de vouloir supprimer les %1 fichiers sélectionnés, INCLUANT une version déjà traitée? +FILEBROWSER_DELETEDIALOG_HEADER;Confirmation de la suppression de fichier +FILEBROWSER_DELETEDIALOG_SELECTED;Êtes-vous sûr de vouloir supprimer les %1 fichiers selectionnés? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Êtes-vous sûr de vouloir supprimer les %1 fichiers sélectionnés, INCLUANT une version déjà traitée? FILEBROWSER_EMPTYTRASH;Vider la corbeille -FILEBROWSER_EMPTYTRASHHINT;Supprime définitivement les fichiers de la corbeille FILEBROWSER_EXTPROGMENU;Ouvrir avec FILEBROWSER_FLATFIELD;Champ Uniforme FILEBROWSER_MOVETODARKFDIR;Déplacer dans le dossier d'images de Trame Noire diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 3c5a0201a..20d5f44ed 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -91,11 +91,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Etichetta colore.\n\nUsa il menù o le scorciatoi FILEBROWSER_COPYPROFILE;Copia FILEBROWSER_CURRENT_NAME;Nome corrente: FILEBROWSER_DARKFRAME;Dark Frame -FILEBROWSER_DELETEDLGLABEL;Conferma eliminazione del file -FILEBROWSER_DELETEDLGMSG;Vuoi eliminare i %1 file selezionati? -FILEBROWSER_DELETEDLGMSGINCLPROC;Vuoi eliminare i %1 file inclusa la versione sviluppata nella coda? +FILEBROWSER_DELETEDIALOG_HEADER;Conferma eliminazione del file +FILEBROWSER_DELETEDIALOG_SELECTED;Vuoi eliminare i %1 file selezionati? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Vuoi eliminare i %1 file inclusa la versione sviluppata nella coda? FILEBROWSER_EMPTYTRASH;Svuota cestino -FILEBROWSER_EMPTYTRASHHINT;Elimina definitivamente i file dal cestino. FILEBROWSER_EXTPROGMENU;Apri con FILEBROWSER_FLATFIELD;Flat Field FILEBROWSER_MOVETODARKFDIR;Sposta nella cartella dei Dark Frame diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 96b509789..87e04d951 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -152,11 +152,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;カラー・ラベル\n\nドロップダウン・ FILEBROWSER_COPYPROFILE;プロファイルをコピー FILEBROWSER_CURRENT_NAME;現在の名前: FILEBROWSER_DARKFRAME;ダークフレーム -FILEBROWSER_DELETEDLGLABEL;ファイル削除確認 -FILEBROWSER_DELETEDLGMSG;選択済みのファイル %1 を削除してもいいですか? -FILEBROWSER_DELETEDLGMSGINCLPROC;バッチ処理に組み込まれている選択済みのファイル %1 を削除してもいいですか? +FILEBROWSER_DELETEDIALOG_HEADER;ファイル削除確認 +FILEBROWSER_DELETEDIALOG_SELECTED;選択済みのファイル %1 を削除してもいいですか? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;バッチ処理に組み込まれている選択済みのファイル %1 を削除してもいいですか? FILEBROWSER_EMPTYTRASH;ゴミ箱を空にする -FILEBROWSER_EMPTYTRASHHINT;ゴミ箱のファイルを完全に削除する FILEBROWSER_EXTPROGMENU;..で開く FILEBROWSER_FLATFIELD;フラットフィールド FILEBROWSER_MOVETODARKFDIR;ダークフレーム・ディレクトリに移動 diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 8c77b48a5..ac0527d42 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -81,11 +81,10 @@ FILEBROWSER_CLEARPROFILE;Feldolgozási paraméter törlése FILEBROWSER_COPYPROFILE;Feldolgozási paraméterek másolása FILEBROWSER_CURRENT_NAME;Aktuális név: FILEBROWSER_DARKFRAME;Referencia feketekép (dark frame) -FILEBROWSER_DELETEDLGLABEL;Állománytörlés megerősítése -FILEBROWSER_DELETEDLGMSG;Biztosan törölni kívánja a kijelölt %1 képet? -FILEBROWSER_DELETEDLGMSGINCLPROC;Biztos vagy benne, hogy törölni szeredné a kiválasztott %1 állományt, beleértve a feldolgozási sorba helyezett változatát IS? +FILEBROWSER_DELETEDIALOG_HEADER;Állománytörlés megerősítése +FILEBROWSER_DELETEDIALOG_SELECTED;Biztosan törölni kívánja a kijelölt %1 képet? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Biztos vagy benne, hogy törölni szeredné a kiválasztott %1 állományt, beleértve a feldolgozási sorba helyezett változatát IS? FILEBROWSER_EMPTYTRASH;Kuka ürítése -FILEBROWSER_EMPTYTRASHHINT;A kukában lévő képek végleges, állományrendszerből történő eltávolítása. FILEBROWSER_FLATFIELD;Flat Field FILEBROWSER_MOVETODARKFDIR;Mozgatás a 'dark frame' könyvtárba FILEBROWSER_MOVETOFLATFIELDDIR;Flat Fields könyvtárba mozgatás diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 5cf76e569..a67bcdbd4 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -122,11 +122,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Kleur label\n\nGebruik keuzemenu of nSneltoets:\n FILEBROWSER_COPYPROFILE;Kopieer profiel FILEBROWSER_CURRENT_NAME;Huidige naam: FILEBROWSER_DARKFRAME;Donkerframe -FILEBROWSER_DELETEDLGLABEL;Bevestiging bestand verwijderen -FILEBROWSER_DELETEDLGMSG;Weet u zeker dat u de geselecteerde %1 bestanden wilt verwijderen? -FILEBROWSER_DELETEDLGMSGINCLPROC;Weet u zeker dat u de %1 geselecteerde bestanden wilt verwijderen *inclusief* de versies van de verwerkingsrij? +FILEBROWSER_DELETEDIALOG_HEADER;Bevestiging bestand verwijderen +FILEBROWSER_DELETEDIALOG_SELECTED;Weet u zeker dat u de geselecteerde %1 bestanden wilt verwijderen? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Weet u zeker dat u de %1 geselecteerde bestanden wilt verwijderen *inclusief* de versies van de verwerkingsrij? FILEBROWSER_EMPTYTRASH;Leeg prullenbak -FILEBROWSER_EMPTYTRASHHINT;Verwijder bestanden in prullenbak voorgoed FILEBROWSER_EXTPROGMENU;Open met FILEBROWSER_FLATFIELD;Vlakveld FILEBROWSER_MOVETODARKFDIR;Verplaats naar map met donkerframes diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 1e60f840b..4a98dc2c1 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -95,11 +95,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Kolorowe etykiety\n\nUżyj za pomocą rozwijanej FILEBROWSER_COPYPROFILE;Kopiuj profil FILEBROWSER_CURRENT_NAME;Obecna nazwa: FILEBROWSER_DARKFRAME;Czarna klatka -FILEBROWSER_DELETEDLGLABEL;Potwierdzenie usunięcia pliku -FILEBROWSER_DELETEDLGMSG;Na pewno usunąć zaznaczone %1 plików? -FILEBROWSER_DELETEDLGMSGINCLPROC;Na pewno usunąć wybrany plik %1 WŁĄCZNIE z wersją utworzoną przez kolejkę przetwarzania? +FILEBROWSER_DELETEDIALOG_HEADER;Potwierdzenie usunięcia pliku +FILEBROWSER_DELETEDIALOG_SELECTED;Na pewno usunąć zaznaczone %1 plików? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Na pewno usunąć wybrany plik %1 WŁĄCZNIE z wersją utworzoną przez kolejkę przetwarzania? FILEBROWSER_EMPTYTRASH;Wyczyść kosz -FILEBROWSER_EMPTYTRASHHINT;Definitywnie usuwa pliki z kosza FILEBROWSER_EXTPROGMENU;Otwórz za pomocą FILEBROWSER_FLATFIELD;Puste pole FILEBROWSER_MOVETODARKFDIR;Przenieś do katalogu zawierającego czarne klatki diff --git a/rtdata/languages/Portugues b/rtdata/languages/Portugues index 912687542..5a0f15a65 100644 --- a/rtdata/languages/Portugues +++ b/rtdata/languages/Portugues @@ -119,11 +119,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Etiqueta de cor.\n\nUse o menu suspenso ou atalho FILEBROWSER_COPYPROFILE;Copiar FILEBROWSER_CURRENT_NAME;Nome atual: FILEBROWSER_DARKFRAME;Fotograma escuro -FILEBROWSER_DELETEDLGLABEL;Confirmação de eliminação de ficheiro -FILEBROWSER_DELETEDLGMSG;Tem a certeza que quer eliminar os %1 ficheiros selecionados? -FILEBROWSER_DELETEDLGMSGINCLPROC;Tem a certeza que quer eliminar os %1 ficheiros selecionados incluindo uma versão processada na fila? +FILEBROWSER_DELETEDIALOG_HEADER;Confirmação de eliminação de ficheiro +FILEBROWSER_DELETEDIALOG_SELECTED;Tem a certeza que quer eliminar os %1 ficheiros selecionados? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Tem a certeza que quer eliminar os %1 ficheiros selecionados incluindo uma versão processada na fila? FILEBROWSER_EMPTYTRASH;Esvaziar o caixote do lixo -FILEBROWSER_EMPTYTRASHHINT;Eliminar permanentemente os ficheiros do caixote do lixo. FILEBROWSER_EXTPROGMENU;Abrir com FILEBROWSER_FLATFIELD;Campo plano FILEBROWSER_MOVETODARKFDIR;Mover para a pasta de fotogramas escuros diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 0493dfc6a..34e783df7 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -119,11 +119,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Etiqueta de cor.\n\nUse o menu suspenso ou atalho FILEBROWSER_COPYPROFILE;Copiar perfil FILEBROWSER_CURRENT_NAME;Nome atual: FILEBROWSER_DARKFRAME;Quadro escuro -FILEBROWSER_DELETEDLGLABEL;Confirmação de exclusão de arquivo -FILEBROWSER_DELETEDLGMSG;Tens certeza de que desejas excluir os %1 arquivos selecionados? -FILEBROWSER_DELETEDLGMSGINCLPROC;Tens certeza de que desejas excluir os %1 arquivos selecionados incluindo uma versão processada em fila? +FILEBROWSER_DELETEDIALOG_HEADER;Confirmação de exclusão de arquivo +FILEBROWSER_DELETEDIALOG_SELECTED;Tens certeza de que desejas excluir os %1 arquivos selecionados? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Tens certeza de que desejas excluir os %1 arquivos selecionados incluindo uma versão processada em fila? FILEBROWSER_EMPTYTRASH;Esvaziar lixeira -FILEBROWSER_EMPTYTRASHHINT;Excluir permanentemente os arquivos da lixeira. FILEBROWSER_EXTPROGMENU;Abrir com FILEBROWSER_FLATFIELD;Flat-Field FILEBROWSER_MOVETODARKFDIR;Mover para o diretório de quadros escuros diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 1da4584f3..57e3307e3 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -112,11 +112,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Color label\n\nUse dropdown menu or Shortcuts:\n< FILEBROWSER_COPYPROFILE;Скопировать профиль FILEBROWSER_CURRENT_NAME;Текущее имя: FILEBROWSER_DARKFRAME;Темновой кадр -FILEBROWSER_DELETEDLGLABEL;Подтверждение удаления файла -FILEBROWSER_DELETEDLGMSG;Вы уверены, что хотите удалить %1 выбранный(ых) файл(ов)? -FILEBROWSER_DELETEDLGMSGINCLPROC;Вы уверены, что хотите удалить %1 выделенных файлов, включая обработанные версии? +FILEBROWSER_DELETEDIALOG_HEADER;Подтверждение удаления файла +FILEBROWSER_DELETEDIALOG_SELECTED;Вы уверены, что хотите удалить %1 выбранный(ых) файл(ов)? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Вы уверены, что хотите удалить %1 выделенных файлов, включая обработанные версии? FILEBROWSER_EMPTYTRASH;Очистить корзину -FILEBROWSER_EMPTYTRASHHINT;Удалить файлы из корзины без возможности восстановления FILEBROWSER_EXTPROGMENU;Открыть с помощью FILEBROWSER_FLATFIELD;Плоское поле FILEBROWSER_MOVETODARKFDIR;Переместить в каталог темновых кадров diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 484d4f20b..38014aaf3 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -84,11 +84,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Натпис у боји.\n\nКористите FILEBROWSER_COPYPROFILE;Умножи профил FILEBROWSER_CURRENT_NAME;Тренутно име: FILEBROWSER_DARKFRAME;Тамни кадар -FILEBROWSER_DELETEDLGLABEL;Брисање датотеке -FILEBROWSER_DELETEDLGMSG;Да ли сигурно желите да обришете %1 датотека? -FILEBROWSER_DELETEDLGMSGINCLPROC;Да ли желите да обришете %1 изабраних датотека, укључујући и оне које су заказане? +FILEBROWSER_DELETEDIALOG_HEADER;Брисање датотеке +FILEBROWSER_DELETEDIALOG_SELECTED;Да ли сигурно желите да обришете %1 датотека? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Да ли желите да обришете %1 изабраних датотека, укључујући и оне које су заказане? FILEBROWSER_EMPTYTRASH;Избаци смеће -FILEBROWSER_EMPTYTRASHHINT;Трајно брише датотеке из смећа FILEBROWSER_EXTPROGMENU;Отвори помоћу FILEBROWSER_FLATFIELD;Равно поље FILEBROWSER_MOVETODARKFDIR;Пребаци у фасциклу са тамним кадровима diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index 8394d306b..bb9ec53cb 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -93,11 +93,10 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Färgetikett\n\nAnvänd menyn eller kortkommandon FILEBROWSER_COPYPROFILE;Kopiera profil FILEBROWSER_CURRENT_NAME;Nuvarande namn: FILEBROWSER_DARKFRAME;Svartbild -FILEBROWSER_DELETEDLGLABEL;Bekräftelse vid borttag -FILEBROWSER_DELETEDLGMSG;Är du säker på att du vill ta bort de valda %1 filerna? -FILEBROWSER_DELETEDLGMSGINCLPROC;Är du säker på att du vill ta bort de valda filerna %1 OCH den behandlade versionen? +FILEBROWSER_DELETEDIALOG_HEADER;Bekräftelse vid borttag +FILEBROWSER_DELETEDIALOG_SELECTED;Är du säker på att du vill ta bort de valda %1 filerna? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Är du säker på att du vill ta bort de valda filerna %1 OCH den behandlade versionen? FILEBROWSER_EMPTYTRASH;Töm papperskorgen -FILEBROWSER_EMPTYTRASHHINT;Ta bort papperskorgens filer permanent FILEBROWSER_EXTPROGMENU;Öppna med FILEBROWSER_FLATFIELD;Plattfält FILEBROWSER_MOVETODARKFDIR;Flytta till katalogen för svartbilder diff --git a/rtdata/languages/default b/rtdata/languages/default index 81b4eeaa4..f86509ea4 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -121,11 +121,12 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\n FILEBROWSER_COPYPROFILE;Copy FILEBROWSER_CURRENT_NAME;Current name: FILEBROWSER_DARKFRAME;Dark-frame -FILEBROWSER_DELETEDLGLABEL;File delete confirmation -FILEBROWSER_DELETEDLGMSG;Are you sure you want to delete the selected %1 files? -FILEBROWSER_DELETEDLGMSGINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? +FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation: +FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected %1 files? +FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? FILEBROWSER_EMPTYTRASH;Empty trash -FILEBROWSER_EMPTYTRASHHINT;Permanently delete the files from trash. +FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. FILEBROWSER_EXTPROGMENU;Open with FILEBROWSER_FLATFIELD;Flat-Field FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 7802e9987..a270e5af8 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -753,9 +753,9 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m) if (m == open) { openRequested(mselected); } else if (m == remove) { - tbl->deleteRequested (mselected, false); + tbl->deleteRequested (mselected, false, true); } else if (m == removeInclProc) { - tbl->deleteRequested (mselected, true); + tbl->deleteRequested (mselected, true, true); } else if (m == trash) { toTrashRequested (mselected); } else if (m == untrash) { diff --git a/rtgui/filebrowser.h b/rtgui/filebrowser.h index d579a48f4..b208a854d 100644 --- a/rtgui/filebrowser.h +++ b/rtgui/filebrowser.h @@ -43,7 +43,7 @@ public: virtual void openRequested(const std::vector& tbe) = 0; virtual void developRequested(const std::vector& tbe, bool fastmode) = 0; virtual void renameRequested(const std::vector& tbe) = 0; - virtual void deleteRequested(const std::vector& tbe, bool inclBatchProcessed) = 0; + virtual void deleteRequested(const std::vector& tbe, bool inclBatchProcessed, bool onlySelected) = 0; virtual void copyMoveRequested(const std::vector& tbe, bool moveRequested) = 0; virtual void selectionChanged(const std::vector& tbe) = 0; virtual void clearFromCacheRequested(const std::vector& tbe, bool leavenotrace) = 0; diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 2995a0de0..fcccaac3a 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -943,14 +943,19 @@ void FileCatalog::openRequested(const std::vector& tmb) ); } -void FileCatalog::deleteRequested(const std::vector& tbe, bool inclBatchProcessed) +void FileCatalog::deleteRequested(const std::vector& tbe, bool inclBatchProcessed, bool onlySelected) { if (tbe.empty()) { return; } - Gtk::MessageDialog msd (getToplevelWindow(this), M("FILEBROWSER_DELETEDLGLABEL"), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true); - msd.set_secondary_text(Glib::ustring::compose ( inclBatchProcessed ? M("FILEBROWSER_DELETEDLGMSGINCLPROC") : M("FILEBROWSER_DELETEDLGMSG"), tbe.size()), true); + Gtk::MessageDialog msd (getToplevelWindow(this), M("FILEBROWSER_DELETEDIALOG_HEADER"), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true); + if (onlySelected) { + msd.set_secondary_text(Glib::ustring::compose (inclBatchProcessed ? M("FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC") : M("FILEBROWSER_DELETEDIALOG_SELECTED"), tbe.size()), true); + } else { + msd.set_secondary_text(Glib::ustring::compose (M("FILEBROWSER_DELETEDIALOG_ALL"), tbe.size()), true); + } + if (msd.run() == Gtk::RESPONSE_YES) { for (unsigned int i = 0; i < tbe.size(); i++) { const auto fname = tbe[i]->filename; @@ -1832,7 +1837,7 @@ void FileCatalog::emptyTrash () toDel.push_back (static_cast(t[i])); } - deleteRequested (toDel, false); + deleteRequested (toDel, false, false); trashChanged(); } diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h index 8b5b14ed2..4c0d13e51 100644 --- a/rtgui/filecatalog.h +++ b/rtgui/filecatalog.h @@ -204,7 +204,7 @@ public: void filterApplied() override; void openRequested(const std::vector& tbe) override; - void deleteRequested(const std::vector& tbe, bool inclBatchProcessed) override; + void deleteRequested(const std::vector& tbe, bool inclBatchProcessed, bool onlySelected) override; void copyMoveRequested(const std::vector& tbe, bool moveRequested) override; void developRequested(const std::vector& tbe, bool fastmode) override; void renameRequested(const std::vector& tbe) override; From 683377e0399714135ce5da8d027cc38af4deef80 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 24 May 2019 16:50:23 +0200 Subject: [PATCH 3/5] generateTranslationDiffs --- rtdata/languages/Catala | 2 ++ rtdata/languages/Chinese (Simplified) | 2 ++ rtdata/languages/Czech | 8 +++++++- rtdata/languages/Deutsch | 6 ++++++ rtdata/languages/English (UK) | 4 +++- rtdata/languages/English (US) | 4 +++- rtdata/languages/Espanol | 2 ++ rtdata/languages/Francais | 2 ++ rtdata/languages/Italiano | 2 ++ rtdata/languages/Japanese | 2 ++ rtdata/languages/Magyar | 2 ++ rtdata/languages/Nederlands | 2 ++ rtdata/languages/Polish | 2 ++ rtdata/languages/Portugues | 2 ++ rtdata/languages/Portugues (Brasil) | 2 ++ rtdata/languages/Russian | 2 ++ rtdata/languages/Serbian (Cyrilic Characters) | 2 ++ rtdata/languages/Swedish | 2 ++ rtdata/languages/default | 2 +- 19 files changed, 48 insertions(+), 4 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 7814d80dd..73970424b 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -942,6 +942,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles !FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\nShift-Ctrl-0 No Color\nShift-Ctrl-1 Red\nShift-Ctrl-2 Yellow\nShift-Ctrl-3 Green\nShift-Ctrl-4 Blue\nShift-Ctrl-5 Purple +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_POPUPCOLORLABEL0;Label: None !FILEBROWSER_POPUPCOLORLABEL1;Label: Red !FILEBROWSER_POPUPCOLORLABEL2;Label: Yellow diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index 17601d763..fde2aab1b 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -957,6 +957,8 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles !FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\nShift-Ctrl-0 No Color\nShift-Ctrl-1 Red\nShift-Ctrl-2 Yellow\nShift-Ctrl-3 Green\nShift-Ctrl-4 Blue\nShift-Ctrl-5 Purple +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n1001,1004,1199\n\nExclude search terms by prefixing them with !=\ne.g.\n!=1001,1004,1199\n\nShortcuts:\nCtrl-f - focus the Find box,\nEnter - search,\nEsc - clear the Find box,\nShift-Esc - defocus the Find box. !FILEBROWSER_SHOWCOLORLABEL1HINT;Show images labeled Red.\nShortcut: Alt-1 !FILEBROWSER_SHOWCOLORLABEL2HINT;Show images labeled Yellow.\nShortcut: Alt-2 diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 862e4ecd2..61f51cd2d 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -2317,4 +2317,10 @@ ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit celý obrázek obrazovce\nZkratka: Alt< ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: + ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - -!PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode \ No newline at end of file +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. +!PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 9e2217fb2..37b755287 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -2357,3 +2357,9 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen.\nTaste: Alt + f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 282098f87..cda91f29a 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -239,10 +239,12 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !FILEBROWSER_COPYPROFILE;Copy !FILEBROWSER_CURRENT_NAME;Current name: !FILEBROWSER_DARKFRAME;Dark-frame -!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation: !FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected %1 files? !FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? !FILEBROWSER_EMPTYTRASH;Empty trash +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_EXTPROGMENU;Open with !FILEBROWSER_FLATFIELD;Flat-Field !FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 0791f37fa..9affa9444 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -122,10 +122,12 @@ !FILEBROWSER_COPYPROFILE;Copy !FILEBROWSER_CURRENT_NAME;Current name: !FILEBROWSER_DARKFRAME;Dark-frame -!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation: !FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected %1 files? !FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? !FILEBROWSER_EMPTYTRASH;Empty trash +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_EXTPROGMENU;Open with !FILEBROWSER_FLATFIELD;Flat-Field !FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index fac1b9d3f..b1d76b24f 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -2319,6 +2319,8 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nTecla de Atajo: - !CURVEEDITOR_CATMULLROM;Flexible !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius !MAIN_FRAME_PLACES_DEL;Remove !MAIN_TAB_FAVORITES;Favorites diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index abca556ff..cd3ac7394 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -2264,6 +2264,8 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - !!!!!!!!!!!!!!!!!!!!!!!!! !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !MAIN_FRAME_PLACES_DEL;Remove !PROGRESSBAR_DECODING;Decoding... !PROGRESSBAR_GREENEQUIL;Green equilibration... diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 20d5f44ed..bedba34f6 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1270,6 +1270,8 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default !FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images. !FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 87e04d951..0ab793099 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -2310,5 +2310,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode !QUEUE_LOCATION_TITLE;Output Location diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index ac0527d42..d1947b893 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -870,6 +870,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles !FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\nShift-Ctrl-0 No Color\nShift-Ctrl-1 Red\nShift-Ctrl-2 Yellow\nShift-Ctrl-3 Green\nShift-Ctrl-4 Blue\nShift-Ctrl-5 Purple +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_EXTPROGMENU;Open with !FILEBROWSER_OPENDEFAULTVIEWER;Windows default viewer (queue-processed) !FILEBROWSER_POPUPCOLORLABEL0;Label: None diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index a67bcdbd4..b8b30e64c 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -1979,6 +1979,8 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !GENERAL_CURRENT;Current !GENERAL_RESET;Reset !GENERAL_SAVE_AS;Save as... diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 4a98dc2c1..05f099ea6 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1392,6 +1392,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default !FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images. !FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. diff --git a/rtdata/languages/Portugues b/rtdata/languages/Portugues index 5a0f15a65..b59f4ffe0 100644 --- a/rtdata/languages/Portugues +++ b/rtdata/languages/Portugues @@ -2262,6 +2262,8 @@ ZOOMPANEL_ZOOMOUT;Afastar\nAtalho: - !!!!!!!!!!!!!!!!!!!!!!!!! !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !MAIN_FRAME_PLACES_DEL;Remove !PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode !PROGRESSBAR_DECODING;Decoding... diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 34e783df7..da9a620df 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -2254,6 +2254,8 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: - !!!!!!!!!!!!!!!!!!!!!!!!! !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - region offset !HISTORY_MSG_COLORTONING_LABREGION_POWER;CT - region power !MAIN_FRAME_PLACES_DEL;Remove diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 57e3307e3..c2b43033e 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1470,6 +1470,8 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. !FILECHOOSER_FILTER_PP;Processing profiles !FILECHOOSER_FILTER_SAME;Same format as current photo diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 38014aaf3..21a34119a 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1229,6 +1229,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_POPUPCOLORLABEL0;Label: None !FILEBROWSER_POPUPCOLORLABEL1;Label: Red !FILEBROWSER_POPUPCOLORLABEL2;Label: Yellow diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index bb9ec53cb..14dc4069f 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1768,6 +1768,8 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords. !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles +!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default !GENERAL_CURRENT;Current !GENERAL_RESET;Reset diff --git a/rtdata/languages/default b/rtdata/languages/default index f86509ea4..3b96e1b17 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -121,8 +121,8 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\n FILEBROWSER_COPYPROFILE;Copy FILEBROWSER_CURRENT_NAME;Current name: FILEBROWSER_DARKFRAME;Dark-frame -FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation: FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? +FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation: FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected %1 files? FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected %1 files including a queue-processed version? FILEBROWSER_EMPTYTRASH;Empty trash From 2643529d9f1a4ef630280ca7e40156b84c79b860 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sat, 25 May 2019 17:27:24 +0200 Subject: [PATCH 4/5] Update Deutsch locale --- rtdata/languages/Deutsch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 37b755287..b0afef7e3 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -80,6 +80,7 @@ #79 24.02.2019 Erweiterung (TooWaBoo) RT 5.5 #80 25.03.2019 Erweiterung (TooWaBoo) RT 5.6 #81 15.04.2019 Erweiterung (TooWaBoo) RT 5.6 +#82 25.05.2019 Erweiterung (TooWaBoo) RT 5.6 ABOUT_TAB_BUILD;Version ABOUT_TAB_CREDITS;Danksagungen @@ -2361,5 +2362,5 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all %1 files in trash? -!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash. +FILEBROWSER_DELETEDIALOG_ALL;Möchten Sie wirklich %1 Dateien unwiderruflich löschen? +FILEBROWSER_EMPTYTRASHHINT;Alle Dateien im Papierkorb\nunwiderruflich löschen. From 0241179244f6d7bed2e59370e37fdea31de737c5 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sun, 26 May 2019 04:30:19 +0200 Subject: [PATCH 5/5] Fixed typo "Korreturwert" --- rtdata/languages/Deutsch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index b0afef7e3..a2f33e6fe 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -2344,7 +2344,7 @@ TP_WBALANCE_SOLUX47;Solux 4700K (Vendor) TP_WBALANCE_SOLUX47_NG;Solux 4700K (Nat. Gallery) TP_WBALANCE_SPOTWB;Manuell setzen TP_WBALANCE_TEMPBIAS;AWB-Temperatur-Korrektur -TP_WBALANCE_TEMPBIAS_TOOLTIP;Prozentuale Korrektur der Farbtemperatur des automatischen\nWeißabgleichs in Richtung wärmer oder kälter.\nDer Korreturwert berechnet sich aus:\nAWB-Temperatur + AWB-Temperatur * AWB-Temperatur-Korrektur +TP_WBALANCE_TEMPBIAS_TOOLTIP;Prozentuale Korrektur der Farbtemperatur des automatischen\nWeißabgleichs in Richtung wärmer oder kälter.\nDer Korrekturwert berechnet sich aus:\nAWB-Temperatur + AWB-Temperatur * AWB-Temperatur-Korrektur TP_WBALANCE_TEMPERATURE;Farbtemperatur TP_WBALANCE_TUNGSTEN;Glühlampe TP_WBALANCE_WATER1;Unterwasser 1