Merge pull request #1 from Beep6581/dev

Merge from dev

rtdata/languages/Catala

@@ -1001,6 +1001,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !GENERAL_ASIMAGE;As Image
 !GENERAL_AUTO;Automatic
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Chinese (Simplified)

@@ -1016,6 +1016,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
 !FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b>
 !FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: <b>Alt-0</b>
 !FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>Shift-0</b>
+!GENERAL_CURRENT;Current
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...
 !GENERAL_SLIDER;Slider

rtdata/languages/Chinese (Traditional)

@@ -574,6 +574,7 @@ TP_WBALANCE_TEMPERATURE;色溫
 !GENERAL_ASIMAGE;As Image
 !GENERAL_AUTO;Automatic
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Czech

@@ -2168,6 +2168,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
 !DYNPROFILEEDITOR_IMGTYPE_STD;Standard
 !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
 !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
+!GENERAL_CURRENT;Current
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...
 !HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.

rtdata/languages/Dansk

@@ -568,6 +568,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Deutsch

@@ -2405,3 +2405,8 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen.\nTaste: <b>Alt</b> + <b>f</b>
 ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: <b>+</b>
 ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
 
+!!!!!!!!!!!!!!!!!!!!!!!!!
+! Untranslated keys follow; remove the ! prefix after an entry is translated.
+!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!GENERAL_CURRENT;Current

rtdata/languages/English (UK)

@@ -339,6 +339,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !GENERAL_BEFORE;Before
 !GENERAL_CANCEL;Cancel
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_DISABLE;Disable
 !GENERAL_DISABLED;Disabled
 !GENERAL_ENABLE;Enable

rtdata/languages/English (US)

@@ -224,6 +224,7 @@
 !GENERAL_BEFORE;Before
 !GENERAL_CANCEL;Cancel
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_DISABLE;Disable
 !GENERAL_DISABLED;Disabled
 !GENERAL_ENABLE;Enable

rtdata/languages/Espanol

@@ -1493,6 +1493,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !FILECHOOSER_FILTER_TIFF;TIFF files
 !GENERAL_APPLY;Apply
 !GENERAL_ASIMAGE;As Image
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Euskara

@@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Francais

@@ -2298,6 +2298,7 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
 ! Untranslated keys follow; remove the ! prefix after an entry is translated.
 !!!!!!!!!!!!!!!!!!!!!!!!!
 
+!GENERAL_CURRENT;Current
 !HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel
 !HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;CT - region mask blur
 !HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - region offset

rtdata/languages/Greek

@@ -568,6 +568,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Hebrew

@@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Italiano

@@ -1328,6 +1328,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
 !FILECHOOSER_FILTER_TIFF;TIFF files
 !GENERAL_APPLY;Apply
 !GENERAL_ASIMAGE;As Image
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Japanese

@@ -2336,3 +2336,8 @@ ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカッ
 ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: <b>+</b>
 ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 
+!!!!!!!!!!!!!!!!!!!!!!!!!
+! Untranslated keys follow; remove the ! prefix after an entry is translated.
+!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!GENERAL_CURRENT;Current

rtdata/languages/Latvian

@@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Magyar

@@ -927,6 +927,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !GENERAL_ASIMAGE;As Image
 !GENERAL_AUTO;Automatic
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Nederlands

@@ -2058,6 +2058,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 !EXIFPANEL_SHOWALL;Show all
 !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
 !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
+!GENERAL_CURRENT;Current
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...
 !GENERAL_SLIDER;Slider

rtdata/languages/Norsk BM

@@ -568,6 +568,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Polish

@@ -1450,6 +1450,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !FILECHOOSER_FILTER_TIFF;TIFF files
 !GENERAL_APPLY;Apply
 !GENERAL_ASIMAGE;As Image
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Polish (Latin Characters)

@@ -1450,6 +1450,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !FILECHOOSER_FILTER_TIFF;TIFF files
 !GENERAL_APPLY;Apply
 !GENERAL_ASIMAGE;As Image
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Portugues (Brasil)

@@ -2225,6 +2225,7 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: <b>-</b>
 !DYNPROFILEEDITOR_IMGTYPE_STD;Standard
 !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
 !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
+!GENERAL_CURRENT;Current
 !HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
 !HISTORY_MSG_489;DRC - Detail
 !HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction

rtdata/languages/Russian

@@ -1447,6 +1447,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
 !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
+!GENERAL_CURRENT;Current
 !GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
 !HISTOGRAM_TOOLTIP_MODE;Toggle between linear, log-linear and log-log scaling of the histogram.
 !HISTORY_MSG_235;B&amp;W - CM - Auto

rtdata/languages/Serbian (Cyrilic Characters)

@@ -1301,6 +1301,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !FILECHOOSER_FILTER_TIFF;TIFF files
 !GENERAL_APPLY;Apply
 !GENERAL_ASIMAGE;As Image
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Serbian (Latin Characters)

@@ -1301,6 +1301,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !FILECHOOSER_FILTER_TIFF;TIFF files
 !GENERAL_APPLY;Apply
 !GENERAL_ASIMAGE;As Image
+!GENERAL_CURRENT;Current
 !GENERAL_OPEN;Open
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...

rtdata/languages/Slovak

@@ -641,6 +641,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !GENERAL_ASIMAGE;As Image
 !GENERAL_AUTO;Automatic
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Suomi

@@ -570,6 +570,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtdata/languages/Swedish

@@ -1826,6 +1826,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
 !FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
 !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
+!GENERAL_CURRENT;Current
 !GENERAL_RESET;Reset
 !GENERAL_SAVE_AS;Save as...
 !GENERAL_SLIDER;Slider

rtdata/languages/Turkish

@@ -569,6 +569,7 @@ TP_WBALANCE_TEMPERATURE;Isı
 !GENERAL_AUTO;Automatic
 !GENERAL_BEFORE;Before
 !GENERAL_CLOSE;Close
+!GENERAL_CURRENT;Current
 !GENERAL_FILE;File
 !GENERAL_NONE;None
 !GENERAL_OPEN;Open

rtexif/nikonattribs.cc

@@ -1074,6 +1074,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
     {"C3 34 68 98 38 40 4B 4E", "Sigma 100-400mm f/5-6.3 DG OS HSM | C"},
     {"C8 54 62 62 0C 0C 4B 46", "Sigma 85mm f/1.4 DG HSM | A"},
     {"C9 48 37 5C 24 24 4B 4E", "Sigma 24-70mm f/2.8 DG OS HSM | A"},
+    {"CA 48 27 3E 24 24 DF 4E", "Tamron SP 15-30mm f/2.8 Di VC USD G2 (A041)"},
     {"CC 4C 50 68 14 14 4B 06", "Sigma 50-100mm f/1.8 DC HSM | A"},
     {"CD 3D 2D 70 2E 3C 4B 0E", "Sigma 18-125mm f/3.8-5.6 DC OS HSM"},
     {"CE 34 76 A0 38 40 4B 0E", "Sigma 150-500mm f/5-6.3 DG OS APO HSM"},