merge with dev

This commit is contained in:
Desmis
2018-02-12 08:53:49 +01:00
5 changed files with 53 additions and 56 deletions

View File

@@ -1,10 +1,10 @@
![RawTherapee logo](http://rawtherapee.com/images/logos/rawtherapee_logo_discuss.png)
RawTherapee is a powerful, cross-platform raw photo processing program, released under the [GNU General Public License Version 3](https://opensource.org/licenses/gpl-3.0.html) and written in C++ using a [GTK+](http://www.gtk.org/) front-end. It uses a patched version of [dcraw](http://www.cybercom.net/~dcoffin/dcraw/) for reading raw files, with an in-house solution which adds the highest quality support for certain camera models unsupported by dcraw and enhances the accuracy of certain raw files already supported by dcraw. It is notable for the advanced control it gives the user over the demosaicing and development process.
RawTherapee is a powerful, cross-platform raw photo processing program, released as [libre software](https://en.wikipedia.org/wiki/Free_software) under the [GNU General Public License Version 3](https://opensource.org/licenses/gpl-3.0.html). It is written mostly in C++ using a [GTK+](http://www.gtk.org/) front-end. It uses a patched version of [dcraw](http://www.cybercom.net/~dcoffin/dcraw/) for reading raw files, with an in-house solution which adds the highest quality support for certain camera models unsupported by dcraw and enhances the accuracy of certain raw files already supported by dcraw. It is notable for the advanced control it gives the user over the demosaicing and development process.
## Target audience
RawTherapee is a [libre software](https://en.wikipedia.org/wiki/Free_software) designed for developing raw files from a broad range of digital cameras, as well as [HDR DNG](https://helpx.adobe.com/photoshop/digital-negative.html) files and non-raw image formats ([JPEG](https://en.wikipedia.org/wiki/JPEG), [TIFF](https://en.wikipedia.org/wiki/Tagged_Image_File_Format) and [PNG](https://en.wikipedia.org/wiki/Portable_Network_Graphics)). The target audience ranges from enthusiast newcomers who wish to broaden their understanding of how digital imaging works to semi-professional photographers. Knowledge in color science is not compulsory, but it is recommended that you are eager to learn and ready to read our documentation ([RawPedia](http://rawpedia.rawtherapee.com/)) as well as look up basic concepts which lie outside the scope of RawPedia, such as [color balance](https://en.wikipedia.org/wiki/Color_balance), elsewhere.
RawTherapee is designed for developing raw files from a broad range of digital cameras, as well as [HDR DNG](https://helpx.adobe.com/photoshop/digital-negative.html) files and non-raw image formats ([JPEG](https://en.wikipedia.org/wiki/JPEG), [TIFF](https://en.wikipedia.org/wiki/Tagged_Image_File_Format) and [PNG](https://en.wikipedia.org/wiki/Portable_Network_Graphics)). The target audience ranges from enthusiast newcomers who wish to broaden their understanding of how digital imaging works to semi-professional photographers. Knowledge in color science is not compulsory, but it is recommended that you are eager to learn and ready to read our documentation ([RawPedia](http://rawpedia.rawtherapee.com/)) as well as look up basic concepts which lie outside the scope of RawPedia, such as [color balance](https://en.wikipedia.org/wiki/Color_balance), elsewhere.
Of course, professionals may use RawTherapee too while enjoying complete freedom, but will probably lack some peripheral features such as [Digital Asset Management](https://en.wikipedia.org/wiki/Digital_asset_management), printing, uploading, etc. RawTherapee is not aimed at being an inclusive all-in-one program, and the [open-source community](https://en.wikipedia.org/wiki/Open-source_movement) is sufficiently developed by now to offer all those peripheral features in other specialized software.
@@ -28,9 +28,6 @@ http://rawtherapee.com/downloads
Download source code tarballs:
http://rawtherapee.com/shared/source/
Git handbook:
http://git-scm.com/book/en/
## Compilation, branches and Git
Refer to RawPedia for a detailed explanation of how to get the necessary dependencies and how to compile RawTherapee.

View File

@@ -1,49 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2017 Maciej Dworak www.rawtherapee.com -->
<component>
<id type="desktop">rawtherapee.desktop</id>
<metadata_license>CC-BY-SA-4.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<component type="desktop">
<id>rawtherapee.desktop</id>
<name>RawTherapee</name>
<summary>A powerful cross-platform raw image processing program</summary>
<summary>An advanced raw photo development program</summary>
<summary xml:lang="cs">Program pro konverzi a zpracování digitálních raw fotografií</summary>
<summary xml:lang="fr">Logiciel de conversion et de traitement de photos numériques de format raw (but de capteur)</summary>
<summary xml:lang="pl">Zaawansowany program do wywoływania zdjęć typu raw</summary>
<description>
<p>
RawTherapee is a powerful raw image processing program. All the internal calculations are done in a high precision 32-bit floating point engine which facilitates non-destructive editing. Images are opened directly without the hassle of having to import them. Adjustments made by the user are immediately reflected in the preview and saved to a separate sidecar file. These adjustments are then applied during the export process, or can be copied (fully and partially) onto other images, thereby allowing easy batch image processing.
RawTherapee is a powerful, cross-platform raw photo processing program. It is written mostly in C++ using a GTK+ front-end. It uses a patched version of dcraw for reading raw files, with an in-house solution which adds the highest quality support for certain camera models unsupported by dcraw and enhances the accuracy of certain raw files already supported by dcraw. It is notable for the advanced control it gives the user over the demosaicing and development process.
</p>
<p>
All aspects of RawTherapee are documented in the RawPedia wiki. There is also an active forum and IRC channel for interaction with the developers and other users.
RawTherapee is designed for developing raw files from a broad range of digital cameras, as well as HDR DNG files and non-raw image formats (JPEG, TIFF and PNG). The target audience ranges from enthusiast newcomers who wish to broaden their understanding of how digital imaging works to semi-professional photographers. Knowledge in color science is not compulsory, but it is recommended that you are eager to learn and ready to read our documentation (RawPedia) as well as look up basic concepts which lie outside the scope of RawPedia, such as color balance, elsewhere.
</p>
<p>
Of course, professionals may use RawTherapee too while enjoying complete freedom, but will probably lack some peripheral features such as Digital Asset Management, printing, uploading, etc. RawTherapee is not aimed at being an inclusive all-in-one program, and the open-source community is sufficiently developed by now to offer all those peripheral features in other specialized software.
</p>
</description>
<screenshots>
<screenshot type="default">
<image>http://rawpedia.rawtherapee.com/images/9/99/Rt-5-misty1.jpg</image>
</screenshot>
<screenshot>
<image>http://rawpedia.rawtherapee.com/images/2/2f/Rt-5-cc24-lcp.jpg</image>
</screenshot>
<screenshot>
<image>http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg</image>
</screenshot>
<screenshot>
<image>http://rawtherapee.com/images/screenshots/rt-42_03-macro-detail-toning.jpg</image>
</screenshot>
<screenshot>
<image>http://rawtherapee.com/images/screenshots/rt-42_05-cow-bw-toning.jpg</image>
</screenshot>
<screenshot>
<image>http://rawtherapee.com/images/screenshots/rt-42_08-fb-metadata.jpg</image>
</screenshot>
<screenshot>
<image>http://rawtherapee.com/images/screenshots/rt-42_09-queue.jpg</image>
</screenshot>
</screenshots>
<keywords>
<keyword>raw</keyword>
<keyword>photo</keyword>
<keyword>photography</keyword>
<keyword>develop</keyword>
<keyword>pp3</keyword>
<keyword>graphics</keyword>
</keywords>
<metadata_license>CC-BY-SA-4.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>
<url type="donation">https://www.paypal.me/rawtherapee</url>
<url type="help">http://rawpedia.rawtherapee.com/</url>
<url type="homepage">http://rawtherapee.com/</url>
<url type="translate">https://discuss.pixls.us/t/localization-how-to-translate-rawtherapee-and-rawpedia/2594</url>
<screenshots>
<screenshot type="default">
<caption>HDR DNG of a misty morning in the countryside</caption>
<image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_1.jpg</image>
</screenshot>
<screenshot>
<caption>Straight-out-of-camera vs RawTherapee</caption>
<image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_2.jpg</image>
</screenshot>
<screenshot>
<caption>RawTherapee using the Auto-Matched Tone Curve tool</caption>
<image width="1920" height="1080">http://rawtherapee.com/images/screenshots/rt540_3.jpg</image>
</screenshot>
</screenshots>
<update_contact>contactus@rawtherapee.com</update_contact>
</component>

View File

@@ -773,12 +773,15 @@ HISTORY_MSG_490;(HDR-Dynamikkompression)\nIntensität
HISTORY_MSG_491;(Weißabgleich)
HISTORY_MSG_492;(RGB-Kurven)
HISTORY_MSG_493;(L*a*b*)
HISTORY_MSG_COLORTONING_LABGRID_VALUE;(Farbanpassungen)\nL*a*b* - Farbkorrektur
HISTORY_MSG_HISTMATCHING;(Belichtung)\nAuto-Tonwertkurve
HISTORY_MSG_LOCALCONTRAST_AMOUNT;(Lokaler Kontrast)\nIntensität
HISTORY_MSG_LOCALCONTRAST_DARKNESS;(Lokaler Kontrast)\nDunkle Bereiche
HISTORY_MSG_LOCALCONTRAST_ENABLED;(Lokaler Kontrast)
HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;(Lokaler Kontrast)\nHelle Bereiche
HISTORY_MSG_LOCALCONTRAST_RADIUS;(Lokaler Kontrast)\nRadius
HISTORY_MSG_METADATA_MODE;(Metadaten)\nKopiermodus
HISTORY_MSG_TM_FATTAL_ANCHOR;(HDR-Dynamikkompression)\nHelligkeitsverschiebung
HISTORY_NEWSNAPSHOT;Hinzufügen
HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: <b>Alt</b> + <b>s</b>
HISTORY_SNAPSHOT;Schnappschuss
@@ -864,6 +867,8 @@ MAIN_MSG_QOVERWRITE;Möchten Sie die Datei überschreiben?
MAIN_MSG_SETPATHFIRST;Um diese Funktion zu nutzen, müssen Sie zuerst in den Einstellungen einen Zielpfad setzen.
MAIN_MSG_TOOMANYOPENEDITORS;Zu viele geöffnete Editorfenster.\nUm fortzufahren, schließen sie bitte ein Editorfenster.
MAIN_MSG_WRITEFAILED;Fehler beim Schreiben von\n\n<b>"%1"</b>\n\nStellen Sie sicher, dass das Verzeichnis existiert und dass Sie Schreibrechte besitzen.
MAIN_TAB_ADVANCED;Erweitert
MAIN_TAB_ADVANCED_TOOLTIP;Taste: <b>Alt</b> + <b>w</b>
MAIN_TAB_COLOR;Farbe
MAIN_TAB_COLOR_TOOLTIP;Taste: <b>Alt</b> + <b>c</b>
MAIN_TAB_DETAIL;Details
@@ -918,6 +923,7 @@ NAVIGATOR_XY_FULL;Breite = %1, Höhe = %2
NAVIGATOR_XY_NA;x: --, y: --
OPTIONS_DEFIMG_MISSING;Die Standard-Profile für <b>Nicht-RAW-Bilder</b> wurden nicht gefunden oder nicht festgelegt.\n\nBitte prüfen Sie das Profil-Verzeichnis, es fehlt möglicherweise oder ist beschädigt.\n\nEs werden stattdessen interne Standardwerte verwendet.
OPTIONS_DEFRAW_MISSING;Die Standard-Profile für <b>RAW-Bilder</b> wurden nicht gefunden oder nicht festgelegt.\n\nBitte prüfen Sie das Profil-Verzeichnis, es fehlt möglicherweise oder ist beschädigt.\n\nEs werden stattdessen interne Standardwerte verwendet.
PARTIALPASTE_ADVANCEDGROUP;Erweiterte Einstellungen
PARTIALPASTE_BASICGROUP;Basisparameter
PARTIALPASTE_CACORRECTION;Farbsaum entfernen
PARTIALPASTE_CHANNELMIXER;RGB-Kanalmixer
@@ -957,6 +963,7 @@ PARTIALPASTE_LABCURVE;L*a*b* - Einstellungen
PARTIALPASTE_LENSGROUP;Objektivkorrekturen
PARTIALPASTE_LENSPROFILE;Objektivkorrekturprofil
PARTIALPASTE_LOCALCONTRAST;Lokaler Kontrast
PARTIALPASTE_METADATA;Kopiermodus
PARTIALPASTE_METAGROUP;Metadaten
PARTIALPASTE_PCVIGNETTE;Vignettierungsfilter
PARTIALPASTE_PERSPECTIVE;Perspektive
@@ -1276,6 +1283,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Beste Kompression: 4:2:0\nAusgeglichen: 4:2:2\nBeste Qua
SAVEDLG_TIFFUNCOMPRESSED;Unkomprimiertes TIFF
SAVEDLG_WARNFILENAME;Die Datei wird gespeichert als
SHCSELECTOR_TOOLTIP;Um die 3 Regler zurückzusetzen, rechte Maustaste klicken.
SOFTPROOF_GAMUTCHECK_TOOLTIP;Markiert Pixel deren Farbe außerhalb des Farbumfangs liegen in Abhängigkeit des:\n- Druckerprofils, wenn eines eingestellt und Soft-Proofing aktiviert ist.\n- Ausgabeprofils, wenn ein Druckerprofil nicht eingestellt und Soft-Proofing aktiviert ist.\n- Monitorprofils, wenn Soft-Proofing deaktiviert ist.
SOFTPROOF_TOOLTIP;Soft-Proofing simuliert das Aussehen des Bildes:\n- für den Druck, wenn ein Druckerprofil unter Einstellungen > Farbmanagement eingestellt ist.\n- wenn es auf einem Bildschirm dargestellt wird, der das aktuelle Ausgabeprofil verwendet und kein Druckerprofil eingestellt ist.
THRESHOLDSELECTOR_B;Unten
THRESHOLDSELECTOR_BL;Unten-Links
THRESHOLDSELECTOR_BR;Unten-Rechts
@@ -1454,6 +1463,8 @@ TP_COLORTONING_HIGHLIGHT;Lichter
TP_COLORTONING_HUE;Farbton
TP_COLORTONING_LAB;L*a*b*-Überlagerung
TP_COLORTONING_LABEL;Farbanpassungen
TP_COLORTONING_LABGRID;L*a*b* - Farbkorrektur
TP_COLORTONING_LABGRID_VALUES;HL: a=%1, b=%2\nS: a=%3, b=%4
TP_COLORTONING_LUMA;Luminanz
TP_COLORTONING_LUMAMODE;Luminanz schützen
TP_COLORTONING_LUMAMODE_TOOLTIP;Wenn aktiviert, wird die Luminanz der Farben Rot, Grün, Cyan, Blau... geschützt.
@@ -1599,6 +1610,8 @@ TP_EXPOSURE_CURVEEDITOR1;Tonwertkurve 1
TP_EXPOSURE_CURVEEDITOR2;Tonwertkurve 2
TP_EXPOSURE_CURVEEDITOR2_TOOLTIP;Um mit den doppelten Tonwert-Kurven die besten Ergenisse zu erzielen, lesen Sie bitte den Abschnitt im Handbuch unter:\nDer Werkzeugkasten > Reiter Belichtung > Belichtungsbereich > Tonwertkurve.
TP_EXPOSURE_EXPCOMP;Belichtungskorrektur
TP_EXPOSURE_HISTMATCHING;Auto-Tonwertkurve
TP_EXPOSURE_HISTMATCHING_TOOLTIP;Passt Regler und Kurven (mit Ausnahme der Belichtungskorrektur)\nautomatisch an, um das eingebettete JPEG-Bild zu simulieren.
TP_EXPOSURE_LABEL;Belichtung
TP_EXPOSURE_SATURATION;Sättigung
TP_EXPOSURE_TCMODE_FILMLIKE;Filmähnlich
@@ -2000,6 +2013,7 @@ TP_SHARPENMICRO_LABEL;Mikrokontrast
TP_SHARPENMICRO_MATRIX;3×3-Matrix statt 5×5-Matrix
TP_SHARPENMICRO_UNIFORMITY;Gleichmäßigkeit
TP_TM_FATTAL_AMOUNT;Intensität
TP_TM_FATTAL_ANCHOR;Helligkeitsverschiebung
TP_TM_FATTAL_LABEL;HDR-Dynamikkompression
TP_TM_FATTAL_THRESHOLD;Schwelle
TP_VIBRANCE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
@@ -2245,21 +2259,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: <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.
!!!!!!!!!!!!!!!!!!!!!!!!!
HISTORY_MSG_COLORTONING_LABGRID_VALUE;(Farbanpassungen)\nL*a*b* - Farbkorrektur
HISTORY_MSG_HISTMATCHING;(Belichtung)\nAuto-Tonwertkurve
HISTORY_MSG_TM_FATTAL_ANCHOR;(HDR-Dynamikkompression)\nHelligkeitsverschiebung
MAIN_TAB_ADVANCED;Erweitert
MAIN_TAB_ADVANCED_TOOLTIP;Taste: <b>Alt</b> + <b>w</b>
PARTIALPASTE_ADVANCEDGROUP;Erweiterte Einstellungen
PARTIALPASTE_METADATA;Kopiermodus
SOFTPROOF_GAMUTCHECK_TOOLTIP;Markiert Pixel deren Farbe außerhalb des Farbumfangs liegen in Abhängigkeit des:\n- Druckerprofils, wenn eines eingestellt und Soft-Proofing aktiviert ist.\n- Ausgabeprofils, wenn ein Druckerprofil nicht eingestellt und Soft-Proofing aktiviert ist.\n- Monitorprofils, wenn Soft-Proofing deaktiviert ist.
SOFTPROOF_TOOLTIP;Soft-Proofing simuliert das Aussehen des Bildes:\n- für den Druck, wenn ein Druckerprofil unter Einstellungen > Farbmanagement eingestellt ist.\n- wenn es auf einem Bildschirm dargestellt wird, der das aktuelle Ausgabeprofil verwendet und kein Druckerprofil eingestellt ist.
TP_COLORTONING_LABGRID;L*a*b* - Farbkorrektur
TP_COLORTONING_LABGRID_VALUES;HL: a=%1, b=%2\nS: a=%3, b=%4
TP_EXPOSURE_HISTMATCHING;Auto-Tonwertkurve
TP_EXPOSURE_HISTMATCHING_TOOLTIP;Passt Regler und Kurven (mit Ausnahme der Belichtungskorrektur)\nautomatisch an, um das eingebettete JPEG-Bild zu simulieren.
TP_TM_FATTAL_ANCHOR;Helligkeitsverschiebung

View File

@@ -1377,8 +1377,7 @@ static INLINE vfloat SQRV(vfloat a){
static inline void vswap( vmask condition, vfloat &a, vfloat &b) {
// conditional swap the elements of two vfloats
vfloat temp = vself(condition, a, b); // the values which fit to condition
condition = vnotm(condition); // invert the condition
a = vself(condition, a, b); // the values which fit to inverted condition
a = vself(condition, b, a); // the values which fit to inverted condition
b = temp;
}

View File

@@ -43,7 +43,11 @@ struct LocaleToLang : private std::map<std::pair<Glib::ustring, Glib::ustring>,
emplace (key ("cs", "CZ"), "Czech");
emplace (key ("da", "DK"), "Dansk");
emplace (key ("de", "DE"), "Deutsch");
#ifdef __APPLE__
emplace (key ("en", "UK"), "English (UK)");
#else
emplace (key ("en", "GB"), "English (UK)");
#endif
emplace (key ("en", "US"), "English (US)");
emplace (key ("es", "ES"), "Espanol");
emplace (key ("eu", "ES"), "Euskara");