merge with Dev

This commit is contained in:
Desmis
2017-05-03 20:09:13 +02:00
6 changed files with 17 additions and 17 deletions

View File

@@ -842,9 +842,9 @@ MAIN_TAB_COLOR;Farbe
MAIN_TAB_COLOR_TOOLTIP;Taste: <b>Alt</b> + <b>c</b>
MAIN_TAB_DETAIL;Details
MAIN_TAB_DETAIL_TOOLTIP;Taste: <b>Alt</b> + <b>d</b>
MAIN_TAB_DEVELOP;Entwickeln
MAIN_TAB_DEVELOP; Batchbearbeitung
MAIN_TAB_EXIF;Exif
MAIN_TAB_EXPORT;Exportieren
MAIN_TAB_EXPORT; Exportieren
MAIN_TAB_EXPOSURE;Belichtung
MAIN_TAB_EXPOSURE_TOOLTIP;Taste: <b>Alt</b> + <b>e</b>
MAIN_TAB_FILTER; Filter

View File

@@ -757,9 +757,9 @@ MAIN_TAB_COLOR;Couleur
MAIN_TAB_COLOR_TOOLTIP;Raccourci:<b>Alt-c</b>
MAIN_TAB_DETAIL;Détail
MAIN_TAB_DETAIL_TOOLTIP;Raccourci:<b>Alt-d</b>
MAIN_TAB_DEVELOP; Développer
MAIN_TAB_DEVELOP; Édition Par Lot
MAIN_TAB_EXIF;EXIF
MAIN_TAB_EXPORT;Export Rapide
MAIN_TAB_EXPORT; Export Rapide
MAIN_TAB_EXPOSURE;Exposition
MAIN_TAB_EXPOSURE_TOOLTIP;Raccourci:<b>Alt-e</b>
MAIN_TAB_FILTER; Filtrer

View File

@@ -528,12 +528,12 @@ MAIN_TAB_COLOR;Colore
MAIN_TAB_COLOR_TOOLTIP;Scorciatoia: <b>Alt-c</b>
MAIN_TAB_DETAIL;Dettaglio
MAIN_TAB_DETAIL_TOOLTIP;Scorciatoia: <b>Alt-d</b>
MAIN_TAB_DEVELOP;Sviluppo
MAIN_TAB_DEVELOP; Modifiche Batch
MAIN_TAB_EXIF;Exif
MAIN_TAB_EXPORT; Esportazione Rapida
MAIN_TAB_EXPOSURE;Esposizione
MAIN_TAB_EXPOSURE_TOOLTIP;Scorciatoia: <b>Alt-e</b>
MAIN_TAB_FILTER;Filtro
MAIN_TAB_FILTER; Filtro
MAIN_TAB_IPTC;IPTC
MAIN_TAB_METADATA;Metadati
MAIN_TAB_METADATA_TOOLTIP;Scorciatoia: <b>Alt-m</b>

View File

@@ -875,7 +875,7 @@ MAIN_TAB_COLOR;Color
MAIN_TAB_COLOR_TOOLTIP;Shortcut: <b>Alt-c</b>
MAIN_TAB_DETAIL;Detail
MAIN_TAB_DETAIL_TOOLTIP;Shortcut: <b>Alt-d</b>
MAIN_TAB_DEVELOP; Develop
MAIN_TAB_DEVELOP; Batch Edit
MAIN_TAB_EXIF;Exif
MAIN_TAB_EXPORT; Fast Export
MAIN_TAB_EXPOSURE;Exposure

View File

@@ -122,9 +122,9 @@ FilePanel::FilePanel () : parent(nullptr)
tpcPaned->pack1 (*tpc->toolPanelNotebook, false, true);
tpcPaned->pack2 (*history, true, true);
rightNotebook->append_page (*tpcPaned, *devLab);
rightNotebook->append_page (*inspectorPanel, *inspectLab);
rightNotebook->append_page (*sFilterPanel, *filtLab);
rightNotebook->append_page (*inspectorPanel, *inspectLab);
rightNotebook->append_page (*tpcPaned, *devLab);
//rightNotebook->append_page (*taggingBox, *tagLab); commented out: currently the tab is empty ...
rightNotebook->append_page (*sExportPanel, *exportLab);
rightNotebook->set_name ("RightNotebook");

View File

@@ -2,7 +2,7 @@
# Search files for keywords, then do something to the files which don't match
# Path to the RawTherapee repository
pushd $HOME/rawtherapee >/dev/null
pushd $HOME/programs/code-rawtherapee >/dev/null
unset uses match m u
# Key to search for, e.g. an include
IFS="