Ticket #960

modules/boonex/russian/data/langs/bx_videos/ru.xml

@@ -187,38 +187,15 @@
     <string name="_bx_videos_search_extended_cmts"><![CDATA[Поиск комментариев к видео]]></string>
 
     <string name="_bx_videos_pre_lists_cats"><![CDATA[Видео категории]]></string>
-    <string name="_bx_videos_cat_Animals_Pets"><![CDATA[Животные]]></string>
-    <string name="_bx_videos_cat_Architecture"><![CDATA[Архитектура]]></string>
-    <string name="_bx_videos_cat_Art"><![CDATA[Искусство]]></string>
-    <string name="_bx_videos_cat_Cars_Motorcycles"><![CDATA[Авто и мото]]></string>
-    <string name="_bx_videos_cat_Celebrities"><![CDATA[Знаменитости]]></string>
-    <string name="_bx_videos_cat_Design"><![CDATA[Дизайн]]></string>
-    <string name="_bx_videos_cat_DIY_Crafts"><![CDATA[Сделай сам]]></string>
-    <string name="_bx_videos_cat_Education"><![CDATA[Образование]]></string>
-    <string name="_bx_videos_cat_Film_Music_Books"><![CDATA[Фильмы, музыка и книги]]></string>
-    <string name="_bx_videos_cat_Food_Drink"><![CDATA[Еда и напитки]]></string>
-    <string name="_bx_videos_cat_Gardening"><![CDATA[Сад и огород]]></string>
-    <string name="_bx_videos_cat_Geek"><![CDATA[Гик]]></string>
-    <string name="_bx_videos_cat_Hair_Beauty"><![CDATA[Причёски и макияж]]></string>
-    <string name="_bx_videos_cat_Health_Fitness"><![CDATA[Здоровье и фитнесс]]></string>
-    <string name="_bx_videos_cat_History"><![CDATA[История]]></string>
-    <string name="_bx_videos_cat_Holidays_Events"><![CDATA[Праздники и события]]></string>
-    <string name="_bx_videos_cat_Home_Decor"><![CDATA[Интерьер]]></string>
-    <string name="_bx_videos_cat_Humor"><![CDATA[Юмор]]></string>
-    <string name="_bx_videos_cat_Illustrations_Posters"><![CDATA[Иллюстрации и постеры]]></string>
-    <string name="_bx_videos_cat_Kids_Parenting"><![CDATA[Дети и родители]]></string>
-    <string name="_bx_videos_cat_Mens_Fashion"><![CDATA[Мужская мода]]></string>
-    <string name="_bx_videos_cat_Outdoors"><![CDATA[Туризм]]></string>
-    <string name="_bx_videos_cat_Photography"><![CDATA[Фотография]]></string>
-    <string name="_bx_videos_cat_Products"><![CDATA[Продукты]]></string>
-    <string name="_bx_videos_cat_Quotes"><![CDATA[Цитаты]]></string>
-    <string name="_bx_videos_cat_Science_Nature"><![CDATA[Наука и природа]]></string>
-    <string name="_bx_videos_cat_Sports"><![CDATA[Спорт]]></string>
-    <string name="_bx_videos_cat_Tattoos"><![CDATA[Татуеровки]]></string>
-    <string name="_bx_videos_cat_Technology"><![CDATA[Технологии]]></string>
-    <string name="_bx_videos_cat_Travel"><![CDATA[Путешествия]]></string>
-    <string name="_bx_videos_cat_Weddings"><![CDATA[Свадьба]]></string>
-    <string name="_bx_videos_cat_Womens_Fashion"><![CDATA[Женская мода]]></string>
+    <string name="_bx_videos_cat_animals_and_pets"><![CDATA[Животные]]></string>
+    <string name="_bx_videos_cat_education"><![CDATA[Образование]]></string>
+    <string name="_bx_videos_cat_entertainment"><![CDATA[Развлечения]]></string>
+    <string name="_bx_videos_cat_film_and_animation"><![CDATA[Фильм и анимация]]></string>
+    <string name="_bx_videos_cat_music"><![CDATA[Музыка]]></string>
+    <string name="_bx_videos_cat_news"><![CDATA[Новости]]></string>
+    <string name="_bx_videos_cat_people_and_blogs"><![CDATA[Люди и Блоги]]></string>
+    <string name="_bx_videos_cat_sports"><![CDATA[Спорт]]></string>
+    <string name="_bx_videos_cat_travel"><![CDATA[Путешествия]]></string>
 
     <string name="_bx_videos_txt_all_entries_by"><![CDATA[<a href="{0}">Все видео от {1} ({2})</a>]]></string>
     <string name="_bx_videos_txt_sample_single"><![CDATA[видео]]></string>

