msgstr ""
"Project-Id-Version: libexif\n"
"Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-12-15 22:14-0800\n"
+"POT-Creation-Date: 2012-06-25 01:39-0700\n"
"PO-Revision-Date: 2012-01-20 22:32+0000\n"
"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
msgstr "Invalid number of components (%i, expected %i or %i)."
#: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
-#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:796
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:797
#: libexif/olympus/mnote-olympus-entry.c:196
#: libexif/olympus/mnote-olympus-tag.c:108
#: libexif/pentax/mnote-pentax-entry.c:174
#: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
#: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
-#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:674
-#: libexif/exif-entry.c:677 libexif/exif-entry.c:678 libexif/exif-entry.c:679
-#: libexif/exif-entry.c:745 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:675
+#: libexif/exif-entry.c:678 libexif/exif-entry.c:679 libexif/exif-entry.c:680
+#: libexif/exif-entry.c:746 libexif/fuji/mnote-fuji-entry.c:64
#: libexif/olympus/mnote-olympus-entry.c:118
#: libexif/olympus/mnote-olympus-entry.c:195
#: libexif/olympus/mnote-olympus-entry.c:203
#: libexif/olympus/mnote-olympus-entry.c:213
-#: libexif/olympus/mnote-olympus-entry.c:586
+#: libexif/olympus/mnote-olympus-entry.c:589
#: libexif/pentax/mnote-pentax-entry.c:105
#: libexif/pentax/mnote-pentax-entry.c:110
#: libexif/pentax/mnote-pentax-entry.c:115
msgid "Superfine"
msgstr "Superfine"
-#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:301
-#: libexif/canon/mnote-canon-entry.c:304 libexif/canon/mnote-canon-entry.c:312
-#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:357
-#: libexif/canon/mnote-canon-entry.c:370 libexif/canon/mnote-canon-entry.c:372
-#: libexif/canon/mnote-canon-entry.c:574 libexif/canon/mnote-canon-entry.c:671
+#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
+#: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
+#: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
+#: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
+#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
#: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
#: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
#: libexif/fuji/mnote-fuji-entry.c:142
#: libexif/olympus/mnote-olympus-entry.c:178
#: libexif/olympus/mnote-olympus-entry.c:186
#: libexif/olympus/mnote-olympus-entry.c:251
-#: libexif/olympus/mnote-olympus-entry.c:530
-#: libexif/olympus/mnote-olympus-entry.c:547
+#: libexif/olympus/mnote-olympus-entry.c:533
+#: libexif/olympus/mnote-olympus-entry.c:550
#: libexif/pentax/mnote-pentax-entry.c:195
#: libexif/pentax/mnote-pentax-entry.c:260
msgid "Off"
msgstr "Off"
#: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
-#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:328
-#: libexif/canon/mnote-canon-entry.c:400 libexif/fuji/mnote-fuji-entry.c:73
+#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
+#: libexif/canon/mnote-canon-entry.c:403 libexif/fuji/mnote-fuji-entry.c:73
#: libexif/fuji/mnote-fuji-entry.c:101 libexif/fuji/mnote-fuji-entry.c:111
#: libexif/fuji/mnote-fuji-entry.c:119
#: libexif/olympus/mnote-olympus-entry.c:131
msgid "Auto"
msgstr "Auto"
-#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:302
-#: libexif/canon/mnote-canon-entry.c:347 libexif/canon/mnote-canon-entry.c:361
-#: libexif/canon/mnote-canon-entry.c:371 libexif/fuji/mnote-fuji-entry.c:102
+#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
+#: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
+#: libexif/canon/mnote-canon-entry.c:374 libexif/fuji/mnote-fuji-entry.c:102
#: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
#: libexif/fuji/mnote-fuji-entry.c:143
#: libexif/olympus/mnote-olympus-entry.c:179
-#: libexif/olympus/mnote-olympus-entry.c:533
-#: libexif/olympus/mnote-olympus-entry.c:550
+#: libexif/olympus/mnote-olympus-entry.c:536
+#: libexif/olympus/mnote-olympus-entry.c:553
#: libexif/pentax/mnote-pentax-entry.c:198
#: libexif/pentax/mnote-pentax-entry.c:261
msgid "On"
msgstr "External flash"
#: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
-#: libexif/canon/mnote-canon-entry.c:294
+#: libexif/canon/mnote-canon-entry.c:297
msgid "Single"
msgstr "Single"
#: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
-#: libexif/canon/mnote-canon-entry.c:295
+#: libexif/canon/mnote-canon-entry.c:298
msgid "Continuous"
msgstr "Continuous"
msgstr "Full auto"
#: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
-#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:285
-#: libexif/canon/mnote-canon-entry.c:392 libexif/exif-entry.c:744
+#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:745
#: libexif/fuji/mnote-fuji-entry.c:112
#: libexif/olympus/mnote-olympus-entry.c:90
#: libexif/olympus/mnote-olympus-entry.c:200
msgid "Manual"
msgstr "Manual"
-#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:430
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:755
+#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:756
#: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
#: libexif/pentax/mnote-pentax-entry.c:301
msgid "Landscape"
msgid "Grayscale"
msgstr "Greyscale"
-#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:308
+#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
#: libexif/pentax/mnote-pentax-entry.c:128
msgid "Sepia"
msgstr "Sepia"
-#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:429
-#: libexif/exif-entry.c:671 libexif/exif-entry.c:753
+#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
+#: libexif/exif-entry.c:672 libexif/exif-entry.c:754
#: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
#: libexif/pentax/mnote-pentax-entry.c:291
#: libexif/pentax/mnote-pentax-entry.c:294
msgid "Sports"
msgstr "Sports"
-#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:309
-#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
+#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
+#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
#: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
msgid "Black & white"
msgstr "Black & white"
-#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:305
+#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
msgid "Vivid"
msgstr "Vivid"
-#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:306
-#: libexif/canon/mnote-canon-entry.c:431
+#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
+#: libexif/canon/mnote-canon-entry.c:434
msgid "Neutral"
msgstr "Neutral"
msgid "Beach"
msgstr "Beach"
-#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:344
-#: libexif/canon/mnote-canon-entry.c:416 libexif/fuji/mnote-fuji-entry.c:136
+#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
+#: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
#: libexif/pentax/mnote-pentax-entry.c:187
#: libexif/pentax/mnote-pentax-entry.c:292
#: libexif/pentax/mnote-pentax-entry.c:298
msgid "ISO 3200"
msgstr "ISO 3200"
-#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:348
-#: libexif/canon/mnote-canon-entry.c:365 libexif/canon/mnote-canon-entry.c:417
+#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
+#: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
#: libexif/olympus/mnote-olympus-entry.c:189
#: libexif/olympus/mnote-olympus-entry.c:226
-#: libexif/olympus/mnote-olympus-entry.c:451
+#: libexif/olympus/mnote-olympus-entry.c:454
#: libexif/pentax/mnote-pentax-entry.c:242
msgid "None"
msgstr "None"
msgid "4x"
msgstr "4x"
-#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:702
-#: libexif/exif-entry.c:732
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:703
+#: libexif/exif-entry.c:733
msgid "Other"
msgstr "Other"
#: libexif/canon/mnote-canon-entry.c:158 libexif/canon/mnote-canon-entry.c:161
-#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:398
+#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:401
#: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
#: libexif/pentax/mnote-pentax-entry.c:117
msgid "High"
msgstr "High"
#: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
-#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:396
+#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
#: libexif/pentax/mnote-pentax-entry.c:111
#: libexif/pentax/mnote-pentax-entry.c:116
msgid "Low"
msgid "Default"
msgstr "Default"
-#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:698
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:699
msgid "Spot"
msgstr "Spot"
-#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:696
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:697
msgid "Average"
msgstr "Average"
msgid "Evaluative"
msgstr "Evaluative"
-#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:701
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:702
msgid "Partial"
msgstr "Partial"
-#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:697
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:698
msgid "Center-weighted average"
msgstr "Centre-weighted average"
msgid "Very close"
msgstr "Very close"
-#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:797
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:798
msgid "Close"
msgstr "Close"
msgid "Manual AF point selection"
msgstr "Manual AF point selection"
-#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:349
+#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
msgid "None (MF)"
msgstr "None (MF)"
msgid "Auto-selected"
msgstr "Auto-selected"
-#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:350
+#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
#: libexif/pentax/mnote-pentax-entry.c:224
#: libexif/pentax/mnote-pentax-entry.c:238
msgid "Right"
msgstr "Right"
-#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:351
+#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
#: libexif/pentax/mnote-pentax-entry.c:222
#: libexif/pentax/mnote-pentax-entry.c:237
msgid "Center"
msgstr "Centre"
-#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:353
+#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
#: libexif/pentax/mnote-pentax-entry.c:220
#: libexif/pentax/mnote-pentax-entry.c:236
msgid "Left"
msgstr "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
#: libexif/canon/mnote-canon-entry.c:219
-msgid "Canon EF 75-300mm f/4-5.6"
+#, fuzzy
+msgid "Canon EF 35-80mm f/4-5.6"
msgstr "Canon EF 75-300mm f/4-5.6"
#: libexif/canon/mnote-canon-entry.c:220
+msgid "Canon EF 75-300mm f/4-5.6"
+msgstr "Canon EF 75-300mm f/4-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:221
msgid "Canon EF 28-80mm f/3.5-5.6"
msgstr "Canon EF 28-80mm f/3.5-5.6"
-#: libexif/canon/mnote-canon-entry.c:221
+#: libexif/canon/mnote-canon-entry.c:222
msgid "Canon EF 28-105mm f/4-5.6"
msgstr "Canon EF 28-105mm f/4-5.6"
-#: libexif/canon/mnote-canon-entry.c:222
+#: libexif/canon/mnote-canon-entry.c:223
msgid "Canon EF-S 18-55mm f/3.5-5.6"
msgstr "Canon EF-S 18-55mm f/3.5-5.6"
-#: libexif/canon/mnote-canon-entry.c:223
+#: libexif/canon/mnote-canon-entry.c:224
+#, fuzzy
+msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
+msgstr "Canon EF-S 18-55mm f/3.5-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:225
msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
msgstr "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
-#: libexif/canon/mnote-canon-entry.c:224
+#: libexif/canon/mnote-canon-entry.c:226
msgid "Canon TS-E 24mm f/3.5L"
msgstr "Canon TS-E 24mm f/3.5L"
-#: libexif/canon/mnote-canon-entry.c:225
+#: libexif/canon/mnote-canon-entry.c:227
msgid "Canon TS-E 45mm f/2.8"
msgstr "Canon TS-E 45mm f/2.8"
-#: libexif/canon/mnote-canon-entry.c:226
+#: libexif/canon/mnote-canon-entry.c:228
msgid "Canon TS-E 90mm f/2.8"
msgstr "Canon TS-E 90mm f/2.8"
-#: libexif/canon/mnote-canon-entry.c:227
+#: libexif/canon/mnote-canon-entry.c:229
msgid "Canon EF 50mm f/1.0L"
msgstr "Canon EF 50mm f/1.0L"
-#: libexif/canon/mnote-canon-entry.c:228
+#: libexif/canon/mnote-canon-entry.c:230
msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
msgstr "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
-#: libexif/canon/mnote-canon-entry.c:229
+#: libexif/canon/mnote-canon-entry.c:231
msgid "Canon EF 600mm f/4L IS"
msgstr "Canon EF 600mm f/4L IS"
-#: libexif/canon/mnote-canon-entry.c:230
+#: libexif/canon/mnote-canon-entry.c:232
msgid "Canon EF 200mm f/1.8L"
msgstr "Canon EF 200mm f/1.8L"
-#: libexif/canon/mnote-canon-entry.c:231
+#: libexif/canon/mnote-canon-entry.c:233
msgid "Canon EF 300mm f/2.8L"
msgstr "Canon EF 300mm f/2.8L"
-#: libexif/canon/mnote-canon-entry.c:232
+#: libexif/canon/mnote-canon-entry.c:234
msgid "Canon EF 85mm f/1.2L"
msgstr "Canon EF 85mm f/1.2L"
-#: libexif/canon/mnote-canon-entry.c:233
+#: libexif/canon/mnote-canon-entry.c:235
msgid "Canon EF 400mm f/2.8L"
msgstr "Canon EF 400mm f/2.8L"
-#: libexif/canon/mnote-canon-entry.c:234
+#: libexif/canon/mnote-canon-entry.c:236
msgid "Canon EF 500mm f/4.5L"
msgstr "Canon EF 500mm f/4.5L"
-#: libexif/canon/mnote-canon-entry.c:235
+#: libexif/canon/mnote-canon-entry.c:237
msgid "Canon EF 300mm f/2.8L IS"
msgstr "Canon EF 300mm f/2.8L IS"
-#: libexif/canon/mnote-canon-entry.c:236
+#: libexif/canon/mnote-canon-entry.c:238
msgid "Canon EF 500mm f/4L IS"
msgstr "Canon EF 500mm f/4L IS"
-#: libexif/canon/mnote-canon-entry.c:237
+#: libexif/canon/mnote-canon-entry.c:239
msgid "Canon EF 100mm f/2"
msgstr "Canon EF 100mm f/2"
-#: libexif/canon/mnote-canon-entry.c:238
+#: libexif/canon/mnote-canon-entry.c:240
msgid "Sigma 20mm EX f/1.8"
msgstr "Sigma 20mm EX f/1.8"
-#: libexif/canon/mnote-canon-entry.c:239
+#: libexif/canon/mnote-canon-entry.c:241
msgid "Canon EF 200mm f/2.8L"
msgstr "Canon EF 200mm f/2.8L"
-#: libexif/canon/mnote-canon-entry.c:240
+#: libexif/canon/mnote-canon-entry.c:242
msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
msgstr "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
-#: libexif/canon/mnote-canon-entry.c:241
+#: libexif/canon/mnote-canon-entry.c:243
msgid "Canon EF 35-350mm f/3.5-5.6L"
msgstr "Canon EF 35-350mm f/3.5-5.6L"
-#: libexif/canon/mnote-canon-entry.c:242
+#: libexif/canon/mnote-canon-entry.c:244
msgid "Canon EF 85mm f/1.8 USM"
msgstr "Canon EF 85mm f/1.8 USM"
-#: libexif/canon/mnote-canon-entry.c:243
+#: libexif/canon/mnote-canon-entry.c:245
msgid "Canon EF 28-105mm f/3.5-4.5 USM"
msgstr "Canon EF 28-105mm f/3.5-4.5 USM"
-#: libexif/canon/mnote-canon-entry.c:244
+#: libexif/canon/mnote-canon-entry.c:246
msgid "Canon EF 20-35mm f/3.5-4.5 USM"
msgstr "Canon EF 20-35mm f/3.5-4.5 USM"
-#: libexif/canon/mnote-canon-entry.c:245
+#: libexif/canon/mnote-canon-entry.c:247
msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
msgstr "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
-#: libexif/canon/mnote-canon-entry.c:246
+#: libexif/canon/mnote-canon-entry.c:248
msgid "Canon EF 70-200mm f/2.8 L"
msgstr "Canon EF 70-200mm f/2.8 L"
-#: libexif/canon/mnote-canon-entry.c:247
+#: libexif/canon/mnote-canon-entry.c:249
msgid "Canon EF 70-200mm f/2.8 L + x1.4"
msgstr "Canon EF 70-200mm f/2.8 L + x1.4"
-#: libexif/canon/mnote-canon-entry.c:248
+#: libexif/canon/mnote-canon-entry.c:250
msgid "Canon EF 70-200mm f/2.8 L + x2"
msgstr "Canon EF 70-200mm f/2.8 L + x2"
-#: libexif/canon/mnote-canon-entry.c:249
+#: libexif/canon/mnote-canon-entry.c:251
msgid "Canon EF 28mm f/1.8 USM"
msgstr "Canon EF 28mm f/1.8 USM"
-#: libexif/canon/mnote-canon-entry.c:250
+#: libexif/canon/mnote-canon-entry.c:252
msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
msgstr "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
-#: libexif/canon/mnote-canon-entry.c:251
+#: libexif/canon/mnote-canon-entry.c:253
msgid "Canon EF 200mm f/2.8L II"
msgstr "Canon EF 200mm f/2.8L II"
-#: libexif/canon/mnote-canon-entry.c:252
+#: libexif/canon/mnote-canon-entry.c:254
msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
msgstr "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
-#: libexif/canon/mnote-canon-entry.c:253
+#: libexif/canon/mnote-canon-entry.c:255
msgid "Canon EF 135mm f/2L"
msgstr "Canon EF 135mm f/2L"
-#: libexif/canon/mnote-canon-entry.c:254
+#: libexif/canon/mnote-canon-entry.c:256
msgid "Canon EF 24-85mm f/3.5-4.5 USM"
msgstr "Canon EF 24-85mm f/3.5-4.5 USM"
-#: libexif/canon/mnote-canon-entry.c:255
+#: libexif/canon/mnote-canon-entry.c:257
msgid "Canon EF 300mm f/4L IS"
msgstr "Canon EF 300mm f/4L IS"
-#: libexif/canon/mnote-canon-entry.c:256
+#: libexif/canon/mnote-canon-entry.c:258
msgid "Canon EF 28-135mm f/3.5-5.6 IS"
msgstr "Canon EF 28-135mm f/3.5-5.6 IS"
-#: libexif/canon/mnote-canon-entry.c:257
+#: libexif/canon/mnote-canon-entry.c:259
msgid "Canon EF 35mm f/1.4L"
msgstr "Canon EF 35mm f/1.4L"
-#: libexif/canon/mnote-canon-entry.c:258
+#: libexif/canon/mnote-canon-entry.c:260
msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
-#: libexif/canon/mnote-canon-entry.c:259
+#: libexif/canon/mnote-canon-entry.c:261
msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
msgstr "Canon EF 100-400mm f/4.5-5.6L IS + x2"
-#: libexif/canon/mnote-canon-entry.c:260
+#: libexif/canon/mnote-canon-entry.c:262
msgid "Canon EF 100-400mm f/4.5-5.6L IS"
msgstr "Canon EF 100-400mm f/4.5-5.6L IS"
-#: libexif/canon/mnote-canon-entry.c:261
+#: libexif/canon/mnote-canon-entry.c:263
msgid "Canon EF 400mm f/2.8L + x2"
msgstr "Canon EF 400mm f/2.8L + x2"
-#: libexif/canon/mnote-canon-entry.c:262
+#: libexif/canon/mnote-canon-entry.c:264
msgid "Canon EF 70-200mm f/4L"
msgstr "Canon EF 70-200mm f/4L"
-#: libexif/canon/mnote-canon-entry.c:263
+#: libexif/canon/mnote-canon-entry.c:265
msgid "Canon EF 100mm f/2.8 Macro"
msgstr "Canon EF 100mm f/2.8 Macro"
-#: libexif/canon/mnote-canon-entry.c:264
+#: libexif/canon/mnote-canon-entry.c:266
msgid "Canon EF 400mm f/4 DO IS"
msgstr "Canon EF 400mm f/4 DO IS"
-#: libexif/canon/mnote-canon-entry.c:265
+#: libexif/canon/mnote-canon-entry.c:267
msgid "Canon EF 75-300mm f/4-5.6 IS"
msgstr "Canon EF 75-300mm f/4-5.6 IS"
-#: libexif/canon/mnote-canon-entry.c:266
+#: libexif/canon/mnote-canon-entry.c:268
msgid "Canon EF 50mm f/1.4"
msgstr "Canon EF 50mm f/1.4"
-#: libexif/canon/mnote-canon-entry.c:267
+#: libexif/canon/mnote-canon-entry.c:269
msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
msgstr "Canon EF 28-80 f/3.5-5.6 USM IV"
-#: libexif/canon/mnote-canon-entry.c:268
+#: libexif/canon/mnote-canon-entry.c:270
msgid "Canon EF 28-200mm f/3.5-5.6"
msgstr "Canon EF 28-200mm f/3.5-5.6"
-#: libexif/canon/mnote-canon-entry.c:269
+#: libexif/canon/mnote-canon-entry.c:271
msgid "Canon EF 90-300mm f/4.5-5.6"
msgstr "Canon EF 90-300mm f/4.5-5.6"
-#: libexif/canon/mnote-canon-entry.c:270
+#: libexif/canon/mnote-canon-entry.c:272
msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
msgstr "Canon EF-S 18-55mm f/3.5-4.5 USM"
-#: libexif/canon/mnote-canon-entry.c:271
+#: libexif/canon/mnote-canon-entry.c:273
msgid "Canon EF 70-200mm f/2.8L IS USM"
msgstr "Canon EF 70-200mm f/2.8L IS USM"
-#: libexif/canon/mnote-canon-entry.c:272
+#: libexif/canon/mnote-canon-entry.c:274
msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
msgstr "Canon EF 70-200mm f/2.8L IS USM + x1.4"
-#: libexif/canon/mnote-canon-entry.c:273
+#: libexif/canon/mnote-canon-entry.c:275
msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
msgstr "Canon EF 70-200mm f/2.8L IS USM + x2"
-#: libexif/canon/mnote-canon-entry.c:274
+#: libexif/canon/mnote-canon-entry.c:276
msgid "Canon EF 16-35mm f/2.8L"
msgstr "Canon EF 16-35mm f/2.8L"
-#: libexif/canon/mnote-canon-entry.c:275
+#: libexif/canon/mnote-canon-entry.c:277
msgid "Canon EF 24-70mm f/2.8L"
msgstr "Canon EF 24-70mm f/2.8L"
-#: libexif/canon/mnote-canon-entry.c:276
+#: libexif/canon/mnote-canon-entry.c:278
msgid "Canon EF 17-40mm f/4L"
msgstr "Canon EF 17-40mm f/4L"
-#: libexif/canon/mnote-canon-entry.c:277
+#: libexif/canon/mnote-canon-entry.c:279
msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
msgstr "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
-#: libexif/canon/mnote-canon-entry.c:278
+#: libexif/canon/mnote-canon-entry.c:280
msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
msgstr "Canon EF-S 17-85mm f4-5.6 IS USM"
-#: libexif/canon/mnote-canon-entry.c:279
+#: libexif/canon/mnote-canon-entry.c:281
msgid "Canon EF-S10-22mm F3.5-4.5 USM"
msgstr "Canon EF-S10-22mm F3.5-4.5 USM"
-#: libexif/canon/mnote-canon-entry.c:280
+#: libexif/canon/mnote-canon-entry.c:282
msgid "Canon EF-S60mm F2.8 Macro USM"
msgstr "Canon EF-S60mm F2.8 Macro USM"
-#: libexif/canon/mnote-canon-entry.c:281
+#: libexif/canon/mnote-canon-entry.c:283
msgid "Canon EF 24-105mm f/4L IS"
msgstr "Canon EF 24-105mm f/4L IS"
-#: libexif/canon/mnote-canon-entry.c:282
+#: libexif/canon/mnote-canon-entry.c:284
msgid "Canon EF 70-300mm F4-5.6 IS USM"
msgstr "Canon EF 70-300mm F4-5.6 IS USM"
-#: libexif/canon/mnote-canon-entry.c:283
+#: libexif/canon/mnote-canon-entry.c:285
msgid "Canon EF 50mm F1.2L USM"
msgstr "Canon EF 50mm F1.2L USM"
-#: libexif/canon/mnote-canon-entry.c:284
+#: libexif/canon/mnote-canon-entry.c:286
msgid "Canon EF 70-200mm f/4L IS USM"
msgstr "Canon EF 70-200mm f/4L IS USM"
-#: libexif/canon/mnote-canon-entry.c:286
+#: libexif/canon/mnote-canon-entry.c:287
+#, fuzzy
+msgid "Canon EF 70-200mm f/2.8L IS II USM"
+msgstr "Canon EF 70-200mm f/2.8L IS USM"
+
+#: libexif/canon/mnote-canon-entry.c:289
msgid "TTL"
msgstr "TTL"
-#: libexif/canon/mnote-canon-entry.c:287
+#: libexif/canon/mnote-canon-entry.c:290
msgid "A-TTL"
msgstr "A-TTL"
-#: libexif/canon/mnote-canon-entry.c:288
+#: libexif/canon/mnote-canon-entry.c:291
msgid "E-TTL"
msgstr "E-TTL"
-#: libexif/canon/mnote-canon-entry.c:289
+#: libexif/canon/mnote-canon-entry.c:292
msgid "FP sync enabled"
msgstr "FP sync enabled"
-#: libexif/canon/mnote-canon-entry.c:290
+#: libexif/canon/mnote-canon-entry.c:293
msgid "2nd-curtain sync used"
msgstr "2nd-curtain sync used"
-#: libexif/canon/mnote-canon-entry.c:291
+#: libexif/canon/mnote-canon-entry.c:294
msgid "FP sync used"
msgstr "FP sync used"
-#: libexif/canon/mnote-canon-entry.c:292
+#: libexif/canon/mnote-canon-entry.c:295
#: libexif/olympus/mnote-olympus-entry.c:190
msgid "Internal"
msgstr "Internal"
-#: libexif/canon/mnote-canon-entry.c:293
+#: libexif/canon/mnote-canon-entry.c:296
#: libexif/olympus/mnote-olympus-entry.c:191
msgid "External"
msgstr "External"
-#: libexif/canon/mnote-canon-entry.c:296
+#: libexif/canon/mnote-canon-entry.c:299
msgid "Normal AE"
msgstr "Normal AE"
-#: libexif/canon/mnote-canon-entry.c:297
+#: libexif/canon/mnote-canon-entry.c:300
msgid "Exposure compensation"
msgstr "Exposure compensation"
-#: libexif/canon/mnote-canon-entry.c:298
+#: libexif/canon/mnote-canon-entry.c:301
msgid "AE lock"
msgstr "AE lock"
-#: libexif/canon/mnote-canon-entry.c:299
+#: libexif/canon/mnote-canon-entry.c:302
msgid "AE lock + exposure compensation"
msgstr "AE lock + exposure compensation"
-#: libexif/canon/mnote-canon-entry.c:300
+#: libexif/canon/mnote-canon-entry.c:303
msgid "No AE"
msgstr "No AE"
-#: libexif/canon/mnote-canon-entry.c:303
+#: libexif/canon/mnote-canon-entry.c:306
msgid "On, shot only"
msgstr "On, shot only"
-#: libexif/canon/mnote-canon-entry.c:307
+#: libexif/canon/mnote-canon-entry.c:310
msgid "Smooth"
msgstr "Smooth"
-#: libexif/canon/mnote-canon-entry.c:310 libexif/canon/mnote-canon-entry.c:334
-#: libexif/canon/mnote-canon-entry.c:393 libexif/canon/mnote-canon-entry.c:406
+#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
+#: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
#: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
msgid "Custom"
msgstr "Custom"
-#: libexif/canon/mnote-canon-entry.c:311
+#: libexif/canon/mnote-canon-entry.c:314
msgid "My color data"
msgstr "My colour data"
-#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:375
+#: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
#: libexif/pentax/mnote-pentax-entry.c:126
#: libexif/pentax/mnote-pentax-entry.c:145
msgid "Full"
msgstr "Full"
-#: libexif/canon/mnote-canon-entry.c:314 libexif/canon/mnote-canon-entry.c:374
+#: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
msgid "2/3"
msgstr "2/3"
-#: libexif/canon/mnote-canon-entry.c:315 libexif/canon/mnote-canon-entry.c:373
+#: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
msgid "1/3"
msgstr "1/3"
-#: libexif/canon/mnote-canon-entry.c:321
+#: libexif/canon/mnote-canon-entry.c:324
msgid "Fixed"
msgstr "Fixed"
-#: libexif/canon/mnote-canon-entry.c:322 libexif/pentax/mnote-pentax-tag.c:44
+#: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
msgid "Zoom"
msgstr "Zoom"
-#: libexif/canon/mnote-canon-entry.c:329
+#: libexif/canon/mnote-canon-entry.c:332
msgid "Sunny"
msgstr "Sunny"
-#: libexif/canon/mnote-canon-entry.c:330 libexif/canon/mnote-canon-entry.c:402
-#: libexif/exif-entry.c:719 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
+#: libexif/exif-entry.c:720 libexif/fuji/mnote-fuji-entry.c:75
#: libexif/olympus/mnote-olympus-entry.c:136
#: libexif/pentax/mnote-pentax-entry.c:255
msgid "Cloudy"
msgstr "Cloudy"
-#: libexif/canon/mnote-canon-entry.c:331 libexif/canon/mnote-canon-entry.c:403
-#: libexif/exif-entry.c:716 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
+#: libexif/exif-entry.c:717 libexif/pentax/mnote-pentax-entry.c:100
#: libexif/pentax/mnote-pentax-entry.c:249
msgid "Tungsten"
msgstr "Tungsten"
-#: libexif/canon/mnote-canon-entry.c:332 libexif/canon/mnote-canon-entry.c:404
-#: libexif/exif-entry.c:715 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
+#: libexif/exif-entry.c:716 libexif/pentax/mnote-pentax-entry.c:101
#: libexif/pentax/mnote-pentax-entry.c:248
msgid "Fluorescent"
msgstr "Fluorescent"
-#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
-#: libexif/exif-entry.c:717 libexif/exif-entry.c:759 libexif/exif-tag.c:577
+#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
+#: libexif/exif-entry.c:718 libexif/exif-entry.c:760 libexif/exif-tag.c:577
#: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
msgid "Flash"
msgstr "Flash"
-#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
-#: libexif/exif-entry.c:720 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
+#: libexif/exif-entry.c:721 libexif/pentax/mnote-pentax-entry.c:99
#: libexif/pentax/mnote-pentax-entry.c:247
msgid "Shade"
msgstr "Shade"
-#: libexif/canon/mnote-canon-entry.c:337 libexif/canon/mnote-canon-entry.c:409
+#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
msgid "Manual temperature (Kelvin)"
msgstr "Manual temperature (Kelvin)"
-#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
+#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
msgid "PC set 1"
msgstr "PC set 1"
-#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
+#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
msgid "PC set 2"
msgstr "PC set 2"
-#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
+#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
msgid "PC set 3"
msgstr "PC set 3"
-#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
-#: libexif/exif-entry.c:721 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
+#: libexif/exif-entry.c:722 libexif/fuji/mnote-fuji-entry.c:76
#: libexif/pentax/mnote-pentax-entry.c:251
msgid "Daylight fluorescent"
msgstr "Daylight fluorescent"
-#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
+#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
msgid "Custom 1"
msgstr "Custom 1"
-#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
+#: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
msgid "Custom 2"
msgstr "Custom 2"
-#: libexif/canon/mnote-canon-entry.c:346 libexif/exif-entry.c:672
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:673
#: libexif/pentax/mnote-pentax-entry.c:78
#: libexif/pentax/mnote-pentax-entry.c:132
#: libexif/pentax/mnote-pentax-entry.c:169
msgid "Night scene"
msgstr "Night scene"
-#: libexif/canon/mnote-canon-entry.c:352
+#: libexif/canon/mnote-canon-entry.c:355
msgid "Center-right"
msgstr "Centre-right"
-#: libexif/canon/mnote-canon-entry.c:354
+#: libexif/canon/mnote-canon-entry.c:357
msgid "Left-right"
msgstr "Left-right"
-#: libexif/canon/mnote-canon-entry.c:355
+#: libexif/canon/mnote-canon-entry.c:358
msgid "Left-center"
msgstr "Left-centre"
-#: libexif/canon/mnote-canon-entry.c:356
+#: libexif/canon/mnote-canon-entry.c:359
msgid "All"
msgstr "All"
-#: libexif/canon/mnote-canon-entry.c:358
+#: libexif/canon/mnote-canon-entry.c:361
msgid "On (shot 1)"
msgstr "On (shot 1)"
-#: libexif/canon/mnote-canon-entry.c:359
+#: libexif/canon/mnote-canon-entry.c:362
msgid "On (shot 2)"
msgstr "On (shot 2)"
-#: libexif/canon/mnote-canon-entry.c:360
+#: libexif/canon/mnote-canon-entry.c:363
msgid "On (shot 3)"
msgstr "On (shot 3)"
-#: libexif/canon/mnote-canon-entry.c:362
+#: libexif/canon/mnote-canon-entry.c:365
msgid "EOS high-end"
msgstr "EOS high-end"
-#: libexif/canon/mnote-canon-entry.c:363
+#: libexif/canon/mnote-canon-entry.c:366
msgid "Compact"
msgstr "Compact"
-#: libexif/canon/mnote-canon-entry.c:364
+#: libexif/canon/mnote-canon-entry.c:367
msgid "EOS mid-range"
msgstr "EOS mid-range"
-#: libexif/canon/mnote-canon-entry.c:366
+#: libexif/canon/mnote-canon-entry.c:369
msgid "Rotate 90 CW"
msgstr "Rotate 90 CW"
-#: libexif/canon/mnote-canon-entry.c:367
+#: libexif/canon/mnote-canon-entry.c:370
msgid "Rotate 180"
msgstr "Rotate 180"
-#: libexif/canon/mnote-canon-entry.c:368
+#: libexif/canon/mnote-canon-entry.c:371
msgid "Rotate 270 CW"
msgstr "Rotate 270 CW"
-#: libexif/canon/mnote-canon-entry.c:369
+#: libexif/canon/mnote-canon-entry.c:372
msgid "Rotated by software"
msgstr "Rotated by software"
-#: libexif/canon/mnote-canon-entry.c:381
-#: libexif/olympus/mnote-olympus-entry.c:606
+#: libexif/canon/mnote-canon-entry.c:384
+#: libexif/olympus/mnote-olympus-entry.c:609
msgid "Left to right"
msgstr "Left to right"
-#: libexif/canon/mnote-canon-entry.c:382
-#: libexif/olympus/mnote-olympus-entry.c:609
+#: libexif/canon/mnote-canon-entry.c:385
+#: libexif/olympus/mnote-olympus-entry.c:612
msgid "Right to left"
msgstr "Right to left"
-#: libexif/canon/mnote-canon-entry.c:383
-#: libexif/olympus/mnote-olympus-entry.c:612
+#: libexif/canon/mnote-canon-entry.c:386
+#: libexif/olympus/mnote-olympus-entry.c:615
msgid "Bottom to top"
msgstr "Bottom to top"
-#: libexif/canon/mnote-canon-entry.c:384
-#: libexif/olympus/mnote-olympus-entry.c:615
+#: libexif/canon/mnote-canon-entry.c:387
+#: libexif/olympus/mnote-olympus-entry.c:618
msgid "Top to bottom"
msgstr "Top to bottom"
-#: libexif/canon/mnote-canon-entry.c:385
+#: libexif/canon/mnote-canon-entry.c:388
msgid "2x2 matrix (clockwise)"
msgstr "2x2 matrix (clockwise)"
-#: libexif/canon/mnote-canon-entry.c:391 libexif/canon/mnote-canon-entry.c:397
-#: libexif/canon/mnote-canon-entry.c:418 libexif/canon/mnote-canon-entry.c:428
-#: libexif/exif-entry.c:671 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
+#: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
+#: libexif/exif-entry.c:672 libexif/fuji/mnote-fuji-entry.c:84
#: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
#: libexif/olympus/mnote-olympus-entry.c:227
msgid "Standard"
msgstr "Standard"
-#: libexif/canon/mnote-canon-entry.c:394
+#: libexif/canon/mnote-canon-entry.c:397
msgid "N/A"
msgstr "N/A"
-#: libexif/canon/mnote-canon-entry.c:395
+#: libexif/canon/mnote-canon-entry.c:398
msgid "Lowest"
msgstr "Lowest"
-#: libexif/canon/mnote-canon-entry.c:399
+#: libexif/canon/mnote-canon-entry.c:402
msgid "Highest"
msgstr "Highest"
-#: libexif/canon/mnote-canon-entry.c:401 libexif/exif-entry.c:714
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:715
#: libexif/fuji/mnote-fuji-entry.c:74
#: libexif/olympus/mnote-olympus-entry.c:133
#: libexif/pentax/mnote-pentax-entry.c:98
msgid "Daylight"
msgstr "Daylight"
-#: libexif/canon/mnote-canon-entry.c:419
+#: libexif/canon/mnote-canon-entry.c:422
msgid "Set 1"
msgstr "Set 1"
-#: libexif/canon/mnote-canon-entry.c:420
+#: libexif/canon/mnote-canon-entry.c:423
msgid "Set 2"
msgstr "Set 2"
-#: libexif/canon/mnote-canon-entry.c:421
+#: libexif/canon/mnote-canon-entry.c:424
msgid "Set 3"
msgstr "Set 3"
-#: libexif/canon/mnote-canon-entry.c:422
+#: libexif/canon/mnote-canon-entry.c:425
msgid "User def. 1"
msgstr "User def. 1"
-#: libexif/canon/mnote-canon-entry.c:423
+#: libexif/canon/mnote-canon-entry.c:426
msgid "User def. 2"
msgstr "User def. 2"
-#: libexif/canon/mnote-canon-entry.c:424
+#: libexif/canon/mnote-canon-entry.c:427
msgid "User def. 3"
msgstr "User def. 3"
-#: libexif/canon/mnote-canon-entry.c:425
+#: libexif/canon/mnote-canon-entry.c:428
msgid "External 1"
msgstr "External 1"
-#: libexif/canon/mnote-canon-entry.c:426
+#: libexif/canon/mnote-canon-entry.c:429
msgid "External 2"
msgstr "External 2"
-#: libexif/canon/mnote-canon-entry.c:427
+#: libexif/canon/mnote-canon-entry.c:430
msgid "External 3"
msgstr "External 3"
-#: libexif/canon/mnote-canon-entry.c:432
+#: libexif/canon/mnote-canon-entry.c:435
msgid "Faithful"
msgstr "Faithful"
-#: libexif/canon/mnote-canon-entry.c:433
+#: libexif/canon/mnote-canon-entry.c:436
#: libexif/olympus/mnote-olympus-entry.c:115
msgid "Monochrome"
msgstr "Monochrome"
-#: libexif/canon/mnote-canon-entry.c:491
+#: libexif/canon/mnote-canon-entry.c:494
msgid ", "
msgstr ", "
-#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
#, c-format
msgid "%i (ms)"
msgstr "%i (ms)"
-#: libexif/canon/mnote-canon-entry.c:621
+#: libexif/canon/mnote-canon-entry.c:624
#, c-format
msgid "%.2f mm"
msgstr "%.2f mm"
-#: libexif/canon/mnote-canon-entry.c:645
+#: libexif/canon/mnote-canon-entry.c:648
#, c-format
msgid "%.2f EV"
msgstr "%.2f EV"
-#: libexif/canon/mnote-canon-entry.c:655 libexif/exif-entry.c:1064
+#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1065
#, c-format
msgid "1/%i"
msgstr "1/%i"
-#: libexif/canon/mnote-canon-entry.c:667
+#: libexif/canon/mnote-canon-entry.c:670
#, c-format
msgid "%u mm"
msgstr "%u mm"
msgstr "Settings (Second Part)"
#: libexif/canon/mnote-canon-tag.c:38
-#: libexif/olympus/mnote-olympus-entry.c:595
+#: libexif/olympus/mnote-olympus-entry.c:598
#: libexif/pentax/mnote-pentax-entry.c:177
msgid "Panorama"
msgstr "Panorama"
msgid "Unknown encoding."
msgstr "Unknown encoding."
-#: libexif/exif-data.c:1168
+#: libexif/exif-data.c:1169
msgid "Ignore unknown tags"
msgstr "Ignore unknown tags"
-#: libexif/exif-data.c:1169
+#: libexif/exif-data.c:1170
msgid "Ignore unknown tags when loading EXIF data."
msgstr "Ignore unknown tags when loading EXIF data."
-#: libexif/exif-data.c:1170
+#: libexif/exif-data.c:1171
msgid "Follow specification"
msgstr "Follow specification"
-#: libexif/exif-data.c:1171
+#: libexif/exif-data.c:1172
msgid ""
"Add, correct and remove entries to get EXIF data that follows the "
"specification."
"Add, correct and remove entries to get EXIF data that follows the "
"specification."
-#: libexif/exif-data.c:1173
+#: libexif/exif-data.c:1174
msgid "Do not change maker note"
msgstr "Do not change maker note"
-#: libexif/exif-data.c:1174
+#: libexif/exif-data.c:1175
msgid ""
"When loading and resaving Exif data, save the maker note unmodified. Be "
"aware that the maker note can get corrupted."
"Tag 'UserComment' did not start with a format identifier. This has been "
"fixed."
-#: libexif/exif-entry.c:462
+#: libexif/exif-entry.c:463
#, c-format
msgid "%i bytes undefined data"
msgstr "%i bytes undefined data"
-#: libexif/exif-entry.c:589
+#: libexif/exif-entry.c:590
#, c-format
msgid "%i bytes unsupported data type"
msgstr "%i bytes unsupported data type"
-#: libexif/exif-entry.c:622
+#: libexif/exif-entry.c:623
#, c-format
-msgid ""
-"The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-msgstr ""
-"The tag '%s' contains data of an invalid format ('%s', expected '%s')."
+msgid "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
+msgstr "The tag '%s' contains data of an invalid format ('%s', expected '%s')."
-#: libexif/exif-entry.c:635
+#: libexif/exif-entry.c:636
#, c-format
msgid ""
"The tag '%s' contains an invalid number of components (%i, expected %i)."
msgstr ""
"The tag '%s' contains an invalid number of components (%i, expected %i)."
-#: libexif/exif-entry.c:649
+#: libexif/exif-entry.c:650
msgid "Chunky format"
msgstr "Chunky format"
-#: libexif/exif-entry.c:649
+#: libexif/exif-entry.c:650
msgid "Planar format"
msgstr "Planar format"
-#: libexif/exif-entry.c:651 libexif/exif-entry.c:743
+#: libexif/exif-entry.c:652 libexif/exif-entry.c:744
#: test/nls/test-codeset.c:54
msgid "Not defined"
msgstr "Not defined"
-#: libexif/exif-entry.c:651
+#: libexif/exif-entry.c:652
msgid "One-chip color area sensor"
msgstr "One-chip colour area sensor"
-#: libexif/exif-entry.c:652
+#: libexif/exif-entry.c:653
msgid "Two-chip color area sensor"
msgstr "Two-chip colour area sensor"
-#: libexif/exif-entry.c:652
+#: libexif/exif-entry.c:653
msgid "Three-chip color area sensor"
msgstr "Three-chip colour area sensor"
-#: libexif/exif-entry.c:653
+#: libexif/exif-entry.c:654
msgid "Color sequential area sensor"
msgstr "Colour sequential area sensor"
-#: libexif/exif-entry.c:653
+#: libexif/exif-entry.c:654
msgid "Trilinear sensor"
msgstr "Trilinear sensor"
-#: libexif/exif-entry.c:654
+#: libexif/exif-entry.c:655
msgid "Color sequential linear sensor"
msgstr "Colour sequential linear sensor"
-#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:233
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:233
msgid "Top-left"
msgstr "Top-left"
-#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:235
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:235
msgid "Top-right"
msgstr "Top-right"
-#: libexif/exif-entry.c:656 libexif/pentax/mnote-pentax-entry.c:241
+#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:241
msgid "Bottom-right"
msgstr "Bottom-right"
-#: libexif/exif-entry.c:657 libexif/pentax/mnote-pentax-entry.c:239
+#: libexif/exif-entry.c:658 libexif/pentax/mnote-pentax-entry.c:239
msgid "Bottom-left"
msgstr "Bottom-left"
-#: libexif/exif-entry.c:657
+#: libexif/exif-entry.c:658
msgid "Left-top"
msgstr "Left-top"
-#: libexif/exif-entry.c:657
+#: libexif/exif-entry.c:658
msgid "Right-top"
msgstr "Right-top"
-#: libexif/exif-entry.c:658
+#: libexif/exif-entry.c:659
msgid "Right-bottom"
msgstr "Right-bottom"
-#: libexif/exif-entry.c:658
+#: libexif/exif-entry.c:659
msgid "Left-bottom"
msgstr "Left-bottom"
-#: libexif/exif-entry.c:660
+#: libexif/exif-entry.c:661
msgid "Centered"
msgstr "Centred"
-#: libexif/exif-entry.c:660
+#: libexif/exif-entry.c:661
msgid "Co-sited"
msgstr "Co-sited"
-#: libexif/exif-entry.c:662
+#: libexif/exif-entry.c:663
msgid "Reversed mono"
msgstr "Reversed mono"
-#: libexif/exif-entry.c:662
+#: libexif/exif-entry.c:663
msgid "Normal mono"
msgstr "Normal mono"
-#: libexif/exif-entry.c:662
+#: libexif/exif-entry.c:663
msgid "RGB"
msgstr "RGB"
-#: libexif/exif-entry.c:662
+#: libexif/exif-entry.c:663
msgid "Palette"
msgstr "Palette"
-#: libexif/exif-entry.c:663
+#: libexif/exif-entry.c:664
msgid "CMYK"
msgstr "CMYK"
-#: libexif/exif-entry.c:663
+#: libexif/exif-entry.c:664
msgid "YCbCr"
msgstr "YCbCr"
-#: libexif/exif-entry.c:663
+#: libexif/exif-entry.c:664
msgid "CieLAB"
msgstr "CieLAB"
-#: libexif/exif-entry.c:665
+#: libexif/exif-entry.c:666
msgid "Normal process"
msgstr "Normal process"
-#: libexif/exif-entry.c:665
+#: libexif/exif-entry.c:666
msgid "Custom process"
msgstr "Custom process"
-#: libexif/exif-entry.c:667
+#: libexif/exif-entry.c:668
msgid "Auto exposure"
msgstr "Auto exposure"
-#: libexif/exif-entry.c:667 libexif/fuji/mnote-fuji-entry.c:139
+#: libexif/exif-entry.c:668 libexif/fuji/mnote-fuji-entry.c:139
msgid "Manual exposure"
msgstr "Manual exposure"
-#: libexif/exif-entry.c:667
+#: libexif/exif-entry.c:668
msgid "Auto bracket"
msgstr "Auto bracket"
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:670
msgid "Auto white balance"
msgstr "Auto white balance"
-#: libexif/exif-entry.c:669
+#: libexif/exif-entry.c:670
msgid "Manual white balance"
msgstr "Manual white balance"
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:675
msgid "Low gain up"
msgstr "Low gain up"
-#: libexif/exif-entry.c:674
+#: libexif/exif-entry.c:675
msgid "High gain up"
msgstr "High gain up"
-#: libexif/exif-entry.c:675
+#: libexif/exif-entry.c:676
msgid "Low gain down"
msgstr "Low gain down"
-#: libexif/exif-entry.c:675
+#: libexif/exif-entry.c:676
msgid "High gain down"
msgstr "High gain down"
-#: libexif/exif-entry.c:677
+#: libexif/exif-entry.c:678
msgid "Low saturation"
msgstr "Low saturation"
-#: libexif/exif-entry.c:677 test/nls/test-codeset.c:48
+#: libexif/exif-entry.c:678 test/nls/test-codeset.c:48
#: test/nls/test-codeset.c:61
msgid "High saturation"
msgstr "High saturation"
-#: libexif/exif-entry.c:678 libexif/exif-entry.c:679
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
#: libexif/fuji/mnote-fuji-entry.c:63
#: libexif/olympus/mnote-olympus-entry.c:205
#: libexif/olympus/mnote-olympus-entry.c:214
msgid "Soft"
msgstr "Soft"
-#: libexif/exif-entry.c:678 libexif/exif-entry.c:679
+#: libexif/exif-entry.c:679 libexif/exif-entry.c:680
#: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
#: libexif/olympus/mnote-olympus-entry.c:204
#: libexif/olympus/mnote-olympus-entry.c:212
msgid "Hard"
msgstr "Hard"
-#: libexif/exif-entry.c:695 libexif/exif-entry.c:713 libexif/exif-entry.c:795
-#: libexif/olympus/mnote-olympus-entry.c:589
-#: libexif/olympus/mnote-olympus-entry.c:683
-#: libexif/olympus/mnote-olympus-entry.c:738
+#: libexif/exif-entry.c:696 libexif/exif-entry.c:714 libexif/exif-entry.c:796
+#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:686
+#: libexif/olympus/mnote-olympus-entry.c:741
#: libexif/pentax/mnote-pentax-entry.c:256
msgid "Unknown"
msgstr "Unknown"
-#: libexif/exif-entry.c:696
+#: libexif/exif-entry.c:697
msgid "Avg"
msgstr "Avg"
-#: libexif/exif-entry.c:697
+#: libexif/exif-entry.c:698
msgid "Center-weight"
msgstr "Centre-weight"
-#: libexif/exif-entry.c:699
+#: libexif/exif-entry.c:700
msgid "Multi spot"
msgstr "Multi spot"
-#: libexif/exif-entry.c:700
+#: libexif/exif-entry.c:701
msgid "Pattern"
msgstr "Pattern"
-#: libexif/exif-entry.c:705
+#: libexif/exif-entry.c:706
msgid "Uncompressed"
msgstr "Uncompressed"
-#: libexif/exif-entry.c:706
+#: libexif/exif-entry.c:707
msgid "LZW compression"
msgstr "LZW compression"
-#: libexif/exif-entry.c:707 libexif/exif-entry.c:708
+#: libexif/exif-entry.c:708 libexif/exif-entry.c:709
msgid "JPEG compression"
msgstr "JPEG compression"
-#: libexif/exif-entry.c:709
+#: libexif/exif-entry.c:710
msgid "Deflate/ZIP compression"
msgstr "Deflate/ZIP compression"
-#: libexif/exif-entry.c:710
+#: libexif/exif-entry.c:711
msgid "PackBits compression"
msgstr "PackBits compression"
-#: libexif/exif-entry.c:716
+#: libexif/exif-entry.c:717
msgid "Tungsten incandescent light"
msgstr "Tungsten incandescent light"
-#: libexif/exif-entry.c:718
+#: libexif/exif-entry.c:719
msgid "Fine weather"
msgstr "Fine weather"
-#: libexif/exif-entry.c:719
+#: libexif/exif-entry.c:720
msgid "Cloudy weather"
msgstr "Cloudy weather"
-#: libexif/exif-entry.c:722 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/exif-entry.c:723 libexif/fuji/mnote-fuji-entry.c:77
#: libexif/pentax/mnote-pentax-entry.c:252
msgid "Day white fluorescent"
msgstr "Day white fluorescent"
-#: libexif/exif-entry.c:723
+#: libexif/exif-entry.c:724
msgid "Cool white fluorescent"
msgstr "Cool white fluorescent"
-#: libexif/exif-entry.c:724 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/exif-entry.c:725 libexif/fuji/mnote-fuji-entry.c:78
#: libexif/pentax/mnote-pentax-entry.c:253
msgid "White fluorescent"
msgstr "White fluorescent"
-#: libexif/exif-entry.c:725
+#: libexif/exif-entry.c:726
msgid "Standard light A"
msgstr "Standard light A"
-#: libexif/exif-entry.c:726
+#: libexif/exif-entry.c:727
msgid "Standard light B"
msgstr "Standard light B"
-#: libexif/exif-entry.c:727
+#: libexif/exif-entry.c:728
msgid "Standard light C"
msgstr "Standard light C"
-#: libexif/exif-entry.c:728
+#: libexif/exif-entry.c:729
msgid "D55"
msgstr "D55"
-#: libexif/exif-entry.c:729
+#: libexif/exif-entry.c:730
msgid "D65"
msgstr "D65"
-#: libexif/exif-entry.c:730
+#: libexif/exif-entry.c:731
msgid "D75"
msgstr "D75"
-#: libexif/exif-entry.c:731
+#: libexif/exif-entry.c:732
msgid "ISO studio tungsten"
msgstr "ISO studio tungsten"
-#: libexif/exif-entry.c:735 libexif/exif-entry.c:739
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
msgid "Inch"
msgstr "Inch"
-#: libexif/exif-entry.c:735 libexif/exif-entry.c:739
+#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
msgid "in"
msgstr "in"
-#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
msgid "Centimeter"
msgstr "Centimetre"
-#: libexif/exif-entry.c:736 libexif/exif-entry.c:740
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:741
msgid "cm"
msgstr "cm"
-#: libexif/exif-entry.c:745
+#: libexif/exif-entry.c:746
msgid "Normal program"
msgstr "Normal programme"
-#: libexif/exif-entry.c:746
+#: libexif/exif-entry.c:747
msgid "Aperture priority"
msgstr "Aperture priority"
-#: libexif/exif-entry.c:746 libexif/exif-tag.c:550
+#: libexif/exif-entry.c:747 libexif/exif-tag.c:550
msgid "Aperture"
msgstr "Aperture"
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:748
msgid "Shutter priority"
msgstr "Shutter priority"
-#: libexif/exif-entry.c:747
+#: libexif/exif-entry.c:748
msgid "Shutter"
msgstr "Shutter"
-#: libexif/exif-entry.c:748
+#: libexif/exif-entry.c:749
msgid "Creative program (biased toward depth of field)"
msgstr "Creative programme (biased towards depth of field)"
-#: libexif/exif-entry.c:749
+#: libexif/exif-entry.c:750
msgid "Creative"
msgstr "Creative"
-#: libexif/exif-entry.c:750
+#: libexif/exif-entry.c:751
msgid "Creative program (biased toward fast shutter speed)"
msgstr "Creative programme (biased towards fast shutter speed)"
-#: libexif/exif-entry.c:751
+#: libexif/exif-entry.c:752
msgid "Action"
msgstr "Action"
-#: libexif/exif-entry.c:752
+#: libexif/exif-entry.c:753
msgid "Portrait mode (for closeup photos with the background out of focus)"
msgstr "Portrait mode (for closeup photos with the background out of focus)"
-#: libexif/exif-entry.c:754
+#: libexif/exif-entry.c:755
msgid "Landscape mode (for landscape photos with the background in focus)"
msgstr "Landscape mode (for landscape photos with the background in focus)"
-#: libexif/exif-entry.c:758 libexif/exif-entry.c:763
+#: libexif/exif-entry.c:759 libexif/exif-entry.c:764
#: libexif/olympus/mnote-olympus-entry.c:97
msgid "Flash did not fire"
msgstr "Flash did not fire"
-#: libexif/exif-entry.c:758
+#: libexif/exif-entry.c:759
msgid "No flash"
msgstr "No flash"
-#: libexif/exif-entry.c:759
+#: libexif/exif-entry.c:760
msgid "Flash fired"
msgstr "Flash fired"
-#: libexif/exif-entry.c:759 libexif/olympus/mnote-olympus-entry.c:170
+#: libexif/exif-entry.c:760 libexif/olympus/mnote-olympus-entry.c:170
#: libexif/olympus/mnote-olympus-entry.c:175
#: libexif/olympus/mnote-olympus-entry.c:209
#: libexif/olympus/mnote-olympus-entry.c:218
msgid "Yes"
msgstr "Yes"
-#: libexif/exif-entry.c:760
+#: libexif/exif-entry.c:761
msgid "Strobe return light not detected"
msgstr "Strobe return light not detected"
-#: libexif/exif-entry.c:760
+#: libexif/exif-entry.c:761
msgid "Without strobe"
msgstr "Without strobe"
-#: libexif/exif-entry.c:762
+#: libexif/exif-entry.c:763
msgid "Strobe return light detected"
msgstr "Strobe return light detected"
-#: libexif/exif-entry.c:762
+#: libexif/exif-entry.c:763
msgid "With strobe"
msgstr "With strobe"
-#: libexif/exif-entry.c:764
+#: libexif/exif-entry.c:765
msgid "Flash fired, compulsory flash mode"
msgstr "Flash fired, compulsory flash mode"
-#: libexif/exif-entry.c:765
+#: libexif/exif-entry.c:766
msgid "Flash fired, compulsory flash mode, return light not detected"
msgstr "Flash fired, compulsory flash mode, return light not detected"
-#: libexif/exif-entry.c:767
+#: libexif/exif-entry.c:768
msgid "Flash fired, compulsory flash mode, return light detected"
msgstr "Flash fired, compulsory flash mode, return light detected"
-#: libexif/exif-entry.c:769
+#: libexif/exif-entry.c:770
msgid "Flash did not fire, compulsory flash mode"
msgstr "Flash did not fire, compulsory flash mode"
-#: libexif/exif-entry.c:770
+#: libexif/exif-entry.c:771
msgid "Flash did not fire, auto mode"
msgstr "Flash did not fire, auto mode"
-#: libexif/exif-entry.c:771
+#: libexif/exif-entry.c:772
msgid "Flash fired, auto mode"
msgstr "Flash fired, auto mode"
-#: libexif/exif-entry.c:772
+#: libexif/exif-entry.c:773
msgid "Flash fired, auto mode, return light not detected"
msgstr "Flash fired, auto mode, return light not detected"
-#: libexif/exif-entry.c:774
+#: libexif/exif-entry.c:775
msgid "Flash fired, auto mode, return light detected"
msgstr "Flash fired, auto mode, return light detected"
-#: libexif/exif-entry.c:775
+#: libexif/exif-entry.c:776
msgid "No flash function"
msgstr "No flash function"
-#: libexif/exif-entry.c:776
+#: libexif/exif-entry.c:777
msgid "Flash fired, red-eye reduction mode"
msgstr "Flash fired, red-eye reduction mode"
-#: libexif/exif-entry.c:777
+#: libexif/exif-entry.c:778
msgid "Flash fired, red-eye reduction mode, return light not detected"
msgstr "Flash fired, red-eye reduction mode, return light not detected"
-#: libexif/exif-entry.c:779
+#: libexif/exif-entry.c:780
msgid "Flash fired, red-eye reduction mode, return light detected"
msgstr "Flash fired, red-eye reduction mode, return light detected"
-#: libexif/exif-entry.c:781
+#: libexif/exif-entry.c:782
msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
msgstr "Flash fired, compulsory flash mode, red-eye reduction mode"
-#: libexif/exif-entry.c:783
+#: libexif/exif-entry.c:784
msgid ""
"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
"detected"
"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
"detected"
-#: libexif/exif-entry.c:785
+#: libexif/exif-entry.c:786
msgid ""
"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
"detected"
"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
"detected"
-#: libexif/exif-entry.c:787
+#: libexif/exif-entry.c:788
msgid "Flash did not fire, auto mode, red-eye reduction mode"
msgstr "Flash did not fire, auto mode, red-eye reduction mode"
-#: libexif/exif-entry.c:788
+#: libexif/exif-entry.c:789
msgid "Flash fired, auto mode, red-eye reduction mode"
msgstr "Flash fired, auto mode, red-eye reduction mode"
-#: libexif/exif-entry.c:789
+#: libexif/exif-entry.c:790
msgid ""
"Flash fired, auto mode, return light not detected, red-eye reduction mode"
msgstr ""
"Flash fired, auto mode, return light not detected, red-eye reduction mode"
-#: libexif/exif-entry.c:791
+#: libexif/exif-entry.c:792
msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
-"Flash fired, auto mode, return light detected, red-eye reduction mode"
+msgstr "Flash fired, auto mode, return light detected, red-eye reduction mode"
-#: libexif/exif-entry.c:795
+#: libexif/exif-entry.c:796
msgid "?"
msgstr "?"
-#: libexif/exif-entry.c:797
+#: libexif/exif-entry.c:798
msgid "Close view"
msgstr "Close view"
-#: libexif/exif-entry.c:798
+#: libexif/exif-entry.c:799
msgid "Distant view"
msgstr "Distant view"
-#: libexif/exif-entry.c:798
+#: libexif/exif-entry.c:799
msgid "Distant"
msgstr "Distant"
-#: libexif/exif-entry.c:801
+#: libexif/exif-entry.c:802
msgid "sRGB"
msgstr "sRGB"
-#: libexif/exif-entry.c:802
+#: libexif/exif-entry.c:803
msgid "Adobe RGB"
msgstr "Adobe RGB"
-#: libexif/exif-entry.c:803
+#: libexif/exif-entry.c:804
msgid "Uncalibrated"
msgstr "Uncalibrated"
-#: libexif/exif-entry.c:857
+#: libexif/exif-entry.c:858
#, c-format
msgid "Invalid size of entry (%i, expected %li x %i)."
msgstr "Invalid size of entry (%i, expected %li x %i)."
-#: libexif/exif-entry.c:890
+#: libexif/exif-entry.c:891
msgid "Unsupported UNICODE string"
msgstr "Unsupported UNICODE string"
-#: libexif/exif-entry.c:898
+#: libexif/exif-entry.c:899
msgid "Unsupported JIS string"
msgstr "Unsupported JIS string"
-#: libexif/exif-entry.c:914
-msgid "Tag UserComment does not comply with standard but contains data."
-msgstr "Tag UserComment does not comply with standard but contains data."
+#: libexif/exif-entry.c:915
+#, fuzzy
+msgid "Tag UserComment contains data but is against specification."
+msgstr ""
+"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
+"the specification."
-#: libexif/exif-entry.c:918
+#: libexif/exif-entry.c:919
#, c-format
msgid "Byte at position %i: 0x%02x"
msgstr "Byte at position %i: 0x%02x"
-#: libexif/exif-entry.c:927
+#: libexif/exif-entry.c:928
msgid "Unknown Exif Version"
msgstr "Unknown Exif Version"
-#: libexif/exif-entry.c:931
+#: libexif/exif-entry.c:932
#, c-format
msgid "Exif Version %d.%d"
msgstr "Exif Version %d.%d"
-#: libexif/exif-entry.c:942
+#: libexif/exif-entry.c:943
msgid "FlashPix Version 1.0"
msgstr "FlashPix Version 1.0"
-#: libexif/exif-entry.c:944
+#: libexif/exif-entry.c:945
msgid "FlashPix Version 1.01"
msgstr "FlashPix Version 1.01"
-#: libexif/exif-entry.c:946
+#: libexif/exif-entry.c:947
msgid "Unknown FlashPix Version"
msgstr "Unknown FlashPix Version"
-#: libexif/exif-entry.c:959 libexif/exif-entry.c:972 libexif/exif-entry.c:1628
-#: libexif/exif-entry.c:1633 libexif/exif-entry.c:1637
-#: libexif/exif-entry.c:1642 libexif/exif-entry.c:1643
+#: libexif/exif-entry.c:960 libexif/exif-entry.c:973 libexif/exif-entry.c:1629
+#: libexif/exif-entry.c:1634 libexif/exif-entry.c:1638
+#: libexif/exif-entry.c:1643 libexif/exif-entry.c:1644
msgid "[None]"
msgstr "[None]"
-#: libexif/exif-entry.c:961
+#: libexif/exif-entry.c:962
msgid "(Photographer)"
msgstr "(Photographer)"
-#: libexif/exif-entry.c:975
+#: libexif/exif-entry.c:976
msgid "(Editor)"
msgstr "(Editor)"
-#: libexif/exif-entry.c:999 libexif/exif-entry.c:1079
-#: libexif/exif-entry.c:1096 libexif/exif-entry.c:1140
+#: libexif/exif-entry.c:1000 libexif/exif-entry.c:1080
+#: libexif/exif-entry.c:1097 libexif/exif-entry.c:1141
#, c-format
msgid "%.02f EV"
msgstr "%.02f EV"
-#: libexif/exif-entry.c:1000
+#: libexif/exif-entry.c:1001
#, c-format
msgid " (f/%.01f)"
msgstr " (f/%.01f)"
-#: libexif/exif-entry.c:1034
+#: libexif/exif-entry.c:1035
#, c-format
msgid " (35 equivalent: %d mm)"
msgstr " (35 equivalent: %d mm)"
-#: libexif/exif-entry.c:1067 libexif/exif-entry.c:1068
+#: libexif/exif-entry.c:1068 libexif/exif-entry.c:1069
msgid " sec."
msgstr " sec."
-#: libexif/exif-entry.c:1082
+#: libexif/exif-entry.c:1083
#, c-format
msgid " (1/%d sec.)"
msgstr " (1/%d sec.)"
-#: libexif/exif-entry.c:1084
+#: libexif/exif-entry.c:1085
#, c-format
msgid " (%d sec.)"
msgstr " (%d sec.)"
-#: libexif/exif-entry.c:1097
+#: libexif/exif-entry.c:1098
#, c-format
msgid " (%.02f cd/m^2)"
msgstr " (%.02f cd/m^2)"
-#: libexif/exif-entry.c:1107
+#: libexif/exif-entry.c:1108
msgid "DSC"
msgstr "DSC"
-#: libexif/exif-entry.c:1109 libexif/exif-entry.c:1149
-#: libexif/exif-entry.c:1236 libexif/exif-entry.c:1287
-#: libexif/exif-entry.c:1296 libexif/exif-entry.c:1332
+#: libexif/exif-entry.c:1110 libexif/exif-entry.c:1150
+#: libexif/exif-entry.c:1237 libexif/exif-entry.c:1288
+#: libexif/exif-entry.c:1297 libexif/exif-entry.c:1333
#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
#: libexif/pentax/mnote-pentax-entry.c:350
#: libexif/pentax/mnote-pentax-entry.c:359
msgid "Internal error (unknown value %i)"
msgstr "Internal error (unknown value %i)"
-#: libexif/exif-entry.c:1117
+#: libexif/exif-entry.c:1118
msgid "-"
msgstr "-"
-#: libexif/exif-entry.c:1118
+#: libexif/exif-entry.c:1119
msgid "Y"
msgstr "Y"
-#: libexif/exif-entry.c:1119
+#: libexif/exif-entry.c:1120
msgid "Cb"
msgstr "Cb"
-#: libexif/exif-entry.c:1120
+#: libexif/exif-entry.c:1121
msgid "Cr"
msgstr "Cr"
-#: libexif/exif-entry.c:1121
+#: libexif/exif-entry.c:1122
msgid "R"
msgstr "R"
-#: libexif/exif-entry.c:1122
+#: libexif/exif-entry.c:1123
msgid "G"
msgstr "G"
-#: libexif/exif-entry.c:1123
+#: libexif/exif-entry.c:1124
msgid "B"
msgstr "B"
-#: libexif/exif-entry.c:1124
+#: libexif/exif-entry.c:1125
msgid "Reserved"
msgstr "Reserved"
-#: libexif/exif-entry.c:1147
+#: libexif/exif-entry.c:1148
msgid "Directly photographed"
msgstr "Directly photographed"
-#: libexif/exif-entry.c:1160
+#: libexif/exif-entry.c:1161
msgid "YCbCr4:2:2"
msgstr "YCbCr4:2:2"
-#: libexif/exif-entry.c:1162
+#: libexif/exif-entry.c:1163
msgid "YCbCr4:2:0"
msgstr "YCbCr4:2:0"
-#: libexif/exif-entry.c:1179
+#: libexif/exif-entry.c:1180
#, c-format
msgid "Within distance %i of (x,y) = (%i,%i)"
msgstr "Within distance %i of (x,y) = (%i,%i)"
-#: libexif/exif-entry.c:1188
+#: libexif/exif-entry.c:1189
#, c-format
msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
msgstr "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
-#: libexif/exif-entry.c:1194
+#: libexif/exif-entry.c:1195
#, c-format
msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
msgstr "Unexpected number of components (%li, expected 2, 3, or 4)."
-#: libexif/exif-entry.c:1232
+#: libexif/exif-entry.c:1233
msgid "Sea level"
msgstr "Sea level"
-#: libexif/exif-entry.c:1234
+#: libexif/exif-entry.c:1235
msgid "Sea level reference"
msgstr "Sea level reference"
-#: libexif/exif-entry.c:1342
+#: libexif/exif-entry.c:1343
#, c-format
msgid "Unknown value %i"
msgstr "Unknown value %i"
msgstr "Reference for Distance to Destination"
#: libexif/exif-tag.c:194
+#, fuzzy
msgid ""
"Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and knots."
+"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
msgstr ""
"Indicates the unit used to express the distance to the destination point. "
"'K', 'M' and 'N' represent kilometers, miles and knots."
#: libexif/exif-tag.c:359
msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
-"Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
+msgstr "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
#: libexif/exif-tag.c:362
msgid "Transfer Range"
"those in <ImageDescription>, and without the character code limitations of "
"the <ImageDescription> tag. The character code used in the <UserComment> tag "
"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL "
-"(\"00.h\"). ID codes are assigned by means of registration. The designation "
-"method and references for each character code are defined in the "
-"specification. The value of CountN is determined based on the 8 bytes in the "
-"character code area and the number of bytes in the user comment part. Since "
-"the TYPE is not ASCII, NULL termination is not necessary. The ID code for "
-"the <UserComment> area may be a Defined code such as JIS or ASCII, or may be "
-"Undefined. The Undefined name is UndefinedText, and the ID code is filled "
-"with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the "
-"<UserComment> tag must have a function for determining the ID code. This "
-"function is not required in Exif readers that do not use the <UserComment> "
-"tag. When a <UserComment> area is set aside, it is recommended that the ID "
-"code be ASCII and that the following user comment part be filled with blank "
-"characters [20.H]."
+"tag data area. The unused portion of the area is padded with NULL (\"00.h"
+"\"). ID codes are assigned by means of registration. The designation method "
+"and references for each character code are defined in the specification. The "
+"value of CountN is determined based on the 8 bytes in the character code "
+"area and the number of bytes in the user comment part. Since the TYPE is not "
+"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
+"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
+"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
+"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
+"must have a function for determining the ID code. This function is not "
+"required in Exif readers that do not use the <UserComment> tag. When a "
+"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
+"and that the following user comment part be filled with blank characters [20."
+"H]."
msgstr ""
"A tag for Exif users to write keywords or comments on the image besides "
"those in <ImageDescription>, and without the character code limitations of "
"the <ImageDescription> tag. The character code used in the <UserComment> tag "
"is identified based on an ID code in a fixed 8-byte area at the start of the "
-"tag data area. The unused portion of the area is padded with NULL "
-"(\"00.h\"). ID codes are assigned by means of registration. The designation "
-"method and references for each character code are defined in the "
-"specification. The value of CountN is determined based on the 8 bytes in the "
-"character code area and the number of bytes in the user comment part. Since "
-"the TYPE is not ASCII, NULL termination is not necessary. The ID code for "
-"the <UserComment> area may be a Defined code such as JIS or ASCII, or may be "
-"Undefined. The Undefined name is UndefinedText, and the ID code is filled "
-"with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the "
-"<UserComment> tag must have a function for determining the ID code. This "
-"function is not required in Exif readers that do not use the <UserComment> "
-"tag. When a <UserComment> area is set aside, it is recommended that the ID "
-"code be ASCII and that the following user comment part be filled with blank "
-"characters [20.H]."
+"tag data area. The unused portion of the area is padded with NULL (\"00.h"
+"\"). ID codes are assigned by means of registration. The designation method "
+"and references for each character code are defined in the specification. The "
+"value of CountN is determined based on the 8 bytes in the character code "
+"area and the number of bytes in the user comment part. Since the TYPE is not "
+"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
+"area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
+"Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
+"all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
+"must have a function for determining the ID code. This function is not "
+"required in Exif readers that do not use the <UserComment> tag. When a "
+"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
+"and that the following user comment part be filled with blank characters [20."
+"H]."
#: libexif/exif-tag.c:619
msgid "Sub-second Time"
msgstr "XP Title"
#: libexif/exif-tag.c:635
-msgid ""
-"A character string giving the title of the image, encoded in UTF-16LE."
-msgstr ""
-"A character string giving the title of the image, encoded in UTF-16LE."
+msgid "A character string giving the title of the image, encoded in UTF-16LE."
+msgstr "A character string giving the title of the image, encoded in UTF-16LE."
#: libexif/exif-tag.c:639
msgid "XP Comment"
"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
"one file as in [2] or [3], the above format is used to record just one audio "
"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file "
-"\"DSC00001.JPG\" only \"SND00001.WAV\" is given as the related Exif audio "
-"file. When there are three Exif audio files \"SND00001.WAV\", "
-"\"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of "
-"them, \"DSC00001.JPG\", is indicated. By combining multiple relational "
-"information, a variety of playback possibilities can be supported. The "
-"method of using relational information is left to the implementation on the "
-"playback side. Since this information is an ASCII character string, it is "
-"terminated by NULL. When this tag is used to map audio files, the relation "
-"of the audio file to image data must also be indicated on the audio file end."
+"given. In the case of [3], for example, for the Exif image file \"DSC00001."
+"JPG\" only \"SND00001.WAV\" is given as the related Exif audio file. When "
+"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
+"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
+"\", is indicated. By combining multiple relational information, a variety of "
+"playback possibilities can be supported. The method of using relational "
+"information is left to the implementation on the playback side. Since this "
+"information is an ASCII character string, it is terminated by NULL. When "
+"this tag is used to map audio files, the relation of the audio file to image "
+"data must also be indicated on the audio file end."
msgstr ""
"This tag is used to record the name of an audio file related to the image "
"data. The only relational information recorded here is the Exif audio file "
"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
"one file as in [2] or [3], the above format is used to record just one audio "
"file name. If there are multiple audio files, the first recorded file is "
-"given. In the case of [3], for example, for the Exif image file "
-"\"DSC00001.JPG\" only \"SND00001.WAV\" is given as the related Exif audio "
-"file. When there are three Exif audio files \"SND00001.WAV\", "
-"\"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of "
-"them, \"DSC00001.JPG\", is indicated. By combining multiple relational "
-"information, a variety of playback possibilities can be supported. The "
-"method of using relational information is left to the implementation on the "
-"playback side. Since this information is an ASCII character string, it is "
-"terminated by NULL. When this tag is used to map audio files, the relation "
-"of the audio file to image data must also be indicated on the audio file end."
+"given. In the case of [3], for example, for the Exif image file \"DSC00001."
+"JPG\" only \"SND00001.WAV\" is given as the related Exif audio file. When "
+"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
+"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
+"\", is indicated. By combining multiple relational information, a variety of "
+"playback possibilities can be supported. The method of using relational "
+"information is left to the implementation on the playback side. Since this "
+"information is an ASCII character string, it is terminated by NULL. When "
+"this tag is used to map audio files, the relation of the audio file to image "
+"data must also be indicated on the audio file end."
#: libexif/exif-tag.c:719
msgid "Interoperability IFD Pointer"
"different exposure settings."
#: libexif/exif-tag.c:801
-msgid ""
-"This tag indicates the white balance mode set when the image was shot."
-msgstr ""
-"This tag indicates the white balance mode set when the image was shot."
+msgid "This tag indicates the white balance mode set when the image was shot."
+msgstr "This tag indicates the white balance mode set when the image was shot."
#: libexif/exif-tag.c:805
msgid "Digital Zoom Ratio"
msgid "20 frames/sec"
msgstr "20 frames/sec"
-#: libexif/olympus/mnote-olympus-entry.c:375
+#: libexif/olympus/mnote-olympus-entry.c:378
#, c-format
msgid "Red Correction %f, blue Correction %f"
msgstr "Red Correction %f, blue Correction %f"
-#: libexif/olympus/mnote-olympus-entry.c:383
+#: libexif/olympus/mnote-olympus-entry.c:386
#, c-format
msgid "%2.2f meters"
msgstr "%2.2f metres"
-#: libexif/olympus/mnote-olympus-entry.c:385
+#: libexif/olympus/mnote-olympus-entry.c:388
msgid "No manual focus selection"
msgstr "No manual focus selection"
-#: libexif/olympus/mnote-olympus-entry.c:411
+#: libexif/olympus/mnote-olympus-entry.c:414
msgid "AF position: center"
msgstr "AF position: centre"
-#: libexif/olympus/mnote-olympus-entry.c:412
+#: libexif/olympus/mnote-olympus-entry.c:415
msgid "AF position: top"
msgstr "AF position: top"
-#: libexif/olympus/mnote-olympus-entry.c:413
+#: libexif/olympus/mnote-olympus-entry.c:416
msgid "AF position: bottom"
msgstr "AF position: bottom"
-#: libexif/olympus/mnote-olympus-entry.c:414
+#: libexif/olympus/mnote-olympus-entry.c:417
msgid "AF position: left"
msgstr "AF position: left"
-#: libexif/olympus/mnote-olympus-entry.c:415
+#: libexif/olympus/mnote-olympus-entry.c:418
msgid "AF position: right"
msgstr "AF position: right"
-#: libexif/olympus/mnote-olympus-entry.c:416
+#: libexif/olympus/mnote-olympus-entry.c:419
msgid "AF position: upper-left"
msgstr "AF position: upper-left"
-#: libexif/olympus/mnote-olympus-entry.c:417
+#: libexif/olympus/mnote-olympus-entry.c:420
msgid "AF position: upper-right"
msgstr "AF position: upper-right"
-#: libexif/olympus/mnote-olympus-entry.c:418
+#: libexif/olympus/mnote-olympus-entry.c:421
msgid "AF position: lower-left"
msgstr "AF position: lower-left"
-#: libexif/olympus/mnote-olympus-entry.c:419
+#: libexif/olympus/mnote-olympus-entry.c:422
msgid "AF position: lower-right"
msgstr "AF position: lower-right"
-#: libexif/olympus/mnote-olympus-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:423
msgid "AF position: far left"
msgstr "AF position: far left"
-#: libexif/olympus/mnote-olympus-entry.c:421
+#: libexif/olympus/mnote-olympus-entry.c:424
msgid "AF position: far right"
msgstr "AF position: far right"
-#: libexif/olympus/mnote-olympus-entry.c:422
+#: libexif/olympus/mnote-olympus-entry.c:425
msgid "Unknown AF position"
msgstr "Unknown AF position"
-#: libexif/olympus/mnote-olympus-entry.c:433
-#: libexif/olympus/mnote-olympus-entry.c:503
+#: libexif/olympus/mnote-olympus-entry.c:436
+#: libexif/olympus/mnote-olympus-entry.c:506
#, c-format
msgid "Internal error (unknown value %hi)"
msgstr "Internal error (unknown value %hi)"
-#: libexif/olympus/mnote-olympus-entry.c:441
-#: libexif/olympus/mnote-olympus-entry.c:511
+#: libexif/olympus/mnote-olympus-entry.c:444
+#: libexif/olympus/mnote-olympus-entry.c:514
#, c-format
msgid "Unknown value %hi"
msgstr "Unknown value %hi"
-#: libexif/olympus/mnote-olympus-entry.c:536
-#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/olympus/mnote-olympus-entry.c:539
+#: libexif/olympus/mnote-olympus-entry.c:559
#, c-format
msgid "Unknown %hu"
msgstr "Unknown %hu"
-#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/olympus/mnote-olympus-entry.c:556
msgid "2 sec."
msgstr "2 sec."
-#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/olympus/mnote-olympus-entry.c:595
msgid "Fast"
msgstr "Fast"
-#: libexif/olympus/mnote-olympus-entry.c:696
+#: libexif/olympus/mnote-olympus-entry.c:699
msgid "Automatic"
msgstr "Automatic"
-#: libexif/olympus/mnote-olympus-entry.c:726
+#: libexif/olympus/mnote-olympus-entry.c:729
#, c-format
msgid "Manual: %liK"
msgstr "Manual: %liK"
-#: libexif/olympus/mnote-olympus-entry.c:729
+#: libexif/olympus/mnote-olympus-entry.c:732
msgid "Manual: unknown"
msgstr "Manual: unknown"
-#: libexif/olympus/mnote-olympus-entry.c:735
+#: libexif/olympus/mnote-olympus-entry.c:738
msgid "One-touch"
msgstr "One-touch"
-#: libexif/olympus/mnote-olympus-entry.c:791
-#: libexif/olympus/mnote-olympus-entry.c:801
+#: libexif/olympus/mnote-olympus-entry.c:794
+#: libexif/olympus/mnote-olympus-entry.c:804
msgid "Infinite"
msgstr "Infinite"
-#: libexif/olympus/mnote-olympus-entry.c:809
+#: libexif/olympus/mnote-olympus-entry.c:812
#, c-format
msgid "%i bytes unknown data: "
msgstr "%i bytes unknown data: "
#: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"
+
+#~ msgid "Tag UserComment does not comply with standard but contains data."
+#~ msgstr "Tag UserComment does not comply with standard but contains data."
projects / platform / upstream / libexif.git / blobdiff