diff options
author | Julien Valroff <julien@kirya.net> | 2011-05-23 21:05:08 +0200 |
---|---|---|
committer | Julien Valroff <julien@kirya.net> | 2011-05-23 21:05:08 +0200 |
commit | 85952027591c5da285f924e4d2d013a4493c1845 (patch) | |
tree | d234ed0ee5e97c29f666d0d9580584efb5c8441e /rapid/generatenameconfig.py | |
parent | 18c39a3fad0f9bf92840f79bcea5d72ed396403d (diff) | |
parent | b494e83efd647b035c6bee2fa09a33fa383ef4a3 (diff) |
Merge commit 'upstream/0.4.1'
Diffstat (limited to 'rapid/generatenameconfig.py')
-rw-r--r-- | rapid/generatenameconfig.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rapid/generatenameconfig.py b/rapid/generatenameconfig.py index 321761e..4d1f75c 100644 --- a/rapid/generatenameconfig.py +++ b/rapid/generatenameconfig.py @@ -69,6 +69,8 @@ SHORT_CAMERA_MODEL_HYPHEN = 'Hyphenated short camera model' SERIAL_NUMBER = 'Serial number' SHUTTER_COUNT = 'Shutter count' OWNER_NAME = 'Owner name' +COPYRIGHT = 'Copyright' +ARTIST = 'Artist' # Video metadata CODEC = 'Codec' @@ -189,6 +191,8 @@ class i18TranslateMeThanks: _('Height') _('Length') _('Frames Per Second') + _('Artist') + _('Copyright') # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers _('Downloads today') # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers @@ -364,7 +368,9 @@ LIST_METADATA_L1 = [APERTURE, ISO, EXPOSURE_TIME, FOCAL_LENGTH, SHORT_CAMERA_MODEL_HYPHEN, SERIAL_NUMBER, SHUTTER_COUNT, - OWNER_NAME] + OWNER_NAME, + ARTIST, + COPYRIGHT] LIST_VIDEO_METADATA_L1 = [CODEC, WIDTH, HEIGHT, LENGTH, FPS] @@ -380,6 +386,8 @@ DICT_METADATA_L1 = { SERIAL_NUMBER: None, SHUTTER_COUNT: LIST_SHUTTER_COUNT_L2, OWNER_NAME: LIST_CASE_L2, + ARTIST: LIST_CASE_L2, + COPYRIGHT: LIST_CASE_L2, ORDER_KEY: LIST_METADATA_L1 } |