diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c index 68c4ca3e0..9e1697fa5 100644 --- a/camlibs/ptp2/ptp.c +++ b/camlibs/ptp2/ptp.c @@ -1808,9 +1808,9 @@ _value_to_num(PTPPropertyValue *data, uint16_t dt) { return 0; } -#define PTP_VAL_BOOL(dpc) {dpc, 0, "Off"}, {dpc, 1, "On"} -#define PTP_VAL_RBOOL(dpc) {dpc, 0, "On"}, {dpc, 1, "Off"} -#define PTP_VAL_YN(dpc) {dpc, 0, "No"}, {dpc, 1, "Yes"} +#define PTP_VAL_BOOL(dpc) {dpc, 0, N_("Off")}, {dpc, 1, N_("On")} +#define PTP_VAL_RBOOL(dpc) {dpc, 0, N_("On")}, {dpc, 1, N_("Off")} +#define PTP_VAL_YN(dpc) {dpc, 0, N_("No")}, {dpc, 1, N_("Yes")} int ptp_render_property_value(PTPParams* params, uint16_t dpc, @@ -1854,74 +1854,74 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc, int64_t key; char *value; } ptp_value_list_Nikon[] = { - {PTP_DPC_CompressionSetting, 0, "JPEG Basic"}, - {PTP_DPC_CompressionSetting, 1, "JPEG Norm"}, - {PTP_DPC_CompressionSetting, 2, "JPEG Fine"}, - {PTP_DPC_CompressionSetting, 4, "RAW"}, - {PTP_DPC_CompressionSetting, 5, "RAW + JPEG Basic"}, - {PTP_DPC_WhiteBalance, 2, "Auto"}, - {PTP_DPC_WhiteBalance, 6, "Incadesent"}, - {PTP_DPC_WhiteBalance, 5, "Fluorescent"}, - {PTP_DPC_WhiteBalance, 4, "Daylight"}, - {PTP_DPC_WhiteBalance, 7, "Flash"}, - {PTP_DPC_WhiteBalance, 32784, "Cloudy"}, - {PTP_DPC_WhiteBalance, 32785, "Shade"}, - {PTP_DPC_WhiteBalance, 32787, "Preset"}, - {PTP_DPC_FlashMode, 32784, "Default"}, - {PTP_DPC_FlashMode, 4, "Red-eye Reduction"}, - {PTP_DPC_FlashMode, 32787, "Red-eye Reduction + Slow Sync"}, - {PTP_DPC_FlashMode, 32785, "Slow Sync"}, - {PTP_DPC_FlashMode, 32785, "Rear Curtain Sync + Slow Sync"}, - {PTP_DPC_FocusMeteringMode, 2, "Dynamic Area"}, - {PTP_DPC_FocusMeteringMode, 32784, "Single Area"}, - {PTP_DPC_FocusMeteringMode, 32785, "Closest Subject"}, - {PTP_DPC_FocusMode, 1, "Manual Focus"}, + {PTP_DPC_CompressionSetting, 0, N_("JPEG Basic")}, + {PTP_DPC_CompressionSetting, 1, N_("JPEG Norm")}, + {PTP_DPC_CompressionSetting, 2, N_("JPEG Fine")}, + {PTP_DPC_CompressionSetting, 4, N_("RAW")}, + {PTP_DPC_CompressionSetting, 5, N_("RAW + JPEG Basic")}, + {PTP_DPC_WhiteBalance, 2, N_("Auto")}, + {PTP_DPC_WhiteBalance, 6, N_("Incadesent")}, + {PTP_DPC_WhiteBalance, 5, N_("Fluorescent")}, + {PTP_DPC_WhiteBalance, 4, N_("Daylight")}, + {PTP_DPC_WhiteBalance, 7, N_("Flash")}, + {PTP_DPC_WhiteBalance, 32784, N_("Cloudy")}, + {PTP_DPC_WhiteBalance, 32785, N_("Shade")}, + {PTP_DPC_WhiteBalance, 32787, N_("Preset")}, + {PTP_DPC_FlashMode, 32784, N_("Default")}, + {PTP_DPC_FlashMode, 4, N_("Red-eye Reduction")}, + {PTP_DPC_FlashMode, 32787, N_("Red-eye Reduction + Slow Sync")}, + {PTP_DPC_FlashMode, 32785, N_("Slow Sync")}, + {PTP_DPC_FlashMode, 32785, N_("Rear Curtain Sync + Slow Sync")}, + {PTP_DPC_FocusMeteringMode, 2, N_("Dynamic Area")}, + {PTP_DPC_FocusMeteringMode, 32784, N_("Single Area")}, + {PTP_DPC_FocusMeteringMode, 32785, N_("Closest Subject")}, + {PTP_DPC_FocusMode, 1, N_("Manual Focus")}, {PTP_DPC_FocusMode, 32784, "AF-S"}, {PTP_DPC_FocusMode, 32785, "AF-C"}, PTP_VAL_BOOL(PTP_DPC_NIKON_B1ISOAuto), PTP_VAL_BOOL(PTP_DPC_NIKON_B5ExposureComp), PTP_VAL_BOOL(PTP_DPC_NIKON_C1AELock), - {PTP_DPC_ExposureMeteringMode, 2, "Center Weighted"}, - {PTP_DPC_ExposureMeteringMode, 3, "Matrix"}, - {PTP_DPC_ExposureMeteringMode, 4, "Spot"}, + {PTP_DPC_ExposureMeteringMode, 2, N_("Center Weighted")}, + {PTP_DPC_ExposureMeteringMode, 3, N_("Matrix")}, + {PTP_DPC_ExposureMeteringMode, 4, N_("Spot")}, {PTP_DPC_ExposureProgramMode, 1, "M"}, {PTP_DPC_ExposureProgramMode, 3, "A"}, {PTP_DPC_ExposureProgramMode, 4, "S"}, {PTP_DPC_ExposureProgramMode, 2, "P"}, - {PTP_DPC_ExposureProgramMode, 32784, "Auto"}, - {PTP_DPC_ExposureProgramMode, 32785, "Portrait"}, - {PTP_DPC_ExposureProgramMode, 32786, "Landscape"}, - {PTP_DPC_ExposureProgramMode, 32787, "Macro"}, - {PTP_DPC_ExposureProgramMode, 32788, "Sports"}, - {PTP_DPC_ExposureProgramMode, 32790, "Night Landscape"}, - {PTP_DPC_ExposureProgramMode, 32789, "Night Porttrait"}, - {PTP_DPC_StillCaptureMode, 1, "Single Shot"}, - {PTP_DPC_StillCaptureMode, 2, "Power Wind"}, - {PTP_DPC_StillCaptureMode, 32785, "Timer"}, - {PTP_DPC_StillCaptureMode, 32787, "Remote"}, - {PTP_DPC_StillCaptureMode, 32788, "Timer + Remote"}, + {PTP_DPC_ExposureProgramMode, 32784, N_("Auto")}, + {PTP_DPC_ExposureProgramMode, 32785, N_("Portrait")}, + {PTP_DPC_ExposureProgramMode, 32786, N_("Landscape")}, + {PTP_DPC_ExposureProgramMode, 32787, N_("Macro")}, + {PTP_DPC_ExposureProgramMode, 32788, N_("Sports")}, + {PTP_DPC_ExposureProgramMode, 32790, N_("Night Landscape")}, + {PTP_DPC_ExposureProgramMode, 32789, N_("Night Portrait")}, + {PTP_DPC_StillCaptureMode, 1, N_("Single Shot")}, + {PTP_DPC_StillCaptureMode, 2, N_("Power Wind")}, + {PTP_DPC_StillCaptureMode, 32785, N_("Timer")}, + {PTP_DPC_StillCaptureMode, 32787, N_("Remote")}, + {PTP_DPC_StillCaptureMode, 32788, N_("Timer + Remote")}, PTP_VAL_BOOL(PTP_DPC_NIKON_AFC), PTP_VAL_RBOOL(PTP_DPC_NIKON_AFLampOff), PTP_VAL_RBOOL(PTP_DPC_NIKON_ReviewOff), PTP_VAL_BOOL(PTP_DPC_NIKON_GridDisplay), - {PTP_DPC_NIKON_AFAreaIllumination, 0, "Auto"}, - {PTP_DPC_NIKON_AFAreaIllumination, 1, "Off"}, - {PTP_DPC_NIKON_AFAreaIllumination, 2, "On"}, + {PTP_DPC_NIKON_AFAreaIllumination, 0, N_("Auto")}, + {PTP_DPC_NIKON_AFAreaIllumination, 1, N_("Off")}, + {PTP_DPC_NIKON_AFAreaIllumination, 2, N_("On")}, {PTP_DPC_NIKON_ColourMode, 0, "sRGB"}, {PTP_DPC_NIKON_ColourMode, 1, ""}, {PTP_DPC_NIKON_FlashMode, 0, "iTTL"}, - {PTP_DPC_NIKON_FlashMode, 1, "Manual"}, - {PTP_DPC_NIKON_FlashMode, 2, "Commander"}, - {PTP_DPC_NIKON_FlashPower, 0, "Full"}, + {PTP_DPC_NIKON_FlashMode, 1, N_("Manual")}, + {PTP_DPC_NIKON_FlashMode, 2, N_("Commander")}, + {PTP_DPC_NIKON_FlashPower, 0, N_("Full")}, {PTP_DPC_NIKON_FlashPower, 1, "1/2"}, {PTP_DPC_NIKON_FlashPower, 2, "1/4"}, {PTP_DPC_NIKON_FlashPower, 3, "1/8"}, {PTP_DPC_NIKON_FlashPower, 4, "1/16"}, PTP_VAL_RBOOL(PTP_DPC_NIKON_FlashSignOff), - {PTP_DPC_NIKON_RemoteTimeout, 0, "1 min"}, - {PTP_DPC_NIKON_RemoteTimeout, 1, "5 mins"}, - {PTP_DPC_NIKON_RemoteTimeout, 2, "10 mins"}, - {PTP_DPC_NIKON_RemoteTimeout, 3, "15 mins"}, + {PTP_DPC_NIKON_RemoteTimeout, 0, N_("1 min")}, + {PTP_DPC_NIKON_RemoteTimeout, 1, N_("5 mins")}, + {PTP_DPC_NIKON_RemoteTimeout, 2, N_("10 mins")}, + {PTP_DPC_NIKON_RemoteTimeout, 3, N_("15 mins")}, PTP_VAL_YN(PTP_DPC_NIKON_FlashOpen), PTP_VAL_YN(PTP_DPC_NIKON_FlashCharged), PTP_VAL_BOOL(PTP_DPC_NIKON_D4LongExposureNoiseReduction), @@ -1930,12 +1930,12 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc, PTP_VAL_RBOOL(PTP_DPC_NIKON_F7NoCFCard), PTP_VAL_BOOL(PTP_DPC_NIKON_AutoImageRotation), PTP_VAL_BOOL(PTP_DPC_NIKON_ExposureBracketingOnOff), - {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 0, "Centre"}, - {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 1, "Top"}, - {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 2, "Bottom"}, - {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 3, "Left"}, - {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 4, "Right"}, - {PTP_DPC_NIKON_LensID, 0, "Unknown"}, + {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 0, N_("Centre")}, + {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 1, N_("Top")}, + {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 2, N_("Bottom")}, + {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 3, N_("Left")}, + {PTP_DPC_NIKON_AutofocusLCDTopMode3AndMode4, 4, N_("Right")}, + {PTP_DPC_NIKON_LensID, 0, N_("Unknown")}, {PTP_DPC_NIKON_LensID, 38, "Sigma 70-300mm 1:4-5.6 D APO Macro"}, {PTP_DPC_NIKON_LensID, 83, "AF Nikkor 80-200mm 1:2.8 D ED"}, {PTP_DPC_NIKON_LensID, 118, "AF Nikkor 50mm 1:1.8 D"}, @@ -1953,7 +1953,7 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc, double value = _value_to_num(&(dpd->CurrentValue), dpd->DataType); return snprintf(out, length, - ptp_value_trans[i].format, + _(ptp_value_trans[i].format), value * ptp_value_trans[i].coef + ptp_value_trans[i].bias); } @@ -1963,7 +1963,7 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc, double value = _value_to_num(&(dpd->CurrentValue), dpd->DataType); return snprintf(out, length, - ptp_value_trans_Nikon[i].format, + _(ptp_value_trans_Nikon[i].format), value * ptp_value_trans_Nikon[i].coef + ptp_value_trans_Nikon[i].bias); } @@ -1974,7 +1974,7 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc, if (ptp_value_list_Nikon[i].dpc==dpc && ptp_value_list_Nikon[i].key==kval) return snprintf(out, length, "%s", - ptp_value_list_Nikon[i].value); + _(ptp_value_list_Nikon[i].value)); } return 0;