From 41c6b228f51f6423e1820f6e0dcc39c92804e0a0 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Thu, 23 Jan 2014 17:08:42 +0000
Subject: [PATCH] Updated text domains

---
 .../admin/class-wp-job-manager-addons.php     |   2 +-
 includes/admin/class-wp-job-manager-admin.php |   4 +-
 includes/admin/class-wp-job-manager-cpt.php   |  24 +-
 .../admin/class-wp-job-manager-settings.php   |  50 +-
 .../class-wp-job-manager-writepanels.php      |  38 +-
 includes/class-wp-job-manager-ajax.php        |   8 +-
 includes/class-wp-job-manager-geocode.php     |   4 +-
 includes/class-wp-job-manager-post-types.php  |  84 +-
 includes/class-wp-job-manager-shortcodes.php  |  18 +-
 includes/class-wp-job-manager-widgets.php     |  10 +-
 .../class-wp-job-manager-form-edit-job.php    |   6 +-
 .../class-wp-job-manager-form-submit-job.php  |  54 +-
 languages/wp-job-manager.pot                  | 889 ++++++++++++++++++
 readme.txt                                    |   5 +-
 templates/account-signin.php                  |  16 +-
 templates/content-job_listing.php             |   2 +-
 templates/content-single-job_listing.php      |   8 +-
 templates/content-summary-job_listing.php     |   2 +-
 templates/form-fields/file-field.php          |   4 +-
 templates/job-application.php                 |   8 +-
 templates/job-dashboard.php                   |  22 +-
 templates/job-filters.php                     |  12 +-
 templates/job-submit.php                      |   6 +-
 templates/job-submitted.php                   |   4 +-
 wp-job-manager-functions.php                  |   8 +-
 wp-job-manager-template.php                   |  10 +-
 wp-job-manager.php                            |   8 +-
 27 files changed, 1099 insertions(+), 207 deletions(-)
 create mode 100644 languages/wp-job-manager.pot

