From a92e20c4cca3c01bf87f6953b4e290337a000aa6 Mon Sep 17 00:00:00 2001 From: ksym04 Date: Thu, 5 Nov 2020 11:38:42 +0800 Subject: [PATCH] Version 1.0.14 --- .../zaso-spacer-widgets/assets/banner.svg | 451 +--------- .../zaso-video-widgets/assets/banner.svg | 451 +--------- .../assets/banner.svg | 526 +---------- .../assets/banner.svg | 451 +--------- lang/zaso-en_AU.po | 94 -- lang/zaso-en_US.po | 824 +----------------- readme.md | 12 +- readme.txt | 11 +- zen-addons-siteorigin.php | 4 +- 9 files changed, 36 insertions(+), 2788 deletions(-) diff --git a/core/basic/zaso-spacer-widgets/assets/banner.svg b/core/basic/zaso-spacer-widgets/assets/banner.svg index d41ce1c..2c142a0 100644 --- a/core/basic/zaso-spacer-widgets/assets/banner.svg +++ b/core/basic/zaso-spacer-widgets/assets/banner.svg @@ -1,450 +1 @@ -<<<<<<< HEAD -Spacer -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf +Spacer \ No newline at end of file diff --git a/core/basic/zaso-video-widgets/assets/banner.svg b/core/basic/zaso-video-widgets/assets/banner.svg index f78af3c..7984bd7 100644 --- a/core/basic/zaso-video-widgets/assets/banner.svg +++ b/core/basic/zaso-video-widgets/assets/banner.svg @@ -1,450 +1 @@ -<<<<<<< HEAD -Addvideo -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf +Addvideo \ No newline at end of file diff --git a/core/basic/zaso-vimeo-lightbox-widgets/assets/banner.svg b/core/basic/zaso-vimeo-lightbox-widgets/assets/banner.svg index e4549bb..28b0f07 100644 --- a/core/basic/zaso-vimeo-lightbox-widgets/assets/banner.svg +++ b/core/basic/zaso-vimeo-lightbox-widgets/assets/banner.svg @@ -1,525 +1 @@ -<<<<<<< HEAD -VimeoLightBox -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf +VimeoLightBox \ No newline at end of file diff --git a/core/basic/zaso-youtube-lightbox-widgets/assets/banner.svg b/core/basic/zaso-youtube-lightbox-widgets/assets/banner.svg index 6a99a84..17374de 100644 --- a/core/basic/zaso-youtube-lightbox-widgets/assets/banner.svg +++ b/core/basic/zaso-youtube-lightbox-widgets/assets/banner.svg @@ -1,450 +1 @@ -<<<<<<< HEAD -YoutubeLightBox -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf +YoutubeLightBox \ No newline at end of file diff --git a/lang/zaso-en_AU.po b/lang/zaso-en_AU.po index e9f5f8e..6a301d1 100644 --- a/lang/zaso-en_AU.po +++ b/lang/zaso-en_AU.po @@ -1,13 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Zen Addons for SiteOrigin Page Builder\n" -<<<<<<< HEAD "POT-Creation-Date: 2020-11-05 11:27+0800\n" "PO-Revision-Date: 2020-11-05 11:27+0800\n" -======= -"POT-Creation-Date: 2020-10-24 07:34+0800\n" -"PO-Revision-Date: 2020-10-24 07:54+0800\n" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf "Last-Translator: \n" "Language-Team: DopeThemes \n" "Language: en_AU\n" @@ -15,11 +10,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.3.1\n" -<<<<<<< HEAD "X-Poedit-Basepath: ..\n" -======= -"X-Poedit-Basepath: ../..\n" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: __;_e;esc_html__;esc_html_e\n" @@ -54,7 +45,6 @@ msgstr "Hide" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:34 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:46 -<<<<<<< HEAD #: core/basic/zaso-bbpress-forum-index-widgets/zaso-bbpress-forum-index-widgets.php:48 #: core/basic/zaso-bbpress-login-widgets/zaso-bbpress-login-widgets.php:21 #: core/basic/zaso-bbpress-registration-widgets/zaso-bbpress-registration-widgets.php:21 @@ -63,11 +53,6 @@ msgstr "Hide" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:375 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:65 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:134 -======= -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:43 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:375 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:65 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:43 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:59 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:27 @@ -80,7 +65,6 @@ msgstr "Extra ID" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:35 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:47 -<<<<<<< HEAD #: core/basic/zaso-bbpress-forum-index-widgets/zaso-bbpress-forum-index-widgets.php:49 #: core/basic/zaso-bbpress-login-widgets/zaso-bbpress-login-widgets.php:22 #: core/basic/zaso-bbpress-registration-widgets/zaso-bbpress-registration-widgets.php:22 @@ -89,11 +73,6 @@ msgstr "Extra ID" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:376 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:66 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:135 -======= -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:44 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:376 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:66 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:44 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:60 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:28 @@ -106,7 +85,6 @@ msgstr "Add an extra ID." #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:39 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:51 -<<<<<<< HEAD #: core/basic/zaso-bbpress-forum-index-widgets/zaso-bbpress-forum-index-widgets.php:53 #: core/basic/zaso-bbpress-login-widgets/zaso-bbpress-login-widgets.php:26 #: core/basic/zaso-bbpress-registration-widgets/zaso-bbpress-registration-widgets.php:26 @@ -115,11 +93,6 @@ msgstr "Add an extra ID." #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:380 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:70 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:139 -======= -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:48 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:380 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:70 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:48 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:64 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:32 @@ -132,7 +105,6 @@ msgstr "Extra Class" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:40 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:52 -<<<<<<< HEAD #: core/basic/zaso-bbpress-forum-index-widgets/zaso-bbpress-forum-index-widgets.php:54 #: core/basic/zaso-bbpress-login-widgets/zaso-bbpress-login-widgets.php:27 #: core/basic/zaso-bbpress-registration-widgets/zaso-bbpress-registration-widgets.php:27 @@ -141,11 +113,6 @@ msgstr "Extra Class" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:381 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:71 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:140 -======= -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:49 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:381 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:71 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:49 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:65 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:33 @@ -194,10 +161,7 @@ msgstr "Font Size" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:69 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:128 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:204 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:76 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:125 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:201 msgid "Margin" @@ -212,11 +176,8 @@ msgstr "Margin" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:138 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:165 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:349 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:81 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:108 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:130 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:157 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:206 @@ -235,11 +196,8 @@ msgstr "Top" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:143 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:170 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:354 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:86 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:113 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:120 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:135 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:162 @@ -257,11 +215,8 @@ msgstr "Right" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:148 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:175 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:359 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:91 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:118 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:140 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:167 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:216 @@ -280,11 +235,8 @@ msgstr "Bottom" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:153 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:180 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:364 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:96 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:123 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:118 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:145 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:172 @@ -296,10 +248,7 @@ msgstr "Left" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:96 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:155 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:231 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:103 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:152 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:228 msgid "Padding" @@ -398,10 +347,7 @@ msgid "Create contextual feedback and flexible alert messages." msgstr "Create contextual feedback and flexible alert messages." #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:21 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:31 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf msgid "Title" msgstr "Title" @@ -523,7 +469,6 @@ msgstr "ZASO - Basic Tabs" msgid "Create multiple panels contained in a single window." msgstr "Create multiple panels contained in a single window." -<<<<<<< HEAD #: core/basic/zaso-bbpress-forum-index-widgets/zaso-bbpress-forum-index-widgets.php:21 #: core/basic/zaso-bbpress-topic-index-widgets/zaso-bbpress-topic-index-widgets.php:31 msgid "Show Pagination" @@ -602,8 +547,6 @@ msgstr "" "Display recent 15 topics across all forums with optional pagination and " "search." -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:31 msgid "No existing form." msgstr "No existing form." @@ -869,7 +812,6 @@ msgstr "ZASO - Icon" msgid "Set single icon on popular iconic font or upload your custom icon." msgstr "Set single icon on popular iconic font or upload your custom icon." -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:21 msgid "Image Icon Group" msgstr "Image Icon Group" @@ -919,8 +861,6 @@ msgstr "ZASO - Image Icon Group" msgid "Set group of image icon." msgstr "Set group of image icon." -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:21 msgid "Info Title" msgstr "Info Title" @@ -977,13 +917,6 @@ msgstr "Accordion Initial State" msgid "Open" msgstr "Open" -<<<<<<< HEAD -======= -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:50 -msgid "Settings" -msgstr "Settings" - ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:53 msgid "Allow Multiple Open" msgstr "Allow Multiple Open" @@ -1063,25 +996,6 @@ msgstr "Loop" msgid "Play the video again when it reaches the end, infinitely." msgstr "Play the video again when it reaches the end, infinitely." -<<<<<<< HEAD -======= -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:30 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:40 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:50 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:28 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:36 -msgid "No" -msgstr "No" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:31 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:41 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:51 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:29 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:37 -msgid "Yes" -msgstr "Yes" - ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:36 msgid "Muted" msgstr "Muted" @@ -1133,13 +1047,8 @@ msgid "ZASO - Widgetized" msgstr "ZASO - Widgetized" #: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:55 -<<<<<<< HEAD msgid "Get existing widget sidebars to display on the main content." msgstr "Get existing widget sidebars to display on the main content." -======= -msgid "Get widget sidebar." -msgstr "Get widget sidebar." ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:21 msgid "YouTube Video URL" @@ -1176,7 +1085,6 @@ msgstr "ZASO Widgets" #: zen-addons-siteorigin.php:76 msgid "Zen Addons for SiteOrigin" msgstr "Zen Addons for SiteOrigin" -<<<<<<< HEAD #~ msgid "Advanced Custom Fields" #~ msgstr "Advanced Custom Fields" @@ -24215,5 +24123,3 @@ msgstr "Zen Addons for SiteOrigin" #~ msgid "* If you are not using any category statistics, you can ignore it." #~ msgstr "* If you are not using any category statistics, you can ignore it." -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf diff --git a/lang/zaso-en_US.po b/lang/zaso-en_US.po index d04a6a0..eae6f3f 100644 --- a/lang/zaso-en_US.po +++ b/lang/zaso-en_US.po @@ -1,13 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Zen Addons for SiteOrigin Page Builder\n" -<<<<<<< HEAD "POT-Creation-Date: 2020-11-05 11:31+0800\n" "PO-Revision-Date: 2020-11-05 11:31+0800\n" -======= -"POT-Creation-Date: 2020-10-24 07:34+0800\n" -"PO-Revision-Date: 2020-10-24 07:39+0800\n" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf "Last-Translator: \n" "Language-Team: DopeThemes \n" "Language: en_US\n" @@ -15,11 +10,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.3.1\n" -<<<<<<< HEAD "X-Poedit-Basepath: ..\n" -======= -"X-Poedit-Basepath: ../..\n" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: __;_e;esc_html__;esc_html_e\n" @@ -28,7 +19,6 @@ msgstr "" #: core/basic/zaso-alert-box-widgets/tpl/default.php:13 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:42 msgid "Close" -<<<<<<< HEAD msgstr "Close" #: core/basic/zaso-alert-box-widgets/tpl/default.php:14 @@ -42,35 +32,15 @@ msgstr "Messages" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:25 msgid "Close Button" msgstr "Close Button" -======= -msgstr "" - -#: core/basic/zaso-alert-box-widgets/tpl/default.php:14 -msgid "×" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:21 -msgid "Messages" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:25 -msgid "Close Button" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:28 #: core/basic/zaso-video-widgets/zaso-video-widgets.php:43 msgid "Show" -<<<<<<< HEAD msgstr "Show" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:29 #: core/basic/zaso-video-widgets/zaso-video-widgets.php:44 msgid "Hide" -<<<<<<< HEAD msgstr "Hide" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:34 @@ -83,15 +53,6 @@ msgstr "Hide" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:375 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:65 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:134 -======= -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:34 -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:46 -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:43 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:375 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:65 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:43 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:59 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:27 @@ -100,7 +61,6 @@ msgstr "" #: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:38 #: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:60 msgid "Extra ID" -<<<<<<< HEAD msgstr "Extra ID" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:35 @@ -113,15 +73,6 @@ msgstr "Extra ID" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:376 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:66 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:135 -======= -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:35 -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:47 -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:44 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:376 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:66 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:44 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:60 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:28 @@ -130,7 +81,6 @@ msgstr "" #: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:39 #: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:61 msgid "Add an extra ID." -<<<<<<< HEAD msgstr "Add an extra ID." #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:39 @@ -143,15 +93,6 @@ msgstr "Add an extra ID." #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:380 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:70 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:139 -======= -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:39 -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:51 -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:48 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:380 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:70 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:48 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:64 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:32 @@ -160,7 +101,6 @@ msgstr "" #: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:43 #: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:65 msgid "Extra Class" -<<<<<<< HEAD msgstr "Extra Class" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:40 @@ -173,15 +113,6 @@ msgstr "Extra Class" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:381 #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:71 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:140 -======= -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:40 -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:52 -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:49 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:381 -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:71 ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:49 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:65 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:33 @@ -190,11 +121,7 @@ msgstr "" #: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:44 #: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:66 msgid "Add an extra class for styling overrides." -<<<<<<< HEAD msgstr "Add an extra class for styling overrides." -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:44 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:56 @@ -202,19 +129,11 @@ msgstr "" #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:69 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:37 msgid "Design" -<<<<<<< HEAD msgstr "Design" #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:49 msgid "Alert Box" msgstr "Alert Box" -======= -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:49 -msgid "Alert Box" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:54 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:66 @@ -223,11 +142,7 @@ msgstr "" #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:186 #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:42 msgid "Background Color" -<<<<<<< HEAD msgstr "Background Color" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:59 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:76 @@ -235,37 +150,22 @@ msgstr "" #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:89 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:191 msgid "Font Color" -<<<<<<< HEAD msgstr "Font Color" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:64 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:199 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:196 msgid "Font Size" -<<<<<<< HEAD msgstr "Font Size" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:69 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:128 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:204 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:76 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:125 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:201 msgid "Margin" msgstr "Margin" -======= -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:125 -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:201 -msgid "Margin" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:74 #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:101 @@ -276,21 +176,14 @@ msgstr "" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:138 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:165 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:349 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:81 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:108 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:130 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:157 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:206 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:233 msgid "Top" -<<<<<<< HEAD msgstr "Top" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:79 #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:106 @@ -303,22 +196,15 @@ msgstr "" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:143 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:170 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:354 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:86 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:113 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:120 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:135 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:162 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:211 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:238 msgid "Right" -<<<<<<< HEAD msgstr "Right" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:84 #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:111 @@ -329,21 +215,14 @@ msgstr "" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:148 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:175 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:359 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:91 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:118 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:140 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:167 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:216 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:243 msgid "Bottom" -<<<<<<< HEAD msgstr "Bottom" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:89 #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:116 @@ -356,27 +235,19 @@ msgstr "" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:153 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:180 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:364 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:96 #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:123 -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:118 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:145 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:172 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:221 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:248 msgid "Left" -<<<<<<< HEAD msgstr "Left" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:96 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:155 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:231 -<<<<<<< HEAD #: core/basic/zaso-image-icon-group-widgets/zaso-image-icon-group-widgets.php:103 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:152 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:228 @@ -495,282 +366,99 @@ msgstr "Tab Title" #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:39 msgid "Tab Content" msgstr "Tab Content" -======= -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:152 -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:228 -msgid "Padding" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:123 -msgid "Border Settings" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:128 -msgid "Top Border Width" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:133 -msgid "Right Border Width" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:138 -msgid "Bottom Border Width" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:143 -msgid "Left Border Width" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:148 -msgid "Top Border Radius" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:153 -msgid "Right Border Radius" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:158 -msgid "Bottom Border Radius" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:163 -msgid "Left Border Radius" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:168 -msgid "Border Style" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:171 -msgid "none" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:172 -msgid "Hidden" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:173 -msgid "Dotted" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:174 -msgid "Dashed" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:175 -msgid "Solid" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:176 -msgid "Double" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:177 -msgid "Groove" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:178 -msgid "Ridge" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:179 -msgid "Inset" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:180 -msgid "Outset" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:185 -msgid "Border Color" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:201 -msgid "ZASO - Alert Box" -msgstr "" - -#: core/basic/zaso-alert-box-widgets/zaso-alert-box-widgets.php:203 -msgid "Create contextual feedback and flexible alert messages." -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:21 -msgid "Title" -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:25 -msgid "Tab List" -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:26 -msgid "Single Tab" -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:35 -msgid "Tab Title" -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:39 -msgid "Tab Content" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:61 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:74 msgid "Headings" -<<<<<<< HEAD msgstr "Headings" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:71 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:84 msgid "Background Hover Color" -<<<<<<< HEAD msgstr "Background Hover Color" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:81 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:94 msgid "Font Color Hover" -<<<<<<< HEAD msgstr "Font Color Hover" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:86 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:99 msgid "Font Weight" -<<<<<<< HEAD msgstr "Font Weight" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:89 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:105 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:102 msgid "100" -<<<<<<< HEAD msgstr "100" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:90 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:106 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:103 msgid "200" -<<<<<<< HEAD msgstr "200" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:91 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:107 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:104 msgid "300" -<<<<<<< HEAD msgstr "300" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:92 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:108 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:105 msgid "400 - Normal" -<<<<<<< HEAD msgstr "400 - Normal" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:93 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:109 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:106 msgid "500" -<<<<<<< HEAD msgstr "500" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:94 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:110 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:107 msgid "600" -<<<<<<< HEAD msgstr "600" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:95 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:111 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:108 msgid "700 - Bold" -<<<<<<< HEAD msgstr "700 - Bold" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:96 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:112 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:109 msgid "800" -<<<<<<< HEAD msgstr "800" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:97 #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:113 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:110 msgid "900" -<<<<<<< HEAD msgstr "900" #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:102 msgid "Font Weight Hover" msgstr "Font Weight Hover" -======= -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:102 -msgid "Font Weight Hover" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:118 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:115 msgid "Text Align" -<<<<<<< HEAD msgstr "Text Align" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:122 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:112 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:119 msgid "Center" -<<<<<<< HEAD msgstr "Center" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:184 #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:181 msgid "Panels" -<<<<<<< HEAD msgstr "Panels" #: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:267 @@ -886,50 +574,10 @@ msgstr "Featured Image" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:31 msgid "Action Text" msgstr "Action Text" -======= -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:267 -msgid "ZASO - Basic Tabs" -msgstr "" - -#: core/basic/zaso-basic-tabs-widgets/zaso-basic-tabs-widgets.php:269 -msgid "Create multiple panels contained in a single window." -msgstr "" - -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:31 -msgid "No existing form." -msgstr "" - -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:38 -msgid "What CF7 form do you want to display?" -msgstr "" - -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:58 -msgid "ZASO - Contact Form 7" -msgstr "" - -#: core/basic/zaso-contact-form-7-widgets/zaso-contact-form-7-widgets.php:60 -msgid "Display CF7 form." -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:21 -msgid "Title Caption" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:25 -msgid "Featured Image" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:31 -msgid "Action Text" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:32 #: zen-addons-siteorigin.php:123 msgid "Learn More" -<<<<<<< HEAD msgstr "Learn More" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:36 @@ -975,113 +623,41 @@ msgstr "Caption Text Alignment" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:113 msgid "Justify" msgstr "Justify" -======= -msgstr "" -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:36 -msgid "Action URL" -msgstr "" +#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:114 +#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:127 +#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:338 +msgid "Initial" +msgstr "Initial" -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:41 -msgid "Hover Animation" -msgstr "" +#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:115 +#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:128 +#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:339 +msgid "Inherit" +msgstr "Inherit" -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:44 -msgid "Fade In" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:54 -msgid "Hover Card" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:59 -msgid "Caption Background Color" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:64 -msgid "Caption Background Opacity" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:81 -msgid "Caption Font Color" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:86 -msgid "Caption Font Size" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:91 -msgid "Caption Font Weight" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:107 -msgid "Caption Text Alignment" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:113 -msgid "Justify" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:114 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:127 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:338 -msgid "Initial" -<<<<<<< HEAD -msgstr "Initial" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:115 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:128 -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:339 -msgid "Inherit" -<<<<<<< HEAD -msgstr "Inherit" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:120 -msgid "Caption Text Transform" -msgstr "Caption Text Transform" -======= -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:120 -msgid "Caption Text Transform" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf +#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:120 +msgid "Caption Text Transform" +msgstr "Caption Text Transform" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:123 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:334 msgid "None" -<<<<<<< HEAD msgstr "None" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:124 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:335 msgid "Capitalize" -<<<<<<< HEAD msgstr "Capitalize" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:125 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:336 msgid "Uppercase" -<<<<<<< HEAD msgstr "Uppercase" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:126 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:337 msgid "Lowecase" -<<<<<<< HEAD msgstr "Lowecase" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:133 @@ -1119,51 +695,11 @@ msgstr "Shadow Color" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:217 msgid "Shadow Color Opacity" msgstr "Shadow Color Opacity" -======= -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:133 -msgid "Caption Margin" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:160 -msgid "Caption Padding" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:187 -msgid "Card Box Shadow" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:192 -msgid "Horizontal Offset" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:197 -msgid "Vertical Offset" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:202 -msgid "Blur" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:207 -msgid "Spread" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:212 -msgid "Shadow Color" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:217 -msgid "Shadow Color Opacity" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:230 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:262 #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:285 msgid "(transparent)" -<<<<<<< HEAD msgstr "(transparent)" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:239 @@ -1221,71 +757,11 @@ msgstr "Button Padding" #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:390 msgid "ZASO - Hover Card" msgstr "ZASO - Hover Card" -======= -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:239 -msgid "Modal Button" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:244 -msgid "Button Background Color" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:249 -msgid "Button Background Opacity" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:267 -msgid "Button Background Color (Hover)" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:272 -msgid "Button Background Opacity (Hover)" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:290 -msgid "Button Border Color" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:295 -msgid "Button Border Color (hover)" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:300 -msgid "Button Font Color" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:305 -msgid "Button Font Color (Hover)" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:310 -msgid "Button Font Size" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:315 -msgid "Button Font Weight" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:331 -msgid "Button Text Transform" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:344 -msgid "Button Padding" -msgstr "" - -#: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:390 -msgid "ZASO - Hover Card" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-hover-card-widgets/zaso-hover-card-widgets.php:392 msgid "" "Display image box, title caption and learn more button with hover transition" msgstr "" -<<<<<<< HEAD "Display image box, title caption and learn more button with hover transition" #: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:21 @@ -1408,87 +884,12 @@ msgstr "Info Button Url" #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:58 msgid "ZASO - Info Box" msgstr "ZASO - Info Box" -======= - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:21 -msgid "Icon" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:25 -msgid "Custom Icon" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:26 -msgid "Override \"Icon\", Upload your custom icon here." -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:32 -msgid "Icon Color" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:37 -msgid "Icon Size" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:42 -msgid "Icon Destination URL" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:47 -msgid "Open in a new window" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:51 -msgid "Icon Text" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:55 -msgid "Icon Text Color" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:60 -msgid "Icon Text Size" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:80 -msgid "ZASO - Icon" -msgstr "" - -#: core/basic/zaso-icon-widgets/zaso-icon-widgets.php:82 -msgid "Set single icon on popular iconic font or upload your custom icon." -msgstr "" - -#: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:21 -msgid "Info Title" -msgstr "" - -#: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:25 -msgid "Info Short Description" -msgstr "" - -#: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:29 -msgid "Info Featured Image" -msgstr "" - -#: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:35 -msgid "Info Button text" -msgstr "" - -#: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:39 -msgid "Info Button Url" -msgstr "" - -#: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:58 -msgid "ZASO - Info Box" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-info-box-widgets/zaso-info-box-widgets.php:60 msgid "" "Display information box - image, title, description and learn more button " "link" msgstr "" -<<<<<<< HEAD "Display information box - image, title, description and learn more button " "link" @@ -1531,57 +932,10 @@ msgstr "ZASO - Simple Accordion" #: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:266 msgid "Create a vertically stacked list of items or single panel." msgstr "Create a vertically stacked list of items or single panel." -======= - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:21 -msgid "Accordion List" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:22 -msgid "Single Item" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:31 -msgid "Accordion Title" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:35 -msgid "Accordion Content" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:40 -msgid "Accordion Initial State" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:43 -msgid "Open" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:50 -msgid "Settings" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:53 -msgid "Allow Multiple Open" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:54 -msgid "Single Open Only" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:264 -msgid "ZASO - Simple Accordion" -msgstr "" - -#: core/basic/zaso-simple-accordion-widgets/zaso-simple-accordion-widgets.php:266 -msgid "Create a vertically stacked list of items or single panel." -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:22 #: core/basic/zaso-video-widgets/zaso-video-widgets.php:36 msgid "Height" -<<<<<<< HEAD msgstr "Height" #: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:23 @@ -1599,31 +953,11 @@ msgstr "Create an empty space between elements." #: core/basic/zaso-video-widgets/zaso-video-widgets.php:21 msgid "Video URL" msgstr "Video URL" -======= -msgstr "" - -#: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:23 -msgid "Set empty space height." -msgstr "" - -#: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:54 -msgid "ZASO - Spacer" -msgstr "" - -#: core/basic/zaso-spacer-widgets/zaso-spacer-widgets.php:56 -msgid "Create an empty space between elements." -msgstr "" - -#: core/basic/zaso-video-widgets/zaso-video-widgets.php:21 -msgid "Video URL" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-video-widgets/zaso-video-widgets.php:22 msgid "" "Insert your video URL, example: https://www.youtube.com/watch?v=dQw4w9WgXcQ" msgstr "" -<<<<<<< HEAD "Insert your video URL, example: https://www.youtube.com/watch?v=dQw4w9WgXcQ" #: core/basic/zaso-video-widgets/zaso-video-widgets.php:26 @@ -1665,108 +999,35 @@ msgstr "Play the video again when it reaches the end, infinitely." #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:36 msgid "Muted" msgstr "Muted" -======= - -#: core/basic/zaso-video-widgets/zaso-video-widgets.php:26 -msgid "Content" -msgstr "" - -#: core/basic/zaso-video-widgets/zaso-video-widgets.php:31 -msgid "Width" -msgstr "" - -#: core/basic/zaso-video-widgets/zaso-video-widgets.php:41 -msgid "Controls" -msgstr "" - -#: core/basic/zaso-video-widgets/zaso-video-widgets.php:64 -msgid "ZASO - Video" -msgstr "" - -#: core/basic/zaso-video-widgets/zaso-video-widgets.php:66 -msgid "Add video from YouTube, Vimeo or another provider." -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:21 -msgid "Vimeo Video ID" -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:22 -msgid "Insert Video ID, example: 12345678" -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:26 -msgid "Loop" -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:27 -msgid "Play the video again when it reaches the end, infinitely." -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:30 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:40 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:50 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:28 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:36 -msgid "No" -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:31 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:41 -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:51 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:29 -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:37 -msgid "Yes" -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:36 -msgid "Muted" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:37 msgid "" "Set video to mute on load. Viewers can still adjust the volume preferences " "in the player." msgstr "" -<<<<<<< HEAD "Set video to mute on load. Viewers can still adjust the volume preferences " "in the player." #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:46 msgid "Do Not Track" msgstr "Do Not Track" -======= - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:46 -msgid "Do Not Track" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:47 msgid "" "Setting this parameter to \"Yes\" will block the player from tracking any " "session data, including all cookies and stats." msgstr "" -<<<<<<< HEAD "Setting this parameter to \"Yes\" will block the player from tracking any " "session data, including all cookies and stats." -======= ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:56 #: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:42 msgid "Video Play Button Image" -<<<<<<< HEAD msgstr "Video Play Button Image" -======= -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:62 #: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:54 msgid "Video Thumbnail" -<<<<<<< HEAD msgstr "Video Thumbnail" #: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:83 @@ -1824,62 +1085,3 @@ msgstr "ZASO Widgets" #: zen-addons-siteorigin.php:76 msgid "Zen Addons for SiteOrigin" msgstr "Zen Addons for SiteOrigin" -======= -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:83 -msgid "ZASO - Vimeo Lightbox" -msgstr "" - -#: core/basic/zaso-vimeo-lightbox-widgets/zaso-vimeo-lightbox-widgets.php:85 -msgid "Pop-up lightbox for Viemo videos." -msgstr "" - -#: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:33 -msgid "Widget Sidebar" -msgstr "" - -#: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:53 -msgid "ZASO - Widgetized" -msgstr "" - -#: core/basic/zaso-widgetized-widgets/zaso-widgetized-widgets.php:55 -msgid "Get widget sidebar." -msgstr "" - -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:21 -msgid "YouTube Video URL" -msgstr "" - -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:22 -msgid "Insert URL, example: https://www.youtube.com/watch?v=dQw4w9WgXcQ" -msgstr "" - -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:26 -msgid "Show Related Videos" -msgstr "" - -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:34 -msgid "Show Info" -msgstr "" - -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:48 -msgid "Video Play Button Image (Hover)" -msgstr "" - -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:75 -msgid "ZASO - YouTube Lightbox" -msgstr "" - -#: core/basic/zaso-youtube-lightbox-widgets/zaso-youtube-lightbox-widgets.php:77 -msgid "Pop-up lightbox for YouTube videos." -msgstr "" - -#: core/widgets.php:20 -msgid "ZASO Widgets" -msgstr "" - -#: zen-addons-siteorigin.php:76 -msgid "Zen Addons for SiteOrigin" -msgstr "" ->>>>>>> 4835b0acccfec12beb77163e62fb93154a897daf diff --git a/readme.md b/readme.md index 49ec1ba..468849c 100644 --- a/readme.md +++ b/readme.md @@ -4,8 +4,8 @@ **Contributors:** ksym04 **Tags:** zaso, widgets, siteorigin, addons, page builder **Requires at least:** 4.4 -**Tested up to:** 5.5.1 -**Stable tag:** 1.0.12 +**Tested up to:** 5.5.3 +**Stable tag:** 1.0.14 **License:** GPLv3 **License URI:** license.txt @@ -34,7 +34,7 @@ The Zen Addons for SiteOrigin Page Builder gives you a collection of widgets tha * Info Box, display information box - image, title, description and learn more button link. * Hover Card, display image box, title caption and learn more button with hover transition. * Image Icon Group, set group of image icon. -* Widgetized, get widget sidebar. +* Widgetized, get existing widget sidebars to display on the main content. * bbPress Forum Index, display entire bbPress forum index. * bbPress Topic Index, display recent 15 topics across all forums with optional pagination and search. * bbPress Login, display the bbPress login form. @@ -71,6 +71,12 @@ First, please ensure that 'SiteOrigin Widgets Bundle' plugin was installed, then ## Changelog ## +### 1.0.14 ### + +* Tweak: Widgets description improvements +* Tweak: Completed widgets featured banner +* Tweak: Latest WordPress 5.5.3 compatibility + ### 1.0.12 ### * New: Added new widgets for bbPress - login and registration diff --git a/readme.txt b/readme.txt index 35d6367..eeade73 100644 --- a/readme.txt +++ b/readme.txt @@ -2,8 +2,8 @@ Contributors: ksym04 Tags: zaso, widgets, siteorigin, addons, page builder Requires at least: 4.4 -Tested up to: 5.5 -Stable tag: 1.0.12 +Tested up to: 5.5.3 +Stable tag: 1.0.14 License: GPLv3 License URI: license.txt @@ -30,7 +30,7 @@ The Zen Addons for SiteOrigin Page Builder gives you a collection of widgets tha * Info Box, display information box - image, title, description and learn more button link. * Hover Card, display image box, title caption and learn more button with hover transition. * Image Icon Group, set group of image icon. -* Widgetized, get widget sidebar. +* Widgetized, get existing widget sidebars to display on the main content. * bbPress Forum Index, display entire bbPress forum index. * bbPress Topic Index, display recent 15 topics across all forums with optional pagination and search. * bbPress Login, display the bbPress login form. @@ -65,6 +65,11 @@ First, please ensure that 'SiteOrigin Widgets Bundle' plugin was installed, then == Changelog == += 1.0.14 = +* Tweak: Widgets description improvements +* Tweak: Completed widgets featured banner +* Tweak: Latest WordPress 5.5.3 compatibility + = 1.0.12 = * New: Added new widgets for bbPress - login and registration * Tweak: Minor improvements for Image Icon Group displaying text diff --git a/zen-addons-siteorigin.php b/zen-addons-siteorigin.php index 0f9b08b..553cadb 100644 --- a/zen-addons-siteorigin.php +++ b/zen-addons-siteorigin.php @@ -2,7 +2,7 @@ /* Plugin Name: Zen Addons for SiteOrigin Page Builder Description: Just another collection of helpful widget extensions for SiteOrigin Page Builder. Simple yet flexible and useful. -Version: 1.0.12 +Version: 1.0.14 Author: DopeThemes Author URI: https://www.dopethemes.com/ Plugin URI: https://www.dopethemes.com/downloads/zen-addons-siteorigin/ @@ -39,7 +39,7 @@ class zen_addons_siteorigin { // vars - var $version = '1.0.12'; + var $version = '1.0.14'; /* * __construct