Project

General

Profile

Patch #972 » 0002-Remove-duplicate-entries-no-idea-why-they-would-be-n.patch

Bernd Steinhauser, 20 Jul 2014 10:20

View differences:

src/panasonicmn.cpp
81 81
        { 10, N_("Black and white") },
82 82
        { 11, N_("Manual")          },
83 83
        { 12, N_("Shade")           },
84
        { 13, N_("Kelvin")          },
85
        { 13, N_("Kelvin")          }           // To silence compiler warning
84
        { 13, N_("Kelvin")          }
86 85
    };
87 86

  
88 87
    //! FocusMode, tag 0x0007
......
93 92
        {  5, N_("Auto, continuous")   },
94 93
        {  6, N_("AF-S")               },
95 94
        {  7, N_("AF-C")               },
96
        {  8, N_("AF-F")               },
97
        {  8, N_("AF-F")               }        // To silence compiler warning
95
        {  8, N_("AF-F")               }
98 96
    };
99 97

  
100 98
    //! ImageStabilizer, tag 0x001a
101 99
    extern const TagDetails panasonicImageStabilizer[] = {
102
        {  2, N_("On, Mode 1") },
103
        {  3, N_("Off")        },
104
        {  4, N_("On, Mode 2") },
105
        {  5, N_("Panning") },
106
        {  6, N_("On, Mode 3") }
100
        {  2, N_("On, Mode 1")  },
101
        {  3, N_("Off")         },
102
        {  4, N_("On, Mode 2")  },
103
        {  5, N_("Panning")     },
104
        {  6, N_("On, Mode 3")  }
107 105
    };
108 106

  
109 107
    //! Macro, tag 0x001c
......
272 270
        { 138, N_("Fantasy")                                        },
273 271
        { 256, N_("Normal 2")                                       },
274 272
        { 272, N_("Standard")                                       },
275
        { 288, N_("High")                                           },
276
        { 288, N_("High")                                           }              // To silence compiler warning
273
        { 288, N_("High")                                           }
277 274
    };
278 275

  
279 276
    //! NoiseReduction, tag 0x002d
......
319 316
    //! OpticalZoomMode, tag 0x0034
320 317
    extern const TagDetails panasonicOpticalZoomMode[] = {
321 318
        { 1, N_("Standard")  },
322
        { 2, N_("Extended") }
319
        { 2, N_("Extended")  }
323 320
    };
324 321

  
325 322
    //! ConversionLens, tag 0x0035
......
327 324
        { 1, N_("Off")       },
328 325
        { 2, N_("Wide")      },
329 326
        { 3, N_("Telephoto") },
330
        { 4, N_("Macro")     },
331
        { 4, N_("Macro")     }                  // To silence compiler warning
327
        { 4, N_("Macro")     }
332 328
    };
333 329

  
334 330
    //! WorldTimeLocation, tag 0x003a
335
- 
(2-2/2)