diff --git a/includes/admin/class-wp-job-manager-addons.php b/includes/admin/class-wp-job-manager-addons.php
index 44a4bd915..afc20c8ff 100644
--- a/includes/admin/class-wp-job-manager-addons.php
+++ b/includes/admin/class-wp-job-manager-addons.php
@@ -47,7 +47,7 @@ public function output() {
 		?>
 		<div class="wrap wp_job_manager wp_job_manager_addons_wrap">
 			<div class="icon32 icon32-posts-job_listing" id="icon-edit"><br /></div>
-			<h2><?php _e( 'WP Job Manager Add-ons', 'job_manager' ); ?></h2>
+			<h2><?php _e( 'WP Job Manager Add-ons', 'wp-job-manager' ); ?></h2>
 			<?php echo $addons; ?>
 		</div>
 		<?php
diff --git a/includes/admin/class-wp-job-manager-admin.php b/includes/admin/class-wp-job-manager-admin.php
index 8ecbbfb78..176657fe6 100644
--- a/includes/admin/class-wp-job-manager-admin.php
+++ b/includes/admin/class-wp-job-manager-admin.php
@@ -49,10 +49,10 @@ public function admin_enqueue_scripts() {
 	 * @return void
 	 */
 	public function admin_menu() {
-		add_submenu_page( 'edit.php?post_type=job_listing', __( 'Settings', 'job_manager' ), __( 'Settings', 'job_manager' ), 'manage_options', 'job-manager-settings', array( $this->settings_page, 'output' ) );
+		add_submenu_page( 'edit.php?post_type=job_listing', __( 'Settings', 'wp-job-manager' ), __( 'Settings', 'wp-job-manager' ), 'manage_options', 'job-manager-settings', array( $this->settings_page, 'output' ) );
 
 		if ( apply_filters( 'job_manager_show_addons_page', true ) )
-			add_submenu_page(  'edit.php?post_type=job_listing', __( 'WP Job Manager Add-ons', 'job_manager' ),  __( 'Add-ons', 'job_manager' ) , 'manage_options', 'job-manager-addons', array( $this, 'addons_page' ) );
+			add_submenu_page(  'edit.php?post_type=job_listing', __( 'WP Job Manager Add-ons', 'wp-job-manager' ),  __( 'Add-ons', 'wp-job-manager' ) , 'manage_options', 'job-manager-addons', array( $this, 'addons_page' ) );
 	}
 
 	/**
diff --git a/includes/admin/class-wp-job-manager-cpt.php b/includes/admin/class-wp-job-manager-cpt.php
index 796dfabb9..3287f1e29 100644
--- a/includes/admin/class-wp-job-manager-cpt.php
+++ b/includes/admin/class-wp-job-manager-cpt.php
@@ -40,8 +40,8 @@ public function add_bulk_actions() {
 			?>
 			<script type="text/javascript">
 		      jQuery(document).ready(function() {
-		        jQuery('<option>').val('approve_jobs').text('<?php _e( 'Approve Jobs', 'job_manager' )?>').appendTo("select[name='action']");
-		        jQuery('<option>').val('approve_jobs').text('<?php _e( 'Approve Jobs', 'job_manager' )?>').appendTo("select[name='action2']");
+		        jQuery('<option>').val('approve_jobs').text('<?php _e( 'Approve Jobs', 'wp-job-manager' )?>').appendTo("select[name='action']");
+		        jQuery('<option>').val('approve_jobs').text('<?php _e( 'Approve Jobs', 'wp-job-manager' )?>').appendTo("select[name='action2']");
 		      });
 		    </script>
 		    <?php
@@ -109,9 +109,9 @@ public function approved_notice() {
 				$titles        = array();
 				foreach ( $approved_jobs as $job_id )
 					$titles[] = get_the_title( $job_id );
-				echo '<div class="updated"><p>' . sprintf( __( '%s approved', 'job_manager' ), '&quot;' . implode( '&quot;, &quot;', $titles ) . '&quot;' ) . '</p></div>';
+				echo '<div class="updated"><p>' . sprintf( __( '%s approved', 'wp-job-manager' ), '&quot;' . implode( '&quot;, &quot;', $titles ) . '&quot;' ) . '</p></div>';
 			} else {
-				echo '<div class="updated"><p>' . sprintf( __( '%s approved', 'job_manager' ), '&quot;' . get_the_title( $approved_jobs ) . '&quot;' ) . '</p></div>';
+				echo '<div class="updated"><p>' . sprintf( __( '%s approved', 'wp-job-manager' ), '&quot;' . get_the_title( $approved_jobs ) . '&quot;' ) . '</p></div>';
 			}
 		}
 	}
@@ -264,7 +264,7 @@ public function custom_columns( $column ) {
 			break;
 			case "job_position" :
 				echo '<div class="job_position">';
-				echo '<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" class="tips job_title" data-tip="' . sprintf( __( 'Job ID: %d', 'job_manager' ), $post->ID ) . '">' . $post->post_title . '</a>';
+				echo '<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" class="tips job_title" data-tip="' . sprintf( __( 'Job ID: %d', 'wp-job-manager' ), $post->ID ) . '">' . $post->post_title . '</a>';
 
 				echo '<div class="location">';
 
@@ -290,12 +290,12 @@ public function custom_columns( $column ) {
 				if ( is_position_featured( $post ) ) echo '&#10004;'; else echo '&ndash;';
 			break;
 			case "job_posted" :
-				echo '<strong>' . date_i18n( __( 'M j, Y', 'job_manager' ), strtotime( $post->post_date ) ) . '</strong><span>';
-				echo ( empty( $post->post_author ) ? __( 'by a guest', 'job_manager' ) : sprintf( __( 'by %s', 'job_manager' ), '<a href="' . get_edit_user_link( $post->post_author ) . '">' . get_the_author() . '</a>' ) ) . '</span>';
+				echo '<strong>' . date_i18n( __( 'M j, Y', 'wp-job-manager' ), strtotime( $post->post_date ) ) . '</strong><span>';
+				echo ( empty( $post->post_author ) ? __( 'by a guest', 'wp-job-manager' ) : sprintf( __( 'by %s', 'wp-job-manager' ), '<a href="' . get_edit_user_link( $post->post_author ) . '">' . get_the_author() . '</a>' ) ) . '</span>';
 			break;
 			case "job_expires" :
 				if ( $post->_job_expires )
-					echo '<strong>' . date_i18n( __( 'M j, Y', 'job_manager' ), strtotime( $post->_job_expires ) ) . '</strong>';
+					echo '<strong>' . date_i18n( __( 'M j, Y', 'wp-job-manager' ), strtotime( $post->_job_expires ) ) . '</strong>';
 				else
 					echo '&ndash;';
 			break;
@@ -308,24 +308,24 @@ public function custom_columns( $column ) {
 				if ( $post->post_status == 'pending' ) {
 					$admin_actions['approve']   = array(
 						'action'  => 'approve',
-						'name'    => __( 'Approve', 'job_manager' ),
+						'name'    => __( 'Approve', 'wp-job-manager' ),
 						'url'     =>  wp_nonce_url( add_query_arg( 'approve_job', $post->ID ), 'approve_job' )
 					);
 				}
 				if ( $post->post_status !== 'trash' ) {
 					$admin_actions['view']   = array(
 						'action'  => 'view',
-						'name'    => __( 'View', 'job_manager' ),
+						'name'    => __( 'View', 'wp-job-manager' ),
 						'url'     => get_permalink( $post->ID )
 					);
 					$admin_actions['edit']   = array(
 						'action'  => 'edit',
-						'name'    => __( 'Edit', 'job_manager' ),
+						'name'    => __( 'Edit', 'wp-job-manager' ),
 						'url'     => get_edit_post_link( $post->ID )
 					);
 					$admin_actions['delete'] = array(
 						'action'  => 'delete',
-						'name'    => __( 'Delete', 'job_manager' ),
+						'name'    => __( 'Delete', 'wp-job-manager' ),
 						'url'     => get_delete_post_link( $post->ID )
 					);
 				}
diff --git a/includes/admin/class-wp-job-manager-settings.php b/includes/admin/class-wp-job-manager-settings.php
index 0730dda29..c66fb0330 100644
--- a/includes/admin/class-wp-job-manager-settings.php
+++ b/includes/admin/class-wp-job-manager-settings.php
@@ -28,78 +28,78 @@ protected function init_settings() {
 		$this->settings = apply_filters( 'job_manager_settings',
 			array(
 				'job_listings' => array(
-					__( 'Job Listings', 'job_manager' ),
+					__( 'Job Listings', 'wp-job-manager' ),
 					array(
 						array(
 							'name'        => 'job_manager_per_page',
 							'std'         => '10',
 							'placeholder' => '',
-							'label'       => __( 'Jobs per page', 'job_manager' ),
-							'desc'        => __( 'How many jobs should be shown per page by default?', 'job_manager' ),
+							'label'       => __( 'Jobs per page', 'wp-job-manager' ),
+							'desc'        => __( 'How many jobs should be shown per page by default?', 'wp-job-manager' ),
 							'attributes'  => array()
 						),
 						array(
 							'name'       => 'job_manager_hide_filled_positions',
 							'std'        => '0',
-							'label'      => __( 'Filled positions', 'job_manager' ),
-							'cb_label'   => __( 'Hide filled positions', 'job_manager' ),
-							'desc'       => __( 'If enabled, filled positions will be hidden from the job list.', 'job_manager' ),
+							'label'      => __( 'Filled positions', 'wp-job-manager' ),
+							'cb_label'   => __( 'Hide filled positions', 'wp-job-manager' ),
+							'desc'       => __( 'If enabled, filled positions will be hidden from the job list.', 'wp-job-manager' ),
 							'type'       => 'checkbox',
 							'attributes' => array()
 						),
 						array(
 							'name'       => 'job_manager_enable_categories',
 							'std'        => '0',
-							'label'      => __( 'Job categories', 'job_manager' ),
-							'cb_label'   => __( 'Enable job categories', 'job_manager' ),
-							'desc'       => __( 'Choose whether to enable job categories. Categories must be setup by an admin for users to choose during job submission.', 'job_manager' ),
+							'label'      => __( 'Job categories', 'wp-job-manager' ),
+							'cb_label'   => __( 'Enable job categories', 'wp-job-manager' ),
+							'desc'       => __( 'Choose whether to enable job categories. Categories must be setup by an admin for users to choose during job submission.', 'wp-job-manager' ),
 							'type'       => 'checkbox',
 							'attributes' => array()
 						),
 					),
 				),
 				'job_submission' => array(
-					__( 'Job Submission', 'job_manager' ),
+					__( 'Job Submission', 'wp-job-manager' ),
 					array(
 						array(
 							'name'       => 'job_manager_enable_registration',
 							'std'        => '1',
-							'label'      => __( 'Account creation', 'job_manager' ),
-							'cb_label'   => __( 'Allow account creation', 'job_manager' ),
-							'desc'       => __( 'If enabled, non-logged in users will be able to create an account by entering their email address on the job submission form.', 'job_manager' ),
+							'label'      => __( 'Account creation', 'wp-job-manager' ),
+							'cb_label'   => __( 'Allow account creation', 'wp-job-manager' ),
+							'desc'       => __( 'If enabled, non-logged in users will be able to create an account by entering their email address on the job submission form.', 'wp-job-manager' ),
 							'type'       => 'checkbox',
 							'attributes' => array()
 						),
 						array(
 							'name'       => 'job_manager_user_requires_account',
 							'std'        => '1',
-							'label'      => __( 'Account required', 'job_manager' ),
-							'cb_label'   => __( 'Job submission requires an account', 'job_manager' ),
-							'desc'       => __( 'If disabled, non-logged in users will be able to submit job listings without creating an account.', 'job_manager' ),
+							'label'      => __( 'Account required', 'wp-job-manager' ),
+							'cb_label'   => __( 'Job submission requires an account', 'wp-job-manager' ),
+							'desc'       => __( 'If disabled, non-logged in users will be able to submit job listings without creating an account.', 'wp-job-manager' ),
 							'type'       => 'checkbox',
 							'attributes' => array()
 						),
 						array(
 							'name'       => 'job_manager_submission_requires_approval',
 							'std'        => '1',
-							'label'      => __( 'Approval Required', 'job_manager' ),
-							'cb_label'   => __( 'New submissions require admin approval', 'job_manager' ),
-							'desc'       => __( 'If enabled, new submissions will be inactive, pending admin approval.', 'job_manager' ),
+							'label'      => __( 'Approval Required', 'wp-job-manager' ),
+							'cb_label'   => __( 'New submissions require admin approval', 'wp-job-manager' ),
+							'desc'       => __( 'If enabled, new submissions will be inactive, pending admin approval.', 'wp-job-manager' ),
 							'type'       => 'checkbox',
 							'attributes' => array()
 						),
 						array(
 							'name'       => 'job_manager_submission_duration',
 							'std'        => '30',
-							'label'      => __( 'Listing duration', 'job_manager' ),
-							'desc'       => __( 'How many <strong>days</strong> listings are live before expiring. Can be left blank to never expire.', 'job_manager' ),
+							'label'      => __( 'Listing duration', 'wp-job-manager' ),
+							'desc'       => __( 'How many <strong>days</strong> listings are live before expiring. Can be left blank to never expire.', 'wp-job-manager' ),
 							'attributes' => array()
 						),
 						array(
 							'name' 		=> 'job_manager_submit_page_slug',
 							'std' 		=> '',
-							'label' 	=> __( 'Submit Page Slug', 'job_manager' ),
-							'desc'		=> __( 'Enter the slug of the page where you have placed the [submit_job_form] shortcode. This lets the plugin know where the form is located.', 'job_manager' ),
+							'label' 	=> __( 'Submit Page Slug', 'wp-job-manager' ),
+							'desc'		=> __( 'Enter the slug of the page where you have placed the [submit_job_form] shortcode. This lets the plugin know where the form is located.', 'wp-job-manager' ),
 							'type'      => 'input'
 						)
 					)
@@ -151,7 +151,7 @@ public function output() {
 				<?php
 					if ( ! empty( $_GET['settings-updated'] ) ) {
 						flush_rewrite_rules();
-						echo '<div class="updated fade"><p>' . __( 'Settings successfully saved', 'job_manager' ) . '</p></div>';
+						echo '<div class="updated fade"><p>' . __( 'Settings successfully saved', 'wp-job-manager' ) . '</p></div>';
 					}
 
 					foreach ( $this->settings as $key => $section ) {
@@ -230,7 +230,7 @@ public function output() {
 					}
 				?>
 				<p class="submit">
-					<input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'job_manager' ); ?>" />
+					<input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'wp-job-manager' ); ?>" />
 				</p>
 		    </form>
 		</div>
diff --git a/includes/admin/class-wp-job-manager-writepanels.php b/includes/admin/class-wp-job-manager-writepanels.php
index 04180a364..3265ac70d 100644
--- a/includes/admin/class-wp-job-manager-writepanels.php
+++ b/includes/admin/class-wp-job-manager-writepanels.php
@@ -24,47 +24,47 @@ public function __construct() {
 	public function job_listing_fields() {
 		return apply_filters( 'job_manager_job_listing_data_fields', array(
 			'_job_location' => array(
-				'label' => __( 'Job location', 'job_manager' ),
-				'placeholder' => __( 'e.g. "London, UK", "New York", "Houston, TX"', 'job_manager' ),
-				'description' => __( 'Leave this blank if the job can be done from anywhere (i.e. telecommuting)', 'job_manager' )
+				'label' => __( 'Job location', 'wp-job-manager' ),
+				'placeholder' => __( 'e.g. "London, UK", "New York", "Houston, TX"', 'wp-job-manager' ),
+				'description' => __( 'Leave this blank if the job can be done from anywhere (i.e. telecommuting)', 'wp-job-manager' )
 			),
 			'_application' => array(
-				'label' => __( 'Application email/URL', 'job_manager' ),
-				'placeholder' => __( 'URL or email which applicants use to apply', 'job_manager' )
+				'label' => __( 'Application email/URL', 'wp-job-manager' ),
+				'placeholder' => __( 'URL or email which applicants use to apply', 'wp-job-manager' )
 			),
 			'_company_name' => array(
-				'label' => __( 'Company name', 'job_manager' ),
+				'label' => __( 'Company name', 'wp-job-manager' ),
 				'placeholder' => ''
 			),
 			'_company_website' => array(
-				'label' => __( 'Company website', 'job_manager' ),
+				'label' => __( 'Company website', 'wp-job-manager' ),
 				'placeholder' => ''
 			),
 			'_company_tagline' => array(
-				'label' => __( 'Company tagline', 'job_manager' ),
-				'placeholder' => __( 'Brief description about the company', 'job_manager' )
+				'label' => __( 'Company tagline', 'wp-job-manager' ),
+				'placeholder' => __( 'Brief description about the company', 'wp-job-manager' )
 			),
 			'_company_twitter' => array(
-				'label' => __( 'Company Twitter', 'job_manager' ),
+				'label' => __( 'Company Twitter', 'wp-job-manager' ),
 				'placeholder' => '@yourcompany'
 			),
 			'_company_logo' => array(
-				'label' => __( 'Company logo', 'job_manager' ),
-				'placeholder' => __( 'URL to the company logo', 'job_manager' ),
+				'label' => __( 'Company logo', 'wp-job-manager' ),
+				'placeholder' => __( 'URL to the company logo', 'wp-job-manager' ),
 				'type'  => 'file'
 			),
 			'_filled' => array(
-				'label' => __( 'Position filled?', 'job_manager' ),
+				'label' => __( 'Position filled?', 'wp-job-manager' ),
 				'type'  => 'checkbox'
 			),
 			'_featured' => array(
-				'label' => __( 'Feature this job listing?', 'job_manager' ),
+				'label' => __( 'Feature this job listing?', 'wp-job-manager' ),
 				'type'  => 'checkbox',
-				'description' => __( 'Featured listings will be sticky during searches, and can be styled differently.', 'job_manager' )
+				'description' => __( 'Featured listings will be sticky during searches, and can be styled differently.', 'wp-job-manager' )
 			),
 			'_job_expires' => array(
-				'label'       => __( 'Job Expires', 'job_manager' ),
-				'placeholder' => __( 'yyyy-mm-dd', 'job_manager' )
+				'label'       => __( 'Job Expires', 'wp-job-manager' ),
+				'placeholder' => __( 'yyyy-mm-dd', 'wp-job-manager' )
 			)
 		) );
 	}
@@ -76,7 +76,7 @@ public function job_listing_fields() {
 	 * @return void
 	 */
 	public function add_meta_boxes() {
-		add_meta_box( 'job_listing_data', __( 'Job Listing Data', 'job_manager' ), array( $this, 'job_listing_data' ), 'job_listing', 'normal', 'high' );
+		add_meta_box( 'job_listing_data', __( 'Job Listing Data', 'wp-job-manager' ), array( $this, 'job_listing_data' ), 'job_listing', 'normal', 'high' );
 	}
 
 	/**
@@ -94,7 +94,7 @@ public function input_file( $key, $field ) {
 		<p class="form-field">
 			<label for="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $field['label'] ) ; ?>:</label>
 			<input type="text" class="file_url" name="<?php echo esc_attr( $key ); ?>" id="<?php echo esc_attr( $key ); ?>" placeholder="<?php echo esc_attr( $field['placeholder'] ); ?>" value="<?php echo esc_attr( $field['value'] ); ?>" />
-			<?php if ( ! empty( $field['description'] ) ) : ?><span class="description"><?php echo $field['description']; ?></span><?php endif; ?> <button class="button upload_image_button" data-uploader_button_text="<?php _e( 'Use image', 'job_manager' ); ?>"><?php _e( 'Upload image', 'job_manager' ); ?></button>
+			<?php if ( ! empty( $field['description'] ) ) : ?><span class="description"><?php echo $field['description']; ?></span><?php endif; ?> <button class="button upload_image_button" data-uploader_button_text="<?php _e( 'Use image', 'wp-job-manager' ); ?>"><?php _e( 'Upload image', 'wp-job-manager' ); ?></button>
 		</p>
 		<script type="text/javascript">
 			// Uploading files
diff --git a/includes/class-wp-job-manager-ajax.php b/includes/class-wp-job-manager-ajax.php
index 781c58ccb..580af91bd 100644
--- a/includes/class-wp-job-manager-ajax.php
+++ b/includes/class-wp-job-manager-ajax.php
@@ -60,7 +60,7 @@ public function get_listings() {
 
 		<?php else : ?>
 
-			<li class="no_job_listings_found"><?php _e( 'No more jobs found matching your selection.', 'job_manager' ); ?></li>
+			<li class="no_job_listings_found"><?php _e( 'No more jobs found matching your selection.', 'wp-job-manager' ); ?></li>
 
 		<?php endif;
 
@@ -102,12 +102,12 @@ public function get_listings() {
 			}
 
 			if ( $search_keywords ) {
-				$showing_jobs  = sprintf( __( 'Showing %s&ldquo;%s&rdquo; %sjobs', 'job_manager' ), $showing_types, $search_keywords, implode( ', ', $showing_categories ) );
+				$showing_jobs  = sprintf( __( 'Showing %s&ldquo;%s&rdquo; %sjobs', 'wp-job-manager' ), $showing_types, $search_keywords, implode( ', ', $showing_categories ) );
 			} else {
-				$showing_jobs  = sprintf( __( 'Showing all %s%sjobs', 'job_manager' ), $showing_types, implode( ', ', $showing_categories ) . ' ' );
+				$showing_jobs  = sprintf( __( 'Showing all %s%sjobs', 'wp-job-manager' ), $showing_types, implode( ', ', $showing_categories ) . ' ' );
 			}
 
-			$showing_location  = $search_location ? sprintf( ' ' . __( 'located in &ldquo;%s&rdquo;', 'job_manager' ), $search_location ) : '';
+			$showing_location  = $search_location ? sprintf( ' ' . __( 'located in &ldquo;%s&rdquo;', 'wp-job-manager' ), $search_location ) : '';
 
 			$result['showing'] = apply_filters( 'job_manager_get_listings_custom_filter_text', $showing_jobs . $showing_location );
 
diff --git a/includes/class-wp-job-manager-geocode.php b/includes/class-wp-job-manager-geocode.php
index c7a76ada5..95e095f8f 100644
--- a/includes/class-wp-job-manager-geocode.php
+++ b/includes/class-wp-job-manager-geocode.php
@@ -127,10 +127,10 @@ public static function get_location_data( $raw_address ) {
 
 				switch ( $xml->status ) {
 					case 'ZERO_RESULTS' :
-						throw new Exception( __( "No results found", 'job_manager' ) );
+						throw new Exception( __( "No results found", 'wp-job-manager' ) );
 					break;
 					case 'OVER_QUERY_LIMIT' :
-						throw new Exception( __( "Query limit reached", 'job_manager' ) );
+						throw new Exception( __( "Query limit reached", 'wp-job-manager' ) );
 					break;
 					default :
 						set_transient( $transient_name, $result, 24 * HOUR_IN_SECONDS * 365 );
diff --git a/includes/class-wp-job-manager-post-types.php b/includes/class-wp-job-manager-post-types.php
index 7cc78fb0e..e4fd907ad 100644
--- a/includes/class-wp-job-manager-post-types.php
+++ b/includes/class-wp-job-manager-post-types.php
@@ -42,12 +42,12 @@ public function register_post_types() {
 		 * Taxonomies
 		 */
 		if ( get_option( 'job_manager_enable_categories' ) ) {
-			$singular  = __( 'Job Category', 'job_manager' );
-			$plural    = __( 'Job Categories', 'job_manager' );
+			$singular  = __( 'Job Category', 'wp-job-manager' );
+			$plural    = __( 'Job Categories', 'wp-job-manager' );
 
 			if ( current_theme_supports( 'job-manager-templates' ) ) {
 				$rewrite     = array(
-					'slug'         => _x( 'job-category', 'Job category slug - resave permalinks after changing this', 'job_manager' ),
+					'slug'         => _x( 'job-category', 'Job category slug - resave permalinks after changing this', 'wp-job-manager' ),
 					'with_front'   => false,
 					'hierarchical' => false
 				);
@@ -64,14 +64,14 @@ public function register_post_types() {
 		            'labels' => array(
 	                    'name' 				=> $plural,
 	                    'singular_name' 	=> $singular,
-	                    'search_items' 		=> sprintf( __( 'Search %s', 'job_manager' ), $plural ),
-	                    'all_items' 		=> sprintf( __( 'All %s', 'job_manager' ), $plural ),
-	                    'parent_item' 		=> sprintf( __( 'Parent %s', 'job_manager' ), $singular ),
-	                    'parent_item_colon' => sprintf( __( 'Parent %s:', 'job_manager' ), $singular ),
-	                    'edit_item' 		=> sprintf( __( 'Edit %s', 'job_manager' ), $singular ),
-	                    'update_item' 		=> sprintf( __( 'Update %s', 'job_manager' ), $singular ),
-	                    'add_new_item' 		=> sprintf( __( 'Add New %s', 'job_manager' ), $singular ),
-	                    'new_item_name' 	=> sprintf( __( 'New %s Name', 'job_manager' ),  $singular )
+	                    'search_items' 		=> sprintf( __( 'Search %s', 'wp-job-manager' ), $plural ),
+	                    'all_items' 		=> sprintf( __( 'All %s', 'wp-job-manager' ), $plural ),
+	                    'parent_item' 		=> sprintf( __( 'Parent %s', 'wp-job-manager' ), $singular ),
+	                    'parent_item_colon' => sprintf( __( 'Parent %s:', 'wp-job-manager' ), $singular ),
+	                    'edit_item' 		=> sprintf( __( 'Edit %s', 'wp-job-manager' ), $singular ),
+	                    'update_item' 		=> sprintf( __( 'Update %s', 'wp-job-manager' ), $singular ),
+	                    'add_new_item' 		=> sprintf( __( 'Add New %s', 'wp-job-manager' ), $singular ),
+	                    'new_item_name' 	=> sprintf( __( 'New %s Name', 'wp-job-manager' ),  $singular )
 	            	),
 		            'show_ui' 				=> true,
 		            'query_var' 			=> true,
@@ -86,12 +86,12 @@ public function register_post_types() {
 		    );
 		}
 
-	    $singular  = __( 'Job Type', 'job_manager' );
-		$plural    = __( 'Job Types', 'job_manager' );
+	    $singular  = __( 'Job Type', 'wp-job-manager' );
+		$plural    = __( 'Job Types', 'wp-job-manager' );
 
 		if ( current_theme_supports( 'job-manager-templates' ) ) {
 			$rewrite     = array(
-				'slug'         => _x( 'job-type', 'Job type slug - resave permalinks after changing this', 'job_manager' ),
+				'slug'         => _x( 'job-type', 'Job type slug - resave permalinks after changing this', 'wp-job-manager' ),
 				'with_front'   => false,
 				'hierarchical' => false
 			);
@@ -107,14 +107,14 @@ public function register_post_types() {
 	            'labels' => array(
                     'name' 				=> $plural,
                     'singular_name' 	=> $singular,
-                    'search_items' 		=> sprintf( __( 'Search %s', 'job_manager' ), $plural ),
-                    'all_items' 		=> sprintf( __( 'All %s', 'job_manager' ), $plural ),
-                    'parent_item' 		=> sprintf( __( 'Parent %s', 'job_manager' ), $singular ),
-                    'parent_item_colon' => sprintf( __( 'Parent %s:', 'job_manager' ), $singular ),
-                    'edit_item' 		=> sprintf( __( 'Edit %s', 'job_manager' ), $singular ),
-                    'update_item' 		=> sprintf( __( 'Update %s', 'job_manager' ), $singular ),
-                    'add_new_item' 		=> sprintf( __( 'Add New %s', 'job_manager' ), $singular ),
-                    'new_item_name' 	=> sprintf( __( 'New %s Name', 'job_manager' ),  $singular )
+                    'search_items' 		=> sprintf( __( 'Search %s', 'wp-job-manager' ), $plural ),
+                    'all_items' 		=> sprintf( __( 'All %s', 'wp-job-manager' ), $plural ),
+                    'parent_item' 		=> sprintf( __( 'Parent %s', 'wp-job-manager' ), $singular ),
+                    'parent_item_colon' => sprintf( __( 'Parent %s:', 'wp-job-manager' ), $singular ),
+                    'edit_item' 		=> sprintf( __( 'Edit %s', 'wp-job-manager' ), $singular ),
+                    'update_item' 		=> sprintf( __( 'Update %s', 'wp-job-manager' ), $singular ),
+                    'add_new_item' 		=> sprintf( __( 'Add New %s', 'wp-job-manager' ), $singular ),
+                    'new_item_name' 	=> sprintf( __( 'New %s Name', 'wp-job-manager' ),  $singular )
             	),
 	            'show_ui' 				=> true,
 	            'query_var' 			=> true,
@@ -131,17 +131,17 @@ public function register_post_types() {
 	    /**
 		 * Post types
 		 */
-		$singular  = __( 'Job Listing', 'job_manager' );
-		$plural    = __( 'Job Listings', 'job_manager' );
+		$singular  = __( 'Job Listing', 'wp-job-manager' );
+		$plural    = __( 'Job Listings', 'wp-job-manager' );
 
 		if ( current_theme_supports( 'job-manager-templates' ) ) {
-			$has_archive = _x( 'jobs', 'Post type archive slug - resave permalinks after changing this', 'job_manager' );
+			$has_archive = _x( 'jobs', 'Post type archive slug - resave permalinks after changing this', 'wp-job-manager' );
 		} else {
 			$has_archive = false;
 		}
 
 		$rewrite     = array(
-			'slug'       => _x( 'job', 'Job permalink - resave permalinks after changing this', 'job_manager' ),
+			'slug'       => _x( 'job', 'Job permalink - resave permalinks after changing this', 'wp-job-manager' ),
 			'with_front' => false,
 			'feeds'      => true,
 			'pages'      => false
@@ -153,20 +153,20 @@ public function register_post_types() {
 					'name' 					=> $plural,
 					'singular_name' 		=> $singular,
 					'menu_name'             => $plural,
-					'all_items'             => sprintf( __( 'All %s', 'job_manager' ), $plural ),
-					'add_new' 				=> __( 'Add New', 'job_manager' ),
-					'add_new_item' 			=> sprintf( __( 'Add %s', 'job_manager' ), $singular ),
-					'edit' 					=> __( 'Edit', 'job_manager' ),
-					'edit_item' 			=> sprintf( __( 'Edit %s', 'job_manager' ), $singular ),
-					'new_item' 				=> sprintf( __( 'New %s', 'job_manager' ), $singular ),
-					'view' 					=> sprintf( __( 'View %s', 'job_manager' ), $singular ),
-					'view_item' 			=> sprintf( __( 'View %s', 'job_manager' ), $singular ),
-					'search_items' 			=> sprintf( __( 'Search %s', 'job_manager' ), $plural ),
-					'not_found' 			=> sprintf( __( 'No %s found', 'job_manager' ), $plural ),
-					'not_found_in_trash' 	=> sprintf( __( 'No %s found in trash', 'job_manager' ), $plural ),
-					'parent' 				=> sprintf( __( 'Parent %s', 'job_manager' ), $singular )
+					'all_items'             => sprintf( __( 'All %s', 'wp-job-manager' ), $plural ),
+					'add_new' 				=> __( 'Add New', 'wp-job-manager' ),
+					'add_new_item' 			=> sprintf( __( 'Add %s', 'wp-job-manager' ), $singular ),
+					'edit' 					=> __( 'Edit', 'wp-job-manager' ),
+					'edit_item' 			=> sprintf( __( 'Edit %s', 'wp-job-manager' ), $singular ),
+					'new_item' 				=> sprintf( __( 'New %s', 'wp-job-manager' ), $singular ),
+					'view' 					=> sprintf( __( 'View %s', 'wp-job-manager' ), $singular ),
+					'view_item' 			=> sprintf( __( 'View %s', 'wp-job-manager' ), $singular ),
+					'search_items' 			=> sprintf( __( 'Search %s', 'wp-job-manager' ), $plural ),
+					'not_found' 			=> sprintf( __( 'No %s found', 'wp-job-manager' ), $plural ),
+					'not_found_in_trash' 	=> sprintf( __( 'No %s found in trash', 'wp-job-manager' ), $plural ),
+					'parent' 				=> sprintf( __( 'Parent %s', 'wp-job-manager' ), $singular )
 				),
-				'description' => __( 'This is where you can create and manage job listings.', 'job_manager' ),
+				'description' => __( 'This is where you can create and manage job listings.', 'wp-job-manager' ),
 				'public' 				=> true,
 				'show_ui' 				=> true,
 				'capability_type' 		=> 'post',
@@ -201,12 +201,12 @@ public function register_post_types() {
 		 * Post status
 		 */
 		register_post_status( 'expired', array(
-			'label'                     => _x( 'Expired', 'job_listing', 'job_manager' ),
+			'label'                     => _x( 'Expired', 'job_listing', 'wp-job-manager' ),
 			'public'                    => true,
 			'exclude_from_search'       => false,
 			'show_in_admin_all_list'    => true,
 			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Expired <span class="count">(%s)</span>', 'Expired <span class="count">(%s)</span>', 'job_manager' ),
+			'label_count'               => _n_noop( 'Expired <span class="count">(%s)</span>', 'Expired <span class="count">(%s)</span>', 'wp-job-manager' ),
 		) );
 	}
 
@@ -216,7 +216,7 @@ public function register_post_types() {
 	public function admin_head() {
 		global $menu;
 
-		$plural     = __( 'Job Listings', 'job_manager' );
+		$plural     = __( 'Job Listings', 'wp-job-manager' );
 		$count_jobs = wp_count_posts( 'job_listing', 'readable' );
 
 		if ( ! empty( $menu ) && is_array( $menu ) ) {
diff --git a/includes/class-wp-job-manager-shortcodes.php b/includes/class-wp-job-manager-shortcodes.php
index cf8ede023..956d016fb 100644
--- a/includes/class-wp-job-manager-shortcodes.php
+++ b/includes/class-wp-job-manager-shortcodes.php
@@ -58,37 +58,37 @@ public function job_dashboard_handler() {
 
 				// Check ownership
 				if ( $job->post_author != get_current_user_id() )
-					throw new Exception( __( 'Invalid Job ID', 'job_manager' ) );
+					throw new Exception( __( 'Invalid Job ID', 'wp-job-manager' ) );
 
 				switch ( $action ) {
 					case 'mark_filled' :
 						// Check status
 						if ( $job->_filled == 1 )
-							throw new Exception( __( 'This job is already filled', 'job_manager' ) );
+							throw new Exception( __( 'This job is already filled', 'wp-job-manager' ) );
 
 						// Update
 						update_post_meta( $job_id, '_filled', 1 );
 
 						// Message
-						$this->job_dashboard_message = '<div class="job-manager-message">' . sprintf( __( '%s has been filled', 'job_manager' ), $job->post_title ) . '</div>';
+						$this->job_dashboard_message = '<div class="job-manager-message">' . sprintf( __( '%s has been filled', 'wp-job-manager' ), $job->post_title ) . '</div>';
 						break;
 					case 'mark_not_filled' :
 						// Check status
 						if ( $job->_filled != 1 )
-							throw new Exception( __( 'This job is already not filled', 'job_manager' ) );
+							throw new Exception( __( 'This job is already not filled', 'wp-job-manager' ) );
 
 						// Update
 						update_post_meta( $job_id, '_filled', 0 );
 
 						// Message
-						$this->job_dashboard_message = '<div class="job-manager-message">' . sprintf( __( '%s has been marked as not filled', 'job_manager' ), $job->post_title ) . '</div>';
+						$this->job_dashboard_message = '<div class="job-manager-message">' . sprintf( __( '%s has been marked as not filled', 'wp-job-manager' ), $job->post_title ) . '</div>';
 						break;
 					case 'delete' :
 						// Trash it
 						wp_trash_post( $job_id );
 
 						// Message
-						$this->job_dashboard_message = '<div class="job-manager-message">' . sprintf( __( '%s has been deleted', 'job_manager' ), $job->post_title ) . '</div>';
+						$this->job_dashboard_message = '<div class="job-manager-message">' . sprintf( __( '%s has been deleted', 'wp-job-manager' ), $job->post_title ) . '</div>';
 
 						break;
 				}
@@ -108,7 +108,7 @@ public function job_dashboard( $atts ) {
 		global $job_manager;
 
 		if ( ! is_user_logged_in() ) {
-			_e( 'You need to be signed in to manage your job listings.', 'job_manager' );
+			_e( 'You need to be signed in to manage your job listings.', 'wp-job-manager' );
 			return;
 		}
 
@@ -184,7 +184,7 @@ public function output_jobs( $atts ) {
 
 			get_job_manager_template( 'job-filters.php', array( 'per_page' => $per_page, 'orderby' => $orderby, 'order' => $order, 'show_categories' => $show_categories, 'categories' => $categories, 'job_types' => $job_types, 'atts' => $atts, 'location' => $location, 'keywords' => $keywords ) );
 
-			?><ul class="job_listings"></ul><a class="load_more_jobs" href="#" style="display:none;"><strong><?php _e( 'Load more job listings', 'job_manager' ); ?></strong></a><?php
+			?><ul class="job_listings"></ul><a class="load_more_jobs" href="#" style="display:none;"><strong><?php _e( 'Load more job listings', 'wp-job-manager' ); ?></strong></a><?php
 
 		} else {
 
@@ -214,7 +214,7 @@ public function output_jobs( $atts ) {
 
 					<?php wp_enqueue_script( 'wp-job-manager-ajax-filters' ); ?>
 
-					<a class="load_more_jobs" href="#"><strong><?php _e( 'Load more job listings', 'job_manager' ); ?></strong></a>
+					<a class="load_more_jobs" href="#"><strong><?php _e( 'Load more job listings', 'wp-job-manager' ); ?></strong></a>
 
 				<?php endif; ?>
 
diff --git a/includes/class-wp-job-manager-widgets.php b/includes/class-wp-job-manager-widgets.php
index 2f99bd8f4..b45116ac4 100644
--- a/includes/class-wp-job-manager-widgets.php
+++ b/includes/class-wp-job-manager-widgets.php
@@ -136,14 +136,14 @@ class WP_Job_Manager_Widget_Recent_Jobs extends WP_Job_Manager_Widget {
 	 */
 	public function __construct() {
 		$this->widget_cssclass    = 'job_manager widget_recent_jobs';
-		$this->widget_description = __( 'Display a list of the most recent jobs on your site.', 'job_manager' );
+		$this->widget_description = __( 'Display a list of the most recent jobs on your site.', 'wp-job-manager' );
 		$this->widget_id          = 'widget_recent_jobs';
-		$this->widget_name        = __( 'Recent Job Listings', 'job_manager' );
+		$this->widget_name        = __( 'Recent Job Listings', 'wp-job-manager' );
 		$this->settings           = array(
 			'title' => array(
 				'type'  => 'text',
-				'std'   => __( 'Recent Jobs', 'job_manager' ),
-				'label' => __( 'Title', 'job_manager' )
+				'std'   => __( 'Recent Jobs', 'wp-job-manager' ),
+				'label' => __( 'Title', 'wp-job-manager' )
 			),
 			'number' => array(
 				'type'  => 'number',
@@ -151,7 +151,7 @@ public function __construct() {
 				'min'   => 1,
 				'max'   => '',
 				'std'   => 10,
-				'label' => __( 'Number of jobs to show', 'job_manager' )
+				'label' => __( 'Number of jobs to show', 'wp-job-manager' )
 			)
 		);
 		parent::__construct();
diff --git a/includes/forms/class-wp-job-manager-form-edit-job.php b/includes/forms/class-wp-job-manager-form-edit-job.php
index 2df4e01f6..70d10995c 100644
--- a/includes/forms/class-wp-job-manager-form-edit-job.php
+++ b/includes/forms/class-wp-job-manager-form-edit-job.php
@@ -40,7 +40,7 @@ public static function submit() {
 		$job = get_post( self::$job_id );
 
 		if ( empty( self::$job_id  ) || $job->post_status !== 'publish' ) {
-			echo wpautop( __( 'Invalid job', 'job_manager' ) );
+			echo wpautop( __( 'Invalid job', 'wp-job-manager' ) );
 			return;
 		}
 
@@ -83,7 +83,7 @@ public static function submit() {
 			'action'             => self::get_action(),
 			'job_fields'         => self::get_fields( 'job' ),
 			'company_fields'     => self::get_fields( 'company' ),
-			'submit_button_text' => __( 'Update job listing', 'job_manager' )
+			'submit_button_text' => __( 'Update job listing', 'wp-job-manager' )
 			) );
 	}
 
@@ -108,7 +108,7 @@ public static function submit_handler() {
 			self::update_job_data( $values );
 
 			// Successful
-			echo '<div class="job-manager-message">' . __( 'Your changes have been saved.', 'job_manager' ), ' <a href="' . get_permalink( self::$job_id ) . '">' . __( 'View Job Listing &rarr;', 'job_manager' ) . '</a>' . '</div>';
+			echo '<div class="job-manager-message">' . __( 'Your changes have been saved.', 'wp-job-manager' ), ' <a href="' . get_permalink( self::$job_id ) . '">' . __( 'View Job Listing &rarr;', 'wp-job-manager' ) . '</a>' . '</div>';
 
 		} catch ( Exception $e ) {
 			echo '<div class="job-manager-error">' . $e->getMessage() . '</div>';
diff --git a/includes/forms/class-wp-job-manager-form-submit-job.php b/includes/forms/class-wp-job-manager-form-submit-job.php
index d22fb7836..490e85661 100644
--- a/includes/forms/class-wp-job-manager-form-submit-job.php
+++ b/includes/forms/class-wp-job-manager-form-submit-job.php
@@ -19,19 +19,19 @@ public static function init() {
 
 		self::$steps  = (array) apply_filters( 'submit_job_steps', array(
 			'submit' => array(
-				'name'     => __( 'Submit Details', 'job_manager' ),
+				'name'     => __( 'Submit Details', 'wp-job-manager' ),
 				'view'     => array( __CLASS__, 'submit' ),
 				'handler'  => array( __CLASS__, 'submit_handler' ),
 				'priority' => 10
 				),
 			'preview' => array(
-				'name'     => __( 'Preview', 'job_manager' ),
+				'name'     => __( 'Preview', 'wp-job-manager' ),
 				'view'     => array( __CLASS__, 'preview' ),
 				'handler'  => array( __CLASS__, 'preview_handler' ),
 				'priority' => 20
 			),
 			'done' => array(
-				'name'     => __( 'Done', 'job_manager' ),
+				'name'     => __( 'Done', 'wp-job-manager' ),
 				'view'     => array( __CLASS__, 'done' ),
 				'priority' => 30
 			)
@@ -103,22 +103,22 @@ public static function init_fields() {
 		self::$fields = apply_filters( 'submit_job_form_fields', array(
 			'job' => array(
 				'job_title' => array(
-					'label'       => __( 'Job title', 'job_manager' ),
+					'label'       => __( 'Job title', 'wp-job-manager' ),
 					'type'        => 'text',
 					'required'    => true,
 					'placeholder' => '',
 					'priority'    => 1
 				),
 				'job_location' => array(
-					'label'       => __( 'Job location', 'job_manager' ),
-					'description' => __( 'Leave this blank if the job can be done from anywhere (i.e. telecommuting)', 'job_manager' ),
+					'label'       => __( 'Job location', 'wp-job-manager' ),
+					'description' => __( 'Leave this blank if the job can be done from anywhere (i.e. telecommuting)', 'wp-job-manager' ),
 					'type'        => 'text',
 					'required'    => false,
-					'placeholder' => __( 'e.g. "London, UK", "New York", "Houston, TX"', 'job_manager' ),
+					'placeholder' => __( 'e.g. "London, UK", "New York", "Houston, TX"', 'wp-job-manager' ),
 					'priority'    => 2
 				),
 				'job_type' => array(
-					'label'       => __( 'Job type', 'job_manager' ),
+					'label'       => __( 'Job type', 'wp-job-manager' ),
 					'type'        => 'select',
 					'required'    => true,
 					'options'     => self::job_types(),
@@ -126,7 +126,7 @@ public static function init_fields() {
 					'priority'    => 3
 				),
 				'job_category' => array(
-					'label'       => __( 'Job category', 'job_manager' ),
+					'label'       => __( 'Job category', 'wp-job-manager' ),
 					'type'        => 'select',
 					'required'    => true,
 					'options'     => self::job_categories(),
@@ -134,52 +134,52 @@ public static function init_fields() {
 					'priority'    => 4
 				),
 				'job_description' => array(
-					'label'       => __( 'Description', 'job_manager' ),
+					'label'       => __( 'Description', 'wp-job-manager' ),
 					'type'        => 'wp-editor',
 					'required'    => true,
 					'placeholder' => '',
 					'priority'    => 5
 				),
 				'application' => array(
-					'label'       => __( 'Application email/URL', 'job_manager' ),
+					'label'       => __( 'Application email/URL', 'wp-job-manager' ),
 					'type'        => 'text',
 					'required'    => true,
-					'placeholder' => __( 'Enter an email address or website URL', 'job_manager' ),
+					'placeholder' => __( 'Enter an email address or website URL', 'wp-job-manager' ),
 					'priority'    => 6
 				)
 			),
 			'company' => array(
 				'company_name' => array(
-					'label'       => __( 'Company name', 'job_manager' ),
+					'label'       => __( 'Company name', 'wp-job-manager' ),
 					'type'        => 'text',
 					'required'    => true,
-					'placeholder' => __( 'Enter the name of the company', 'job_manager' ),
+					'placeholder' => __( 'Enter the name of the company', 'wp-job-manager' ),
 					'priority'    => 1
 				),
 				'company_website' => array(
-					'label'       => __( 'Website', 'job_manager' ),
+					'label'       => __( 'Website', 'wp-job-manager' ),
 					'type'        => 'text',
 					'required'    => false,
-					'placeholder' => __( 'http://', 'job_manager' ),
+					'placeholder' => __( 'http://', 'wp-job-manager' ),
 					'priority'    => 2
 				),
 				'company_tagline' => array(
-					'label'       => __( 'Tagline', 'job_manager' ),
+					'label'       => __( 'Tagline', 'wp-job-manager' ),
 					'type'        => 'text',
 					'required'    => false,
-					'placeholder' => __( 'Briefly describe your company', 'job_manager' ),
+					'placeholder' => __( 'Briefly describe your company', 'wp-job-manager' ),
 					'maxlength'   => 64,
 					'priority'    => 3
 				),
 				'company_twitter' => array(
-					'label'       => __( 'Twitter username', 'job_manager' ),
+					'label'       => __( 'Twitter username', 'wp-job-manager' ),
 					'type'        => 'text',
 					'required'    => false,
-					'placeholder' => __( '@yourcompany', 'job_manager' ),
+					'placeholder' => __( '@yourcompany', 'wp-job-manager' ),
 					'priority'    => 4
 				),
 				'company_logo' => array(
-					'label'       => __( 'Logo', 'job_manager' ),
+					'label'       => __( 'Logo', 'wp-job-manager' ),
 					'type'        => 'file',
 					'required'    => false,
 					'placeholder' => '',
@@ -285,7 +285,7 @@ protected static function validate_fields( $values ) {
 		foreach ( self::$fields as $group_key => $fields ) {
 			foreach ( $fields as $key => $field ) {
 				if ( $field['required'] && empty( $values[ $group_key ][ $key ] ) )
-					return new WP_Error( 'validation-error', sprintf( __( '%s is a required field', 'job_manager' ), $field['label'] ) );
+					return new WP_Error( 'validation-error', sprintf( __( '%s is a required field', 'wp-job-manager' ), $field['label'] ) );
 			}
 		}
 
@@ -398,7 +398,7 @@ public static function submit() {
 			'action'             => self::get_action(),
 			'job_fields'         => self::get_fields( 'job' ),
 			'company_fields'     => self::get_fields( 'company' ),
-			'submit_button_text' => __( 'Preview job listing &rarr;', 'job_manager' )
+			'submit_button_text' => __( 'Preview job listing &rarr;', 'wp-job-manager' )
 			) );
 	}
 
@@ -541,13 +541,13 @@ public static function preview() {
 			?>
 			<form method="post" id="job_preview">
 				<div class="job_listing_preview_title">
-					<input type="submit" name="continue" id="job_preview_submit_button" class="button" value="<?php echo apply_filters( 'submit_job_step_preview_submit_text', __( 'Submit Listing &rarr;', 'job_manager' ) ); ?>" />
-					<input type="submit" name="edit_job" class="button" value="<?php _e( '&larr; Edit listing', 'job_manager' ); ?>" />
+					<input type="submit" name="continue" id="job_preview_submit_button" class="button" value="<?php echo apply_filters( 'submit_job_step_preview_submit_text', __( 'Submit Listing &rarr;', 'wp-job-manager' ) ); ?>" />
+					<input type="submit" name="edit_job" class="button" value="<?php _e( '&larr; Edit listing', 'wp-job-manager' ); ?>" />
 					<input type="hidden" name="job_id" value="<?php echo esc_attr( self::$job_id ); ?>" />
 					<input type="hidden" name="step" value="<?php echo esc_attr( self::$step ); ?>" />
 					<input type="hidden" name="job_manager_form" value="<?php echo self::$form_name; ?>" />
 					<h2>
-						<?php _e( 'Preview', 'job_manager' ); ?>
+						<?php _e( 'Preview', 'wp-job-manager' ); ?>
 					</h2>
 				</div>
 				<div class="job_listing_preview single_job_listing">
@@ -612,7 +612,7 @@ public static function upload_image( $field_key ) {
 			$file   = $_FILES[ $field_key ];
 
 			if ( $_FILES[ $field_key ]["type"] != "image/jpeg" && $_FILES[ $field_key ]["type"] != "image/gif" && $_FILES[ $field_key ]["type"] != "image/png" )
-    			throw new Exception( __( 'Logo needs to be jpg, gif or png.', 'job_manager' ) );
+    			throw new Exception( __( 'Logo needs to be jpg, gif or png.', 'wp-job-manager' ) );
 
 			add_filter( 'upload_dir',  array( __CLASS__, 'upload_dir' ) );
 
diff --git a/languages/wp-job-manager.pot b/languages/wp-job-manager.pot
new file mode 100644
index 000000000..539ae814b
--- /dev/null
+++ b/languages/wp-job-manager.pot
@@ -0,0 +1,889 @@
+# Copyright (C) 2014 WP Job Manager
+# This file is distributed under the same license as the WP Job Manager package.
+msgid ""
+msgstr ""
+"Project-Id-Version: WP Job Manager 1.7.1\n"
+"Report-Msgid-Bugs-To: http://wordpress.org/tag/wp-job-manager\n"
+"POT-Creation-Date: 2014-01-23 17:08:42+00:00\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+
+#: includes/admin/class-wp-job-manager-addons.php:50
+#: includes/admin/class-wp-job-manager-admin.php:55
+msgid "WP Job Manager Add-ons"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-admin.php:52
+msgid "Settings"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-admin.php:55
+msgid "Add-ons"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:43
+#: includes/admin/class-wp-job-manager-cpt.php:44
+msgid "Approve Jobs"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:112
+#: includes/admin/class-wp-job-manager-cpt.php:114
+msgid "%s approved"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:157
+msgid "Select a category"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:190
+msgid "Job position title"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:206
+msgid "Job listing updated. <a href=\"%s\">View Job</a>"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:207
+msgid "Custom field updated."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:208
+msgid "Custom field deleted."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:209
+msgid "Job listing updated."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:210
+msgid "Job listing restored to revision from %s"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:211
+msgid "Job listing published. <a href=\"%s\">View Job</a>"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:212
+msgid "Job listing saved."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:213
+msgid "Job listing submitted. <a target=\"_blank\" href=\"%s\">Preview Job</a>"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:214
+msgid ""
+"Job listing scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" href="
+"\"%2$s\">Preview Job</a>"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:215
+msgid "M j, Y @ G:i"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:216
+msgid ""
+"Job listing draft updated. <a target=\"_blank\" href=\"%s\">Preview Job</a>"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:235
+msgid "Type"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:236
+msgid "Position"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:237
+msgid "Posted"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:238
+#: templates/job-dashboard.php:9
+msgid "Expires"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:240
+msgid "Categories"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:241
+msgid "Featured?"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:242
+#: templates/job-dashboard.php:10
+msgid "Filled?"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:243
+#: templates/job-dashboard.php:8
+msgid "Status"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:244
+msgid "Actions"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:267
+msgid "Job ID: %d"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:293
+#: includes/admin/class-wp-job-manager-cpt.php:298
+msgid "M j, Y"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:294
+msgid "by a guest"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:294
+msgid "by %s"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:311
+msgid "Approve"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:318
+msgid "View"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:323
+#: includes/class-wp-job-manager-post-types.php:159
+#: templates/job-dashboard.php:33
+msgid "Edit"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-cpt.php:328
+#: templates/job-dashboard.php:43
+msgid "Delete"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:31
+#: includes/class-wp-job-manager-post-types.php:135
+#: includes/class-wp-job-manager-post-types.php:219
+msgid "Job Listings"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:37
+msgid "Jobs per page"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:38
+msgid "How many jobs should be shown per page by default?"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:44
+msgid "Filled positions"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:45
+msgid "Hide filled positions"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:46
+msgid "If enabled, filled positions will be hidden from the job list."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:53
+msgid "Job categories"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:54
+msgid "Enable job categories"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:55
+msgid ""
+"Choose whether to enable job categories. Categories must be setup by an "
+"admin for users to choose during job submission."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:62
+msgid "Job Submission"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:67
+msgid "Account creation"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:68
+msgid "Allow account creation"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:69
+msgid ""
+"If enabled, non-logged in users will be able to create an account by "
+"entering their email address on the job submission form."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:76
+msgid "Account required"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:77
+msgid "Job submission requires an account"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:78
+msgid ""
+"If disabled, non-logged in users will be able to submit job listings without "
+"creating an account."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:85
+msgid "Approval Required"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:86
+msgid "New submissions require admin approval"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:87
+msgid "If enabled, new submissions will be inactive, pending admin approval."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:94
+msgid "Listing duration"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:95
+msgid ""
+"How many <strong>days</strong> listings are live before expiring. Can be "
+"left blank to never expire."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:101
+msgid "Submit Page Slug"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:102
+msgid ""
+"Enter the slug of the page where you have placed the [submit_job_form] "
+"shortcode. This lets the plugin know where the form is located."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:154
+msgid "Settings successfully saved"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-settings.php:233
+msgid "Save Changes"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:27
+#: includes/forms/class-wp-job-manager-form-submit-job.php:113
+msgid "Job location"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:28
+#: includes/forms/class-wp-job-manager-form-submit-job.php:117
+msgid "e.g. \"London, UK\", \"New York\", \"Houston, TX\""
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:29
+#: includes/forms/class-wp-job-manager-form-submit-job.php:114
+msgid ""
+"Leave this blank if the job can be done from anywhere (i.e. telecommuting)"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:32
+#: includes/forms/class-wp-job-manager-form-submit-job.php:144
+msgid "Application email/URL"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:33
+msgid "URL or email which applicants use to apply"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:36
+#: includes/forms/class-wp-job-manager-form-submit-job.php:153
+msgid "Company name"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:40
+msgid "Company website"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:44
+msgid "Company tagline"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:45
+msgid "Brief description about the company"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:48
+msgid "Company Twitter"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:52
+msgid "Company logo"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:53
+msgid "URL to the company logo"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:57
+msgid "Position filled?"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:61
+msgid "Feature this job listing?"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:63
+msgid ""
+"Featured listings will be sticky during searches, and can be styled "
+"differently."
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:66
+msgid "Job Expires"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:67
+msgid "yyyy-mm-dd"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:79
+msgid "Job Listing Data"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:97
+msgid "Use image"
+msgstr ""
+
+#: includes/admin/class-wp-job-manager-writepanels.php:97
+msgid "Upload image"
+msgstr ""
+
+#: includes/class-wp-job-manager-ajax.php:63
+msgid "No more jobs found matching your selection."
+msgstr ""
+
+#: includes/class-wp-job-manager-ajax.php:105
+msgid "Showing %s&ldquo;%s&rdquo; %sjobs"
+msgstr ""
+
+#: includes/class-wp-job-manager-ajax.php:107
+msgid "Showing all %s%sjobs"
+msgstr ""
+
+#: includes/class-wp-job-manager-ajax.php:110
+msgid "located in &ldquo;%s&rdquo;"
+msgstr ""
+
+#: includes/class-wp-job-manager-geocode.php:130
+msgid "No results found"
+msgstr ""
+
+#: includes/class-wp-job-manager-geocode.php:133
+msgid "Query limit reached"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:45
+msgid "Job Category"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:46
+msgid "Job Categories"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:50
+msgctxt "Job category slug - resave permalinks after changing this"
+msgid "job-category"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:67
+#: includes/class-wp-job-manager-post-types.php:110
+#: includes/class-wp-job-manager-post-types.php:164
+msgid "Search %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:68
+#: includes/class-wp-job-manager-post-types.php:111
+#: includes/class-wp-job-manager-post-types.php:156
+msgid "All %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:69
+#: includes/class-wp-job-manager-post-types.php:112
+#: includes/class-wp-job-manager-post-types.php:167
+msgid "Parent %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:70
+#: includes/class-wp-job-manager-post-types.php:113
+msgid "Parent %s:"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:71
+#: includes/class-wp-job-manager-post-types.php:114
+#: includes/class-wp-job-manager-post-types.php:160
+msgid "Edit %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:72
+#: includes/class-wp-job-manager-post-types.php:115
+msgid "Update %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:73
+#: includes/class-wp-job-manager-post-types.php:116
+msgid "Add New %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:74
+#: includes/class-wp-job-manager-post-types.php:117
+msgid "New %s Name"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:89
+msgid "Job Type"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:90
+msgid "Job Types"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:94
+msgctxt "Job type slug - resave permalinks after changing this"
+msgid "job-type"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:134
+msgid "Job Listing"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:138
+msgctxt "Post type archive slug - resave permalinks after changing this"
+msgid "jobs"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:144
+msgctxt "Job permalink - resave permalinks after changing this"
+msgid "job"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:157
+msgid "Add New"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:158
+msgid "Add %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:161
+msgid "New %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:162
+#: includes/class-wp-job-manager-post-types.php:163
+msgid "View %s"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:165
+msgid "No %s found"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:166
+msgid "No %s found in trash"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:169
+msgid "This is where you can create and manage job listings."
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:204
+msgctxt "job_listing"
+msgid "Expired"
+msgstr ""
+
+#: includes/class-wp-job-manager-post-types.php:209
+msgid "Expired <span class=\"count\">(%s)</span>"
+msgid_plural "Expired <span class=\"count\">(%s)</span>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: includes/class-wp-job-manager-shortcodes.php:61
+msgid "Invalid Job ID"
+msgstr ""
+
+#: includes/class-wp-job-manager-shortcodes.php:67
+msgid "This job is already filled"
+msgstr ""
+
+#: includes/class-wp-job-manager-shortcodes.php:73
+msgid "%s has been filled"
+msgstr ""
+
+#: includes/class-wp-job-manager-shortcodes.php:78
+msgid "This job is already not filled"
+msgstr ""
+
+#: includes/class-wp-job-manager-shortcodes.php:84
+msgid "%s has been marked as not filled"
+msgstr ""
+
+#: includes/class-wp-job-manager-shortcodes.php:91
+msgid "%s has been deleted"
+msgstr ""
+
+#: includes/class-wp-job-manager-shortcodes.php:111
+msgid "You need to be signed in to manage your job listings."
+msgstr ""
+
+#: includes/class-wp-job-manager-shortcodes.php:187
+#: includes/class-wp-job-manager-shortcodes.php:217
+msgid "Load more job listings"
+msgstr ""
+
+#: includes/class-wp-job-manager-widgets.php:139
+msgid "Display a list of the most recent jobs on your site."
+msgstr ""
+
+#: includes/class-wp-job-manager-widgets.php:141
+msgid "Recent Job Listings"
+msgstr ""
+
+#: includes/class-wp-job-manager-widgets.php:145
+msgid "Recent Jobs"
+msgstr ""
+
+#: includes/class-wp-job-manager-widgets.php:146
+msgid "Title"
+msgstr ""
+
+#: includes/class-wp-job-manager-widgets.php:154
+msgid "Number of jobs to show"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-edit-job.php:43
+msgid "Invalid job"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-edit-job.php:86
+msgid "Update job listing"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-edit-job.php:111
+msgid "Your changes have been saved."
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-edit-job.php:111
+msgid "View Job Listing &rarr;"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:22
+msgid "Submit Details"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:28
+#: includes/forms/class-wp-job-manager-form-submit-job.php:550
+msgid "Preview"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:34
+msgid "Done"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:106
+msgid "Job title"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:121
+msgid "Job type"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:129
+msgid "Job category"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:137
+msgid "Description"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:147
+msgid "Enter an email address or website URL"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:156
+msgid "Enter the name of the company"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:160
+#: templates/content-single-job_listing.php:32
+msgid "Website"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:163
+msgid "http://"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:167
+msgid "Tagline"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:170
+msgid "Briefly describe your company"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:175
+msgid "Twitter username"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:178
+msgid "@yourcompany"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:182
+msgid "Logo"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:288
+msgid "%s is a required field"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:401
+msgid "Preview job listing &rarr;"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:436
+msgid "You must be signed in to post a new job listing."
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:544
+msgid "Submit Listing &rarr;"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:545
+msgid "&larr; Edit listing"
+msgstr ""
+
+#: includes/forms/class-wp-job-manager-form-submit-job.php:615
+msgid "Logo needs to be jpg, gif or png."
+msgstr ""
+
+#: templates/account-signin.php:4
+msgid "Your account"
+msgstr ""
+
+#: templates/account-signin.php:8
+msgid "You are currently signed in as <strong>%s</strong>."
+msgstr ""
+
+#: templates/account-signin.php:11
+msgid "Sign out"
+msgstr ""
+
+#: templates/account-signin.php:21
+msgid "Have an account?"
+msgstr ""
+
+#: templates/account-signin.php:23
+msgid "Sign in"
+msgstr ""
+
+#: templates/account-signin.php:27
+msgid ""
+"If you don&lsquo;t have an account you can %screate one below by entering "
+"your email address. A password will be automatically emailed to you."
+msgstr ""
+
+#: templates/account-signin.php:27
+msgid "optionally"
+msgstr ""
+
+#: templates/account-signin.php:31
+msgid "You must sign in to create a new job listing."
+msgstr ""
+
+#: templates/account-signin.php:38
+msgid "Your email"
+msgstr ""
+
+#: templates/account-signin.php:38 templates/job-submit.php:24
+#: templates/job-submit.php:40
+msgid "(optional)"
+msgstr ""
+
+#: templates/content-job_listing.php:16
+#: templates/content-single-job_listing.php:19
+#: templates/content-summary-job_listing.php:14
+msgid "Posted %s ago"
+msgstr ""
+
+#: templates/content-single-job_listing.php:8
+msgid "This job listing has expired"
+msgstr ""
+
+#: templates/content-single-job_listing.php:22
+msgid "This position has been filled"
+msgstr ""
+
+#: templates/form-fields/file-field.php:3
+msgid "remove"
+msgstr ""
+
+#: templates/form-fields/file-field.php:3
+msgid "or"
+msgstr ""
+
+#: templates/form-fields/file-field.php:10
+msgid "Max. file size: %s. Allowed images: jpg, gif, png."
+msgstr ""
+
+#: templates/job-application.php:5
+msgid "Apply for job"
+msgstr ""
+
+#: templates/job-application.php:12
+msgid ""
+"To apply for this job <strong>email your details to</strong> <a class="
+"\"job_application_email\" href=\"mailto:%1$s%2$s\">%1$s</a>"
+msgstr ""
+
+#: templates/job-application.php:14
+msgid "Apply using webmail: "
+msgstr ""
+
+#: templates/job-application.php:28
+msgid ""
+"To apply for this job please visit the following URL: <a href=\"%1$s\">%1$s "
+"&rarr;</a>"
+msgstr ""
+
+#: templates/job-dashboard.php:2
+msgid ""
+"Your job listings are shown in the table below. Expired listings will be "
+"automatically removed after 30 days."
+msgstr ""
+
+#: templates/job-dashboard.php:6
+msgid "Job Title"
+msgstr ""
+
+#: templates/job-dashboard.php:7
+msgid "Date Posted"
+msgstr ""
+
+#: templates/job-dashboard.php:16
+msgid "You do not have any active job listings."
+msgstr ""
+
+#: templates/job-dashboard.php:36
+msgid "Mark not filled"
+msgstr ""
+
+#: templates/job-dashboard.php:38
+msgid "Mark filled"
+msgstr ""
+
+#: templates/job-filters.php:8
+msgid "Keywords"
+msgstr ""
+
+#: templates/job-filters.php:9
+msgid "All Jobs"
+msgstr ""
+
+#: templates/job-filters.php:13
+msgid "Location"
+msgstr ""
+
+#: templates/job-filters.php:14
+msgid "Any Location"
+msgstr ""
+
+#: templates/job-filters.php:23
+msgid "Category"
+msgstr ""
+
+#: templates/job-filters.php:24
+msgid "All Job Categories"
+msgstr ""
+
+#: templates/job-submit.php:34
+msgid "Company details"
+msgstr ""
+
+#: templates/job-submitted.php:4
+msgid ""
+"Job listed successfully. To view your job listing <a href=\"%s\">click here</"
+"a>."
+msgstr ""
+
+#: templates/job-submitted.php:7
+msgid ""
+"Job submitted successfully. Your job listing will be visible once approved."
+msgstr ""
+
+#: wp-job-manager-functions.php:192
+msgid "Reset"
+msgstr ""
+
+#: wp-job-manager-functions.php:196
+msgid "RSS"
+msgstr ""
+
+#: wp-job-manager-functions.php:246
+msgid "Your email address isn&#8217;t correct."
+msgstr ""
+
+#: wp-job-manager-functions.php:249
+msgid "This email is already registered, please choose another one."
+msgstr ""
+
+#: wp-job-manager-template.php:116
+msgid "Active"
+msgstr ""
+
+#: wp-job-manager-template.php:118
+msgid "Expired"
+msgstr ""
+
+#: wp-job-manager-template.php:120
+msgid "Pending Review"
+msgstr ""
+
+#: wp-job-manager-template.php:122
+msgid "Inactive"
+msgstr ""
+
+#: wp-job-manager-template.php:255
+msgid "Anywhere"
+msgstr ""
+
+#: wp-job-manager.php:100
+msgid "Are you sure you want to delete this job?"
+msgstr ""
+
+#. Plugin Name of the plugin/theme
+msgid "WP Job Manager"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "http://mikejolley.com/projects/wp-job-manager/"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"Manage job listings from the WordPress admin panel, and allow users to post "
+"jobs directly to your site."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Mike Jolley"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "http://mikejolley.com"
+msgstr ""
diff --git a/readme.txt b/readme.txt
index 4ca5a94a4..22fe4dbc1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=mike.jol
 Tags: job listing, job board, job, jobs, company, hiring, employment, employees, candidate, freelance, internship
 Requires at least: 3.8
 Tested up to: 3.8
-Stable tag: 1.7.0
+Stable tag: 1.7.1
 
 Manage job listings from the WordPress admin panel, and allow users to post jobs directly to your site.
 
@@ -90,6 +90,9 @@ For more information, [read the documentation](https://github.com/mikejolley/wp-
 
 == Changelog ==
 
+= 1.7.1 =
+* Updated textdomain to wp-job-manager
+* Re-done .pot file 
 * Additonal filters for ajax responses
 
 = 1.7.0 = 
diff --git a/templates/account-signin.php b/templates/account-signin.php
index 281b9f618..111973d75 100644
--- a/templates/account-signin.php
+++ b/templates/account-signin.php
@@ -1,14 +1,14 @@
 <?php if ( is_user_logged_in() ) : ?>
 
 	<fieldset>
-		<label><?php _e( 'Your account', 'job_manager' ); ?></label>
+		<label><?php _e( 'Your account', 'wp-job-manager' ); ?></label>
 		<div class="field account-sign-in">
 			<?php
 				$user = wp_get_current_user();
-				printf( __( 'You are currently signed in as <strong>%s</strong>.', 'job_manager' ), $user->user_login );
+				printf( __( 'You are currently signed in as <strong>%s</strong>.', 'wp-job-manager' ), $user->user_login );
 			?>
 
-			<a class="button" href="<?php echo apply_filters( 'submit_job_form_logout_url', wp_logout_url( get_permalink() ) ); ?>"><?php _e( 'Sign out', 'job_manager' ); ?></a>
+			<a class="button" href="<?php echo apply_filters( 'submit_job_form_logout_url', wp_logout_url( get_permalink() ) ); ?>"><?php _e( 'Sign out', 'wp-job-manager' ); ?></a>
 		</div>
 	</fieldset>
 
@@ -18,24 +18,24 @@
 	$registration_enabled = job_manager_enable_registration();
 	?>
 	<fieldset>
-		<label><?php _e( 'Have an account?', 'job_manager' ); ?></label>
+		<label><?php _e( 'Have an account?', 'wp-job-manager' ); ?></label>
 		<div class="field account-sign-in">
-			<a class="button" href="<?php echo apply_filters( 'submit_job_form_login_url', wp_login_url( get_permalink() ) ); ?>"><?php _e( 'Sign in', 'job_manager' ); ?></a>
+			<a class="button" href="<?php echo apply_filters( 'submit_job_form_login_url', wp_login_url( get_permalink() ) ); ?>"><?php _e( 'Sign in', 'wp-job-manager' ); ?></a>
 
 			<?php if ( $registration_enabled ) : ?>
 
-				<?php printf( __( 'If you don&lsquo;t have an account you can %screate one below by entering your email address. A password will be automatically emailed to you.', 'job_manager' ), $account_required ? '' : __( 'optionally', 'job_manager' ) . ' ' ); ?>
+				<?php printf( __( 'If you don&lsquo;t have an account you can %screate one below by entering your email address. A password will be automatically emailed to you.', 'wp-job-manager' ), $account_required ? '' : __( 'optionally', 'wp-job-manager' ) . ' ' ); ?>
 
 			<?php elseif ( $account_required ) : ?>
 
-				<?php echo apply_filters( 'submit_job_form_login_required_message',  __('You must sign in to create a new job listing.', 'job_manager' ) ); ?>
+				<?php echo apply_filters( 'submit_job_form_login_required_message',  __('You must sign in to create a new job listing.', 'wp-job-manager' ) ); ?>
 
 			<?php endif; ?>
 		</div>
 	</fieldset>
 	<?php if ( $registration_enabled ) : ?>
 		<fieldset>
-			<label><?php _e( 'Your email', 'job_manager' ); ?> <?php if ( ! $account_required ) echo '<small>' . __( '(optional)', 'job_manager' ) . '</small>'; ?></label>
+			<label><?php _e( 'Your email', 'wp-job-manager' ); ?> <?php if ( ! $account_required ) echo '<small>' . __( '(optional)', 'wp-job-manager' ) . '</small>'; ?></label>
 			<div class="field">
 				<input type="email" class="input-text" name="create_account_email" id="account_email" placeholder="you@yourdomain.com" value="<?php if ( ! empty( $_POST['create_account_email'] ) ) echo sanitize_text_field( stripslashes( $_POST['create_account_email'] ) ); ?>" />
 			</div>
diff --git a/templates/content-job_listing.php b/templates/content-job_listing.php
index b17b784f3..9ab476904 100644
--- a/templates/content-job_listing.php
+++ b/templates/content-job_listing.php
@@ -13,7 +13,7 @@
 		</div>
 		<ul class="meta">
 			<li class="job-type <?php echo get_the_job_type() ? sanitize_title( get_the_job_type()->slug ) : ''; ?>"><?php the_job_type(); ?></li>
-			<li class="date"><date><?php printf( __( 'Posted %s ago', 'job_manager' ), human_time_diff( get_post_time( 'U' ), current_time( 'timestamp' ) ) ); ?></date></li>
+			<li class="date"><date><?php printf( __( 'Posted %s ago', 'wp-job-manager' ), human_time_diff( get_post_time( 'U' ), current_time( 'timestamp' ) ) ); ?></date></li>
 		</ul>
 	</a>
 </li>
\ No newline at end of file
diff --git a/templates/content-single-job_listing.php b/templates/content-single-job_listing.php
index 56ccb766e..52366aa98 100644
--- a/templates/content-single-job_listing.php
+++ b/templates/content-single-job_listing.php
@@ -5,7 +5,7 @@
 
 	<?php if ( $post->post_status == 'expired' ) : ?>
 
-		<div class="job-manager-info"><?php _e( 'This job listing has expired', 'job_manager' ); ?></div>
+		<div class="job-manager-info"><?php _e( 'This job listing has expired', 'wp-job-manager' ); ?></div>
 
 	<?php else : ?>
 
@@ -16,10 +16,10 @@
 
 			<li class="location" itemprop="jobLocation"><?php the_job_location(); ?></li>
 
-			<li class="date-posted" itemprop="datePosted"><date><?php printf( __( 'Posted %s ago', 'job_manager' ), human_time_diff( get_post_time( 'U' ), current_time( 'timestamp' ) ) ); ?></date></li>
+			<li class="date-posted" itemprop="datePosted"><date><?php printf( __( 'Posted %s ago', 'wp-job-manager' ), human_time_diff( get_post_time( 'U' ), current_time( 'timestamp' ) ) ); ?></date></li>
 
 			<?php if ( is_position_filled() ) : ?>
-				<li class="position-filled"><?php _e( 'This position has been filled', 'job_manager' ); ?></li>
+				<li class="position-filled"><?php _e( 'This position has been filled', 'wp-job-manager' ); ?></li>
 			<?php endif; ?>
 
 			<?php do_action( 'single_job_listing_meta_end' ); ?>
@@ -29,7 +29,7 @@
 			<?php the_company_logo(); ?>
 
 			<p class="name">
-				<a class="website" href="<?php echo get_the_company_website(); ?>" itemprop="url"><?php _e( 'Website', 'job_manager' ); ?></a>
+				<a class="website" href="<?php echo get_the_company_website(); ?>" itemprop="url"><?php _e( 'Website', 'wp-job-manager' ); ?></a>
 				<?php the_company_twitter(); ?>
 				<?php the_company_name( '<strong itemprop="name">', '</strong>' ); ?>
 			</p>
diff --git a/templates/content-summary-job_listing.php b/templates/content-summary-job_listing.php
index 9a8034880..c4fb40290 100644
--- a/templates/content-summary-job_listing.php
+++ b/templates/content-summary-job_listing.php
@@ -11,7 +11,7 @@
 
 		<h1><?php the_title(); ?></h1>
 
-		<p class="meta"><?php the_job_location( false ); ?> &mdash; <date><?php printf( __( 'Posted %s ago', 'job_manager' ), human_time_diff( get_post_time( 'U' ), current_time( 'timestamp' ) ) ); ?></date></p>
+		<p class="meta"><?php the_job_location( false ); ?> &mdash; <date><?php printf( __( 'Posted %s ago', 'wp-job-manager' ), human_time_diff( get_post_time( 'U' ), current_time( 'timestamp' ) ) ); ?></date></p>
 
 	</div>
 </a>
\ No newline at end of file
diff --git a/templates/form-fields/file-field.php b/templates/form-fields/file-field.php
index adfdcbf71..2cf886c58 100644
--- a/templates/form-fields/file-field.php
+++ b/templates/form-fields/file-field.php
@@ -1,11 +1,11 @@
 <?php if ( ! empty( $field['value'] ) ) : ?>
 	<div class="job-manager-uploaded-image uploaded_image">
-		<img src="<?php echo $field['value']; ?>" /> <?php echo '<code>' . basename( $field['value'] ) . ' <a class="job-manager-remove-uploaded-image" href="#">[' . __( 'remove', 'job_manager' ) . ']</a>' . '</code> ' . __( 'or', 'job_manager' ) . '&hellip;'; ?>
+		<img src="<?php echo $field['value']; ?>" /> <?php echo '<code>' . basename( $field['value'] ) . ' <a class="job-manager-remove-uploaded-image" href="#">[' . __( 'remove', 'wp-job-manager' ) . ']</a>' . '</code> ' . __( 'or', 'wp-job-manager' ) . '&hellip;'; ?>
 		<input type="hidden" class="input-text" name="current_<?php echo esc_attr( isset( $field['name'] ) ? $field['name'] : $key ); ?>" value="<?php echo isset( $field['value'] ) ? esc_attr( $field['value'] ) : ''; ?>" />
 	</div>
 <?php endif; ?>
 
 <input type="file" class="input-text" name="<?php echo esc_attr( isset( $field['name'] ) ? $field['name'] : $key ); ?>" id="<?php echo esc_attr( $key ); ?>" placeholder="<?php echo esc_attr( $field['placeholder'] ); ?>" />
 <small class="description">
-	<?php printf( __( 'Max. file size: %s. Allowed images: jpg, gif, png.', 'job_manager' ), size_format( wp_max_upload_size() ) ); ?>
+	<?php printf( __( 'Max. file size: %s. Allowed images: jpg, gif, png.', 'wp-job-manager' ), size_format( wp_max_upload_size() ) ); ?>
 </small>
\ No newline at end of file
diff --git a/templates/job-application.php b/templates/job-application.php
index 25c76fe7f..ca97b4397 100644
--- a/templates/job-application.php
+++ b/templates/job-application.php
@@ -2,16 +2,16 @@
 	wp_enqueue_script( 'wp-job-manager-job-application' );
 	?>
 	<div class="application">
-		<input class="application_button" type="button" value="<?php _e( 'Apply for job', 'job_manager' ); ?>" />
+		<input class="application_button" type="button" value="<?php _e( 'Apply for job', 'wp-job-manager' ); ?>" />
 
 		<div class="application_details">
 			<?php
 				switch ( $apply->type ) {
 					case 'email' :
 
-						echo '<p>' . sprintf( __( 'To apply for this job <strong>email your details to</strong> <a class="job_application_email" href="mailto:%1$s%2$s">%1$s</a>', 'job_manager' ), $apply->email, '?subject=' . rawurlencode( $apply->subject ) ) . '</p>';
+						echo '<p>' . sprintf( __( 'To apply for this job <strong>email your details to</strong> <a class="job_application_email" href="mailto:%1$s%2$s">%1$s</a>', 'wp-job-manager' ), $apply->email, '?subject=' . rawurlencode( $apply->subject ) ) . '</p>';
 
-						echo '<p>' . __( 'Apply using webmail: ', 'job_manager' );
+						echo '<p>' . __( 'Apply using webmail: ', 'wp-job-manager' );
 
 						echo '<a href="' . 'https://mail.google.com/mail/?view=cm&fs=1&to=' . $apply->email . '&su=' . urlencode( $apply->subject ) .'" target="_blank" class="job_application_email">Gmail</a> / ';
 
@@ -25,7 +25,7 @@
 
 					break;
 					case 'url' :
-						echo '<p>' . sprintf( __( 'To apply for this job please visit the following URL: <a href="%1$s">%1$s &rarr;</a>', 'job_manager' ), $apply->url ) . '</p>';
+						echo '<p>' . sprintf( __( 'To apply for this job please visit the following URL: <a href="%1$s">%1$s &rarr;</a>', 'wp-job-manager' ), $apply->url ) . '</p>';
 					break;
 				}
 			?>
diff --git a/templates/job-dashboard.php b/templates/job-dashboard.php
index 73c02c6cd..194cb6030 100644
--- a/templates/job-dashboard.php
+++ b/templates/job-dashboard.php
@@ -1,19 +1,19 @@
 <div id="job-manager-job-dashboard">
-	<p><?php _e( 'Your job listings are shown in the table below. Expired listings will be automatically removed after 30 days.', 'job_manager' ); ?></p>
+	<p><?php _e( 'Your job listings are shown in the table below. Expired listings will be automatically removed after 30 days.', 'wp-job-manager' ); ?></p>
 	<table class="job-manager-jobs">
 		<thead>
 			<tr>
-				<th class="job_title"><?php _e( 'Job Title', 'job_manager' ); ?></th>
-				<th class="date"><?php _e( 'Date Posted', 'job_manager' ); ?></th>
-				<th class="status"><?php _e( 'Status', 'job_manager' ); ?></th>
-				<th class="expires"><?php _e( 'Expires', 'job_manager' ); ?></th>
-				<th class="filled"><?php _e( 'Filled?', 'job_manager' ); ?></th>
+				<th class="job_title"><?php _e( 'Job Title', 'wp-job-manager' ); ?></th>
+				<th class="date"><?php _e( 'Date Posted', 'wp-job-manager' ); ?></th>
+				<th class="status"><?php _e( 'Status', 'wp-job-manager' ); ?></th>
+				<th class="expires"><?php _e( 'Expires', 'wp-job-manager' ); ?></th>
+				<th class="filled"><?php _e( 'Filled?', 'wp-job-manager' ); ?></th>
 			</tr>
 		</thead>
 		<tbody>
 			<?php if ( ! $jobs ) : ?>
 				<tr>
-					<td colspan="6"><?php _e( 'You do not have any active job listings.', 'job_manager' ); ?></td>
+					<td colspan="6"><?php _e( 'You do not have any active job listings.', 'wp-job-manager' ); ?></td>
 				</tr>
 			<?php else : ?>
 				<?php foreach ( $jobs as $job ) : ?>
@@ -30,17 +30,17 @@
 
 									switch ( $job->post_status ) {
 										case 'publish' :
-											$actions['edit'] = array( 'label' => __( 'Edit', 'job_manager' ), 'nonce' => false );
+											$actions['edit'] = array( 'label' => __( 'Edit', 'wp-job-manager' ), 'nonce' => false );
 
 											if ( is_position_filled( $job ) )
-												$actions['mark_not_filled'] = array( 'label' => __( 'Mark not filled', 'job_manager' ), 'nonce' => true );
+												$actions['mark_not_filled'] = array( 'label' => __( 'Mark not filled', 'wp-job-manager' ), 'nonce' => true );
 											else
-												$actions['mark_filled'] = array( 'label' => __( 'Mark filled', 'job_manager' ), 'nonce' => true );
+												$actions['mark_filled'] = array( 'label' => __( 'Mark filled', 'wp-job-manager' ), 'nonce' => true );
 
 											break;
 									}
 
-									$actions['delete'] = array( 'label' => __( 'Delete', 'job_manager' ), 'nonce' => true );
+									$actions['delete'] = array( 'label' => __( 'Delete', 'wp-job-manager' ), 'nonce' => true );
 									$actions           = apply_filters( 'job_manager_my_job_actions', $actions, $job );
 
 									foreach ( $actions as $action => $value ) {
diff --git a/templates/job-filters.php b/templates/job-filters.php
index 4ecbf6ca8..ac1b0145e 100644
--- a/templates/job-filters.php
+++ b/templates/job-filters.php
@@ -5,13 +5,13 @@
 		<?php do_action( 'job_manager_job_filters_search_jobs_start', $atts ); ?>
 
 		<div class="search_keywords">
-			<label for="search_keywords"><?php _e( 'Keywords', 'job_manager' ); ?></label>
-			<input type="text" name="search_keywords" id="search_keywords" placeholder="<?php _e( 'All Jobs', 'job_manager' ); ?>" value="<?php echo esc_attr( $keywords ); ?>" />
+			<label for="search_keywords"><?php _e( 'Keywords', 'wp-job-manager' ); ?></label>
+			<input type="text" name="search_keywords" id="search_keywords" placeholder="<?php _e( 'All Jobs', 'wp-job-manager' ); ?>" value="<?php echo esc_attr( $keywords ); ?>" />
 		</div>
 
 		<div class="search_location">
-			<label for="search_location"><?php _e( 'Location', 'job_manager' ); ?></label>
-			<input type="text" name="search_location" id="search_location" placeholder="<?php _e( 'Any Location', 'job_manager' ); ?>" value="<?php echo esc_attr( $location ); ?>" />
+			<label for="search_location"><?php _e( 'Location', 'wp-job-manager' ); ?></label>
+			<input type="text" name="search_location" id="search_location" placeholder="<?php _e( 'Any Location', 'wp-job-manager' ); ?>" value="<?php echo esc_attr( $location ); ?>" />
 		</div>
 
 		<?php if ( $categories ) : ?>
@@ -20,8 +20,8 @@
 			<?php endforeach; ?>
 		<?php elseif ( $show_categories && get_option( 'job_manager_enable_categories' ) && ! is_tax( 'job_listing_category' ) ) : ?>
 			<div class="search_categories">
-				<label for="search_categories"><?php _e( 'Category', 'job_manager' ); ?></label>
-				<?php wp_dropdown_categories( array( 'taxonomy' => 'job_listing_category', 'hierarchical' => 1, 'show_option_all' => __( 'All Job Categories', 'job_manager' ), 'name' => 'search_categories' ) ); ?>
+				<label for="search_categories"><?php _e( 'Category', 'wp-job-manager' ); ?></label>
+				<?php wp_dropdown_categories( array( 'taxonomy' => 'job_listing_category', 'hierarchical' => 1, 'show_option_all' => __( 'All Job Categories', 'wp-job-manager' ), 'name' => 'search_categories' ) ); ?>
 			</div>
 		<?php endif; ?>
 
diff --git a/templates/job-submit.php b/templates/job-submit.php
index b36222e40..9732057e0 100644
--- a/templates/job-submit.php
+++ b/templates/job-submit.php
@@ -21,7 +21,7 @@
 
 		<?php foreach ( $job_fields as $key => $field ) : ?>
 			<fieldset class="fieldset-<?php esc_attr_e( $key ); ?>">
-				<label for="<?php esc_attr_e( $key ); ?>"><?php echo $field['label'] . ( $field['required'] ? '' : ' <small>' . __( '(optional)', 'job_manager' ) . '</small>' ); ?></label>
+				<label for="<?php esc_attr_e( $key ); ?>"><?php echo $field['label'] . ( $field['required'] ? '' : ' <small>' . __( '(optional)', 'wp-job-manager' ) . '</small>' ); ?></label>
 				<div class="field">
 					<?php get_job_manager_template( 'form-fields/' . $field['type'] . '-field.php', array( 'key' => $key, 'field' => $field ) ); ?>
 				</div>
@@ -31,13 +31,13 @@
 		<?php do_action( 'submit_job_form_job_fields_end' ); ?>
 
 		<!-- Company Information Fields -->
-		<h2><?php _e( 'Company details', 'job_manager' ); ?></h2>
+		<h2><?php _e( 'Company details', 'wp-job-manager' ); ?></h2>
 
 		<?php do_action( 'submit_job_form_company_fields_start' ); ?>
 
 		<?php foreach ( $company_fields as $key => $field ) : ?>
 			<fieldset class="fieldset-<?php esc_attr_e( $key ); ?>">
-				<label for="<?php esc_attr_e( $key ); ?>"><?php echo $field['label'] . ( $field['required'] ? '' : ' <small>' . __( '(optional)', 'job_manager' ) . '</small>' ); ?></label>
+				<label for="<?php esc_attr_e( $key ); ?>"><?php echo $field['label'] . ( $field['required'] ? '' : ' <small>' . __( '(optional)', 'wp-job-manager' ) . '</small>' ); ?></label>
 				<div class="field">
 					<?php get_job_manager_template( 'form-fields/' . $field['type'] . '-field.php', array( 'key' => $key, 'field' => $field ) ); ?>
 				</div>
diff --git a/templates/job-submitted.php b/templates/job-submitted.php
index 8a67405f9..450d0ed80 100644
--- a/templates/job-submitted.php
+++ b/templates/job-submitted.php
@@ -1,10 +1,10 @@
 <?php
 switch ( $job->post_status ) :
 	case 'publish' :
-		printf( __( 'Job listed successfully. To view your job listing <a href="%s">click here</a>.', 'job_manager' ), get_permalink( $job->ID ) );
+		printf( __( 'Job listed successfully. To view your job listing <a href="%s">click here</a>.', 'wp-job-manager' ), get_permalink( $job->ID ) );
 	break;
 	case 'pending' :
-		printf( __( 'Job submitted successfully. Your job listing will be visible once approved.', 'job_manager' ), get_permalink( $job->ID ) );
+		printf( __( 'Job submitted successfully. Your job listing will be visible once approved.', 'wp-job-manager' ), get_permalink( $job->ID ) );
 	break;
 	default :
 		do_action( 'job_manager_job_submitted_content_' . str_replace( '-', '_', sanitize_title( $job->post_status ) ), $job );
diff --git a/wp-job-manager-functions.php b/wp-job-manager-functions.php
index 4488245b0..ef1c22ec1 100644
--- a/wp-job-manager-functions.php
+++ b/wp-job-manager-functions.php
@@ -189,11 +189,11 @@ function job_manager_get_filtered_links( $args = array() ) {
 
 	$links = apply_filters( 'job_manager_job_filters_showing_jobs_links', array(
 		'reset' => array(
-			'name' => __( 'Reset', 'job_manager' ),
+			'name' => __( 'Reset', 'wp-job-manager' ),
 			'url'  => '#'
 		),
 		'rss_link' => array(
-			'name' => __( 'RSS', 'job_manager' ),
+			'name' => __( 'RSS', 'wp-job-manager' ),
 			'url'  => get_job_listing_rss_link( apply_filters( 'job_manager_get_listings_custom_filter_rss_args', array(
 				'type'           => isset( $args['filter_job_types'] ) ? implode( ',', $args['filter_job_types'] ) : '',
 				'location'       => $args['search_location'],
@@ -243,10 +243,10 @@ function wp_job_manager_create_account( $account_email, $role = '' ) {
 		return false;
 
 	if ( ! is_email( $user_email ) )
-		return new WP_Error( 'validation-error', __( 'Your email address isn&#8217;t correct.', 'job_manager' ) );
+		return new WP_Error( 'validation-error', __( 'Your email address isn&#8217;t correct.', 'wp-job-manager' ) );
 
 	if ( email_exists( $user_email ) )
-		return new WP_Error( 'validation-error', __( 'This email is already registered, please choose another one.', 'job_manager' ) );
+		return new WP_Error( 'validation-error', __( 'This email is already registered, please choose another one.', 'wp-job-manager' ) );
 
 	// Email is good to go - use it to create a user name
 	$username = sanitize_user( current( explode( '@', $user_email ) ) );
diff --git a/wp-job-manager-template.php b/wp-job-manager-template.php
index bc115964e..8ad5a0207 100644
--- a/wp-job-manager-template.php
+++ b/wp-job-manager-template.php
@@ -113,13 +113,13 @@ function get_the_job_status( $post = null ) {
 	$status = $post->post_status;
 
 	if ( $status == 'publish' )
-		$status = __( 'Active', 'job_manager' );
+		$status = __( 'Active', 'wp-job-manager' );
 	elseif ( $status == 'expired' )
-		$status = __( 'Expired', 'job_manager' );
+		$status = __( 'Expired', 'wp-job-manager' );
 	elseif ( $status == 'pending' )
-		$status = __( 'Pending Review', 'job_manager' );
+		$status = __( 'Pending Review', 'wp-job-manager' );
 	else
-		$status = __( 'Inactive', 'job_manager' );
+		$status = __( 'Inactive', 'wp-job-manager' );
 
 	return apply_filters( 'the_job_status', $status, $post );
 }
@@ -252,7 +252,7 @@ function the_job_location( $map_link = true, $post = null ) {
 		else
 			echo $location;
 	} else {
-		echo apply_filters( 'the_job_location_anywhere_text', __( 'Anywhere', 'job_manager' ) );
+		echo apply_filters( 'the_job_location_anywhere_text', __( 'Anywhere', 'wp-job-manager' ) );
 	}
 }
 
diff --git a/wp-job-manager.php b/wp-job-manager.php
index 2fe5b370b..58151b668 100644
--- a/wp-job-manager.php
+++ b/wp-job-manager.php
@@ -3,7 +3,7 @@
 Plugin Name: WP Job Manager
 Plugin URI: http://mikejolley.com/projects/wp-job-manager/
 Description: Manage job listings from the WordPress admin panel, and allow users to post jobs directly to your site.
-Version: 1.7.0
+Version: 1.7.1
 Author: Mike Jolley
 Author URI: http://mikejolley.com
 Requires at least: 3.8
@@ -28,7 +28,7 @@ class WP_Job_Manager {
 	 */
 	public function __construct() {
 		// Define constants
-		define( 'JOB_MANAGER_VERSION', '1.7.0' );
+		define( 'JOB_MANAGER_VERSION', '1.7.1' );
 		define( 'JOB_MANAGER_PLUGIN_DIR', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
 		define( 'JOB_MANAGER_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
 
@@ -78,7 +78,7 @@ public function updater() {
 	 * @return void
 	 */
 	public function load_plugin_textdomain() {
-		load_plugin_textdomain( 'job_manager', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+		load_plugin_textdomain( 'wp-job-manager', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
 	}
 
 	/**
@@ -97,7 +97,7 @@ public function frontend_scripts() {
 			'ajax_url' => admin_url('admin-ajax.php')
 		) );
 		wp_localize_script( 'wp-job-manager-job-dashboard', 'job_manager_job_dashboard', array(
-			'i18n_confirm_delete' => __( 'Are you sure you want to delete this job?', 'job_manager' )
+			'i18n_confirm_delete' => __( 'Are you sure you want to delete this job?', 'wp-job-manager' )
 		) );
 
 		wp_enqueue_style( 'wp-job-manager-frontend', JOB_MANAGER_PLUGIN_URL . '/assets/css/frontend.css' );