diff --git a/500pxExportServiceProvider.lua b/500pxExportServiceProvider.lua index dba0300..e4d0594 100755 --- a/500pxExportServiceProvider.lua +++ b/500pxExportServiceProvider.lua @@ -227,7 +227,7 @@ function exportServiceProvider.sectionsForTopOfDialog( f, propertyTable ) f:static_text { width = 100, fill_horizontal = 1, - title = "Photos that are uploaded with a title, category and at least three tags will go into the fresh feed where other photographers can easily find them. Use Lightroom's Metadata sidebar to set these.", + title = "Photos that are uploaded with a title, category, and at least three tags will go into the Fresh feed where other photographers can easily find them. Use Lightroom's Metadata sidebar to set these.", height_in_lines = 2, }, f:checkbox { @@ -323,32 +323,32 @@ function exportServiceProvider.sectionsForTopOfDialog( f, propertyTable ) items = { { value = 10, title="Abstract" }, { value = 11, title="Animals" }, - { value = 5, title="Black and White" }, - { value = 1, title="Celebrities" }, - { value = 9, title="City and Architecture" }, + { value = 5, title="Black and White" }, + { value = 1, title="Celebrities" }, + { value = 9, title="City and Architecture" }, { value = 15, title="Commercial" }, { value = 16, title="Concert" }, { value = 20, title="Family" }, { value = 14, title="Fashion" }, - { value = 2, title="Film" }, + { value = 2, title="Film" }, { value = 24, title="Fine Art" }, { value = 23, title="Food" }, - { value = 3, title="Journalism" }, - { value = 8, title="Landscapes" }, + { value = 3, title="Journalism" }, + { value = 8, title="Landscapes" }, { value = 12, title="Macro" }, { value = 18, title="Nature" }, - { value = 4, title="Nude" }, - { value = 7, title="People" }, + { value = 4, title="Nude" }, + { value = 7, title="People" }, { value = 19, title="Performing Arts" }, { value = 17, title="Sport" }, - { value = 6, title="Still Life" }, + { value = 6, title="Still Life" }, { value = 21, title="Street" }, { value = 26, title="Transportation" }, { value = 13, title="Travel" }, { value = 22, title="Underwater" }, { value = 27, title="Urban Exploration" }, { value = 25, title="Wedding" }, - { value = 0, title="Uncategorized" } + { value = 0, title="Uncategorized" } }, value = bind "category" }, @@ -897,9 +897,9 @@ function exportServiceProvider.processRenderedPhotos( functionContext, exportCon end if freshSkipped == 1 then - LrDialogs.message("Skipped photos", freshSkipped .. " photo was skipped because it doesn't have a title, category or three keywords.") + LrDialogs.message("Photo not published", freshSkipped .. " photo was skipped because it doesn't have a title, category or three keywords.") elseif freshSkipped > 1 then - LrDialogs.message("Skipped photos", freshSkipped .. " photos were skipped because they don't have a title, category or three keywords.") + LrDialogs.message("Photos not published", freshSkipped .. " photos were skipped because they don't have a title, category or three keywords.") end end diff --git a/500pxPublishSupport.lua b/500pxPublishSupport.lua index e68702e..2e117e5 100755 --- a/500pxPublishSupport.lua +++ b/500pxPublishSupport.lua @@ -17,7 +17,7 @@ require "500pxAPI" local publishServiceProvider = {} -publishServiceProvider.small_icon = "500px_icon.png" +publishServiceProvider.small_icon = "images/500px_icon.png" -- Description entry in the Publish Manager dialog, if the user does not provide one. publishServiceProvider.publish_fallbackNameBinding = "username" diff --git a/500pxUser.lua b/500pxUser.lua index 1f9a1c1..09cf5a6 100755 --- a/500pxUser.lua +++ b/500pxUser.lua @@ -571,7 +571,7 @@ function PxUser.register( propertyTable ) spacing = f:control_spacing(), fill = 1, f:picture { - value = _PLUGIN:resourceId( "registration.png" ) + value = _PLUGIN:resourceId( "/images/registration.png" ) }, f:column { fill = 1, @@ -719,7 +719,7 @@ function PxUser.verifyLogin( propertyTable ) propertyTable.validAccount = true end elseif not storedCredentialsAreValid( propertyTable ) then - logger:trace("Credential are not valid") + logger:trace("Credentials are not valid") notLoggedIn( propertyTable ) end PxUser.updateUserStatusTextBindings( propertyTable ) @@ -787,13 +787,13 @@ function PxUser.updateUserStatusTextBindings( propertyTable ) end if userinfo and userinfo.upgrade_status == 0 then - propertyTable.accountTypeMessage = "You have a free account. You can upload 20 images per 7 day period. Upgrade to Plus or Awesome to have unlimited uploads, collections and more." + propertyTable.accountTypeMessage = "You have a free account. You can upload 20 images per 7 day period. Upgrade to Plus or Awesome to have unlimited uploads, advanced statistics, and more." elseif userinfo and userinfo.upgrade_status == 1 then - propertyTable.accountTypeMessage = "You have a Plus account. You have unlimited uploads and sets. To create a portfolio, upgrade to Awesome." + propertyTable.accountTypeMessage = "You have a Plus account. You have unlimited uploads. To create a portfolio, upgrade to Awesome." elseif userinfo then - propertyTable.accountTypeMessage = "You are awesome and have unlimited uploads and sets." + propertyTable.accountTypeMessage = "You are awesome and have unlimited uploads." end end ) diff --git a/Info.lua b/Info.lua index 23eb3e8..727f971 100755 --- a/Info.lua +++ b/Info.lua @@ -8,7 +8,7 @@ return { LrExportServiceProvider = { title = "500px", file = "500pxExportServiceProvider.lua", - image = "500px.png", + image = "images/500px.png", }, LrMetadataTagsetFactory = "500pxTagset.lua", LrMetadataProvider = "500pxMetadataDefinition.lua", diff --git a/build.sh b/build.sh index a357c8c..951ce4e 100755 --- a/build.sh +++ b/build.sh @@ -40,7 +40,7 @@ echo -e "\tLrInitPlugin = \"PluginInit.lua\"," >> "$BUILD_DIR/Info.lua" echo -e "\tLrPluginInfoUrl = \"http://500px.com/lightroom\"," >> "$BUILD_DIR/Info.lua" echo -e "\tLrExportServiceProvider = {" >> "$BUILD_DIR/Info.lua" echo -e "\t\ttitle = \"500px\"," >> "$BUILD_DIR/Info.lua" -echo -e "\t\timage = \"500px.png\"," >> "$BUILD_DIR/Info.lua" +echo -e "\t\timage = \"images/500px.png\"," >> "$BUILD_DIR/Info.lua" echo -e "\t\tfile = \"500pxExportServiceProvider.lua\"," >> "$BUILD_DIR/Info.lua" echo -e "\t}," >> "$BUILD_DIR/Info.lua" echo -e "\tLrMetadataTagsetFactory = \"500pxTagset.lua\"," >> "$BUILD_DIR/Info.lua" diff --git a/500px.png b/images/500px.png similarity index 100% rename from 500px.png rename to images/500px.png diff --git a/500px_icon.png b/images/500px_icon.png similarity index 100% rename from 500px_icon.png rename to images/500px_icon.png diff --git a/login.png b/images/login.png similarity index 100% rename from login.png rename to images/login.png diff --git a/registration.png b/images/registration.png similarity index 100% rename from registration.png rename to images/registration.png