liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with Dev

Browse Source
This commit is contained in:
Desmis
2017-05-03 20:09:13 +02:00
parent c2cd6f596b 55d342ade3
commit 861f5a392a
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/Deutsch
View File

@@ -842,7 +842,7 @@ MAIN_TAB_COLOR;Farbe
MAIN_TAB_COLOR_TOOLTIP;Taste: <b>Alt</b> + <b>c</b> MAIN_TAB_COLOR_TOOLTIP;Taste: <b>Alt</b> + <b>c</b>
MAIN_TAB_DETAIL;Details MAIN_TAB_DETAIL;Details
MAIN_TAB_DETAIL_TOOLTIP;Taste: <b>Alt</b> + <b>d</b> 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_EXIF;Exif
MAIN_TAB_EXPORT; Exportieren MAIN_TAB_EXPORT; Exportieren
MAIN_TAB_EXPOSURE;Belichtung MAIN_TAB_EXPOSURE;Belichtung

2
rtdata/languages/Francais
View File

@@ -757,7 +757,7 @@ MAIN_TAB_COLOR;Couleur
MAIN_TAB_COLOR_TOOLTIP;Raccourci:<b>Alt-c</b> MAIN_TAB_COLOR_TOOLTIP;Raccourci:<b>Alt-c</b>
MAIN_TAB_DETAIL;Détail MAIN_TAB_DETAIL;Détail
MAIN_TAB_DETAIL_TOOLTIP;Raccourci:<b>Alt-d</b> 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_EXIF;EXIF
MAIN_TAB_EXPORT; Export Rapide MAIN_TAB_EXPORT; Export Rapide
MAIN_TAB_EXPOSURE;Exposition MAIN_TAB_EXPOSURE;Exposition

2
rtdata/languages/Italiano
View File

@@ -528,7 +528,7 @@ MAIN_TAB_COLOR;Colore
MAIN_TAB_COLOR_TOOLTIP;Scorciatoia: <b>Alt-c</b> MAIN_TAB_COLOR_TOOLTIP;Scorciatoia: <b>Alt-c</b>
MAIN_TAB_DETAIL;Dettaglio MAIN_TAB_DETAIL;Dettaglio
MAIN_TAB_DETAIL_TOOLTIP;Scorciatoia: <b>Alt-d</b> MAIN_TAB_DETAIL_TOOLTIP;Scorciatoia: <b>Alt-d</b>
MAIN_TAB_DEVELOP;Sviluppo MAIN_TAB_DEVELOP; Modifiche Batch
MAIN_TAB_EXIF;Exif MAIN_TAB_EXIF;Exif
MAIN_TAB_EXPORT; Esportazione Rapida MAIN_TAB_EXPORT; Esportazione Rapida
MAIN_TAB_EXPOSURE;Esposizione MAIN_TAB_EXPOSURE;Esposizione

2
rtdata/languages/default
View File

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

4
rtgui/filepanel.cc
View File

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

2
tools/generateDirtyFiles
View File

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