modules/boonex/videos/install/langs/en.xml

@@ -187,38 +187,15 @@
     <string name="_bx_videos_search_extended_cmts"><![CDATA[Videos Comments Search]]></string>
 
     <string name="_bx_videos_pre_lists_cats"><![CDATA[Video categories]]></string>
-    <string name="_bx_videos_cat_Animals_Pets"><![CDATA[Animals & Pets]]></string>
-    <string name="_bx_videos_cat_Architecture"><![CDATA[Architecture]]></string>
-    <string name="_bx_videos_cat_Art"><![CDATA[Art]]></string>
-    <string name="_bx_videos_cat_Cars_Motorcycles"><![CDATA[Cars & Motorcycles]]></string>
-    <string name="_bx_videos_cat_Celebrities"><![CDATA[Celebrities]]></string>
-    <string name="_bx_videos_cat_Design"><![CDATA[Design]]></string>
-    <string name="_bx_videos_cat_DIY_Crafts"><![CDATA[DIY & Crafts]]></string>
-    <string name="_bx_videos_cat_Education"><![CDATA[Education]]></string>
-    <string name="_bx_videos_cat_Film_Music_Books"><![CDATA[Film, Music & Books]]></string>
-    <string name="_bx_videos_cat_Food_Drink"><![CDATA[Food & Drink]]></string>
-    <string name="_bx_videos_cat_Gardening"><![CDATA[Gardening]]></string>
-    <string name="_bx_videos_cat_Geek"><![CDATA[Geek]]></string>
-    <string name="_bx_videos_cat_Hair_Beauty"><![CDATA[Hair & Beauty]]></string>
-    <string name="_bx_videos_cat_Health_Fitness"><![CDATA[Health & Fitness]]></string>
-    <string name="_bx_videos_cat_History"><![CDATA[History]]></string>
-    <string name="_bx_videos_cat_Holidays_Events"><![CDATA[Holidays & Events]]></string>
-    <string name="_bx_videos_cat_Home_Decor"><![CDATA[Home Decor]]></string>
-    <string name="_bx_videos_cat_Humor"><![CDATA[Humor]]></string>
-    <string name="_bx_videos_cat_Illustrations_Posters"><![CDATA[Illustrations & Posters]]></string>
-    <string name="_bx_videos_cat_Kids_Parenting"><![CDATA[Kids & Parenting]]></string>
-    <string name="_bx_videos_cat_Mens_Fashion"><![CDATA[Men's Fashion]]></string>
-    <string name="_bx_videos_cat_Outdoors"><![CDATA[Outdoors]]></string>
-    <string name="_bx_videos_cat_Photography"><![CDATA[Photography]]></string>
-    <string name="_bx_videos_cat_Products"><![CDATA[Products]]></string>
-    <string name="_bx_videos_cat_Quotes"><![CDATA[Quotes]]></string>
-    <string name="_bx_videos_cat_Science_Nature"><![CDATA[Science & Nature]]></string>
-    <string name="_bx_videos_cat_Sports"><![CDATA[Sports]]></string>
-    <string name="_bx_videos_cat_Tattoos"><![CDATA[Tattoos]]></string>
-    <string name="_bx_videos_cat_Technology"><![CDATA[Technology]]></string>
-    <string name="_bx_videos_cat_Travel"><![CDATA[Travel]]></string>
-    <string name="_bx_videos_cat_Weddings"><![CDATA[Weddings]]></string>
-    <string name="_bx_videos_cat_Womens_Fashion"><![CDATA[Women's Fashion]]></string>
+    <string name="_bx_videos_cat_animals_and_pets"><![CDATA[Animals & Pets]]></string>
+    <string name="_bx_videos_cat_education"><![CDATA[Education]]></string>
+    <string name="_bx_videos_cat_entertainment"><![CDATA[Entertainment]]></string>
+    <string name="_bx_videos_cat_film_and_animation"><![CDATA[Film & Animation]]></string>
+    <string name="_bx_videos_cat_music"><![CDATA[Music]]></string>
+    <string name="_bx_videos_cat_news"><![CDATA[News]]></string>
+    <string name="_bx_videos_cat_people_and_blogs"><![CDATA[People & Blogs]]></string>
+    <string name="_bx_videos_cat_sports"><![CDATA[Sports]]></string>
+    <string name="_bx_videos_cat_travel"><![CDATA[Travel]]></string>
 
     <string name="_bx_videos_txt_all_entries_by"><![CDATA[<a href="{0}">All Videos by {1} ({2})</a>]]></string>
     <string name="_bx_videos_txt_sample_single"><![CDATA[video]]></string>

modules/boonex/videos/install/sql/install.sql

@@ -282,38 +282,15 @@ INSERT INTO `sys_form_pre_lists`(`key`, `title`, `module`, `use_for_sets`) VALUE
 
 INSERT INTO `sys_form_pre_values`(`Key`, `Value`, `Order`, `LKey`, `LKey2`) VALUES
 ('bx_videos_cats', '', 0, '_sys_please_select', ''),
-('bx_videos_cats', '1', 1, '_bx_videos_cat_Animals_Pets', ''),
-('bx_videos_cats', '2', 2, '_bx_videos_cat_Architecture', ''),
-('bx_videos_cats', '3', 3, '_bx_videos_cat_Art', ''),
-('bx_videos_cats', '4', 4, '_bx_videos_cat_Cars_Motorcycles', ''),
-('bx_videos_cats', '5', 5, '_bx_videos_cat_Celebrities', ''),
-('bx_videos_cats', '6', 6, '_bx_videos_cat_Design', ''),
-('bx_videos_cats', '7', 7, '_bx_videos_cat_DIY_Crafts', ''),
-('bx_videos_cats', '8', 8, '_bx_videos_cat_Education', ''),
-('bx_videos_cats', '9', 9, '_bx_videos_cat_Film_Music_Books', ''),
-('bx_videos_cats', '10', 10, '_bx_videos_cat_Food_Drink', ''),
-('bx_videos_cats', '11', 11, '_bx_videos_cat_Gardening', ''),
-('bx_videos_cats', '12', 12, '_bx_videos_cat_Geek', ''),
-('bx_videos_cats', '13', 13, '_bx_videos_cat_Hair_Beauty', ''),
-('bx_videos_cats', '14', 14, '_bx_videos_cat_Health_Fitness', ''),
-('bx_videos_cats', '15', 15, '_bx_videos_cat_History', ''),
-('bx_videos_cats', '16', 16, '_bx_videos_cat_Holidays_Events', ''),
-('bx_videos_cats', '17', 17, '_bx_videos_cat_Home_Decor', ''),
-('bx_videos_cats', '18', 18, '_bx_videos_cat_Humor', ''),
-('bx_videos_cats', '19', 19, '_bx_videos_cat_Illustrations_Posters', ''),
-('bx_videos_cats', '20', 20, '_bx_videos_cat_Kids_Parenting', ''),
-('bx_videos_cats', '21', 21, '_bx_videos_cat_Mens_Fashion', ''),
-('bx_videos_cats', '22', 22, '_bx_videos_cat_Outdoors', ''),
-('bx_videos_cats', '23', 23, '_bx_videos_cat_Photography', ''),
-('bx_videos_cats', '24', 24, '_bx_videos_cat_Products', ''),
-('bx_videos_cats', '25', 25, '_bx_videos_cat_Quotes', ''),
-('bx_videos_cats', '26', 26, '_bx_videos_cat_Science_Nature', ''),
-('bx_videos_cats', '27', 27, '_bx_videos_cat_Sports', ''),
-('bx_videos_cats', '28', 28, '_bx_videos_cat_Tattoos', ''),
-('bx_videos_cats', '29', 29, '_bx_videos_cat_Technology', ''),
-('bx_videos_cats', '30', 30, '_bx_videos_cat_Travel', ''),
-('bx_videos_cats', '31', 31, '_bx_videos_cat_Weddings', ''),
-('bx_videos_cats', '32', 32, '_bx_videos_cat_Womens_Fashion', '');
+('bx_videos_cats', '1', 1, '_bx_videos_cat_animals_and_pets', ''),
+('bx_videos_cats', '2', 2, '_bx_videos_cat_education', ''),
+('bx_videos_cats', '3', 3, '_bx_videos_cat_entertainment', ''),
+('bx_videos_cats', '4', 4, '_bx_videos_cat_film_and_animation', ''),
+('bx_videos_cats', '5', 5, '_bx_videos_cat_music', ''),
+('bx_videos_cats', '6', 6, '_bx_videos_cat_news', ''),
+('bx_videos_cats', '7', 7, '_bx_videos_cat_people_and_blogs', ''),
+('bx_videos_cats', '8', 8, '_bx_videos_cat_sports', ''),
+('bx_videos_cats', '9', 9, '_bx_videos_cat_travel', '');
 
 
 -- COMMENTS