From 541506a9293f3b9a212e2c7efda901191b13d6ba Mon Sep 17 00:00:00 2001 From: vi Date: Fri, 18 Sep 2015 10:47:29 +1000 Subject: [PATCH] Forgot some server settings --- config/locales/server.en.yml | 45 +----------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index dda978f..8bd8450 100755 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1,6 +1,5 @@ en: site_settings: -<<<<<<< HEAD dfp_publisher_id: "Input your publisher ID" dfp_through_trust_level: "Show your ads to users based on trust levels" dfp_show_topic_list_top: "Disable ad at topic list top location" @@ -33,40 +32,6 @@ en: adsense_show_topic_list_top: "Disable ad at topic list top location" adsense_topic_list_top_code: "Enter ad code to display at topic list top location" adsense_mobile_topic_list_top_code: "Enter ad code to display mobile ads at topic list top location" -======= - dfp_publisher_id: "Put in your publisher id here" - dfp_through_trust_level: "Show your ads to users based on trust." - dfp_show_topic_list_top: "Disable topic_list_top ad" - dfp_topic_list_top_code: "Show leaderboard ad above topic lists." - dfp_mobile_topic_list_top_code: "Mobile - Show leaderboard ad above topic lists." - dfp_topic_list_top_ad_sizes: "Choose your ad size" - dfp_target_topic_list_top_key_code: "Input key values - Inventory Level" - dfp_target_topic_list_top_value_code: "Input key values - Inventory Level" - dfp_show_topic_above_post_stream: "Disable topic_above_post_stream ad" - dfp_topic_above_post_stream_code: "Show leaderboard ad above post stream" - dfp_mobile_topic_above_post_stream_code: "Mobile - Show leaderboard ad above post stream" - dfp_topic_above_post_stream_ad_sizes: "Choose your ad size" - dfp_target_topic_above_post_stream_key_code: "Input key values - Inventory Level" - dfp_target_topic_above_post_stream_value_code: "Input key values - Inventory Level" - dfp_show_topic_above_suggested: "Disable topic_above_suggested ad" - dfp_topic_above_suggested_code: "Show leaderboard ad above suggested topics" - dfp_mobile_topic_above_suggested_code: "Mobile - Show leaderboard ad above suggested topics" - dfp_topic_above_suggested_ad_sizes: "Choose your ad size" - dfp_target_topic_above_suggested_key_code: "Input key values - Inventory Level" - dfp_target_topic_above_suggested_value_code: "Input key values - Inventory Level" - dfp_show_post_bottom: "Disable post_bottom ad" - dfp_post_bottom_code: "Show leaderboard ad post_bottom topics" - dfp_mobile_post_bottom_code: "Mobile - Show leaderboard ad post_bottom topics" - dfp_nth_post_code: "Choose the Nth position for your ad to show" - dfp_post_bottom_ad_sizes: "Choose your ad size" - dfp_target_post_bottom_key_code: "Input key values - Inventory Level" - dfp_target_post_bottom_value_code: "Input key values - Inventory Level" - adsense_publisher_code: "Insert your Publisher ID here" - adsense_through_trust_level: "Show your ads to users based on trust." - adsense_show_topic_list_top: "Disable topic_list_top ad" - adsense_topic_list_top_code: "Show leaderboard ad above topic lists." - adsense_mobile_topic_list_top_code: "Mobile - Show leaderboard ad above topic lists" ->>>>>>> amazon adsense_topic_list_top_ad_sizes: "Choose your ad sizes" adsense_show_topic_above_post_stream: "Disable ad at topic above post stream location" adsense_topic_above_post_stream_code: "Enter ad code to display at topic above post stream location" @@ -76,18 +41,11 @@ en: adsense_topic_above_suggested_code: "Enter ad code to display at topic above suggested location" adsense_mobile_topic_above_suggested_code: "Enter ad code to display mobile ads at topic above suggested location" adsense_topic_above_suggested_ad_sizes: "Choose your ad sizes" -<<<<<<< HEAD + adsense_show_post_bottom: "Disable ad at post bottom location" adsense_post_bottom_code: "Enter ad code to display ads at post bottom location" adsense_mobile_post_bottom_code: "Enter ad code to display mobile ads at post bottom location" - adsense_show_post_bottom: "Disable ad at post bottom location" adsense_post_bottom_ad_sizes: "Choose your ad sizes" adsense_nth_post_code: "Choose a post number for your ad to show in the post bottom location - this is the nth post" -======= - adsense_show_post_bottom: "Disable post_bottom ad" - adsense_post_bottom_code: "Show leaderboard ad post_bottom topics" - adsense_mobile_post_bottom_code: "Mobile - Show leaderboard ad post_bottom topics" - adsense_post_bottom_ad_sizes: "Choose your ad sizes" - adsense_nth_post_code: "Choose the Nth position for your ad to show" amazon_through_trust_level: "Input trust level" amazon_topic_list_top_src_code: "Input your Src code" amazon_topic_list_top_ad_width_code: "Choose your ad width" @@ -114,4 +72,3 @@ en: amazon_mobile_post_bottom_ad_width_code: "Choose your ad width (Mobile)" amazon_mobile_post_bottom_ad_height_code: "Choose your ad height (Mobile)" amazon_nth_post_code: "Choose the Nth position for your ad to show" ->>>>>>> amazon