🔄 Regenerate translation files

strangerstudios · Jul 18, 2024 · 4619939 · 4619939
1 parent 6bbf106
commit 4619939
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 94 deletions.
diff --git a/languages/pmpro-add-name-to-checkout-fr_FR.mo b/languages/pmpro-add-name-to-checkout-fr_FR.mo
diff --git a/languages/pmpro-add-name-to-checkout-fr_FR.po b/languages/pmpro-add-name-to-checkout-fr_FR.po
@@ -1,31 +1,17 @@
-<<<<<<< HEAD
 # Copyright (C) 2024 Paid Memberships Pro
 # This file is distributed under the same license as the Paid Memberships Pro - Add Name to Checkout plugin.
 msgid ""
 msgstr ""
 "Project-Id-Version: Paid Memberships Pro - Add Name to Checkout 0.7\n"
-=======
-# Copyright (C) 2023 Stranger Studios
-# This file is distributed under the same license as the Paid Memberships Pro - Add Name to Checkout Add On plugin.
-msgid ""
-msgstr ""
-"Project-Id-Version: Paid Memberships Pro - Add Name to Checkout Add On 0.6.1\n"
->>>>>>> strangerstudios/master
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2024-07-18T16:34:51+00:00\n"
+"POT-Creation-Date: 2024-07-18T16:36:42+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
-=======
-"POT-Creation-Date: 2023-01-31T13:35:57+00:00\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.7.1\n"
->>>>>>> strangerstudios/master
 "X-Domain: pmpro-add-name-to-checkout\n"
 
 #: pmpro-add-name-to-checkout.php:90
@@ -65,11 +51,8 @@ msgid "Stranger Studios"
 msgstr ""
 
 #: pmpro-add-name-to-checkout.php:251
-<<<<<<< HEAD
 #: pmpro-add-name-to-checkout.php:287
-=======
 #: pmpro-add-name-to-checkout.php:281
->>>>>>> strangerstudios/master
 msgid "Support"
 msgstr ""
 
@@ -89,11 +72,8 @@ msgid "The last name field is required."
 msgstr ""
 
 #: pmpro-add-name-to-checkout.php:251
-<<<<<<< HEAD
 #: pmpro-add-name-to-checkout.php:287
-=======
 #: pmpro-add-name-to-checkout.php:281
->>>>>>> strangerstudios/master
 msgid "Visit Customer Support Forum"
 msgstr ""
 

diff --git a/languages/pmpro-add-name-to-checkout.mo b/languages/pmpro-add-name-to-checkout.mo
diff --git a/languages/pmpro-add-name-to-checkout.po b/languages/pmpro-add-name-to-checkout.po
@@ -1,31 +1,17 @@
-<<<<<<< HEAD
 # Copyright (C) 2024 Paid Memberships Pro
 # This file is distributed under the same license as the Paid Memberships Pro - Add Name to Checkout plugin.
 msgid ""
 msgstr ""
 "Project-Id-Version: Paid Memberships Pro - Add Name to Checkout 0.7\n"
-=======
-# Copyright (C) 2023 Stranger Studios
-# This file is distributed under the same license as the Paid Memberships Pro - Add Name to Checkout Add On plugin.
-msgid ""
-msgstr ""
-"Project-Id-Version: Paid Memberships Pro - Add Name to Checkout Add On 0.6.1\n"
->>>>>>> strangerstudios/master
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2024-07-18T16:34:51+00:00\n"
+"POT-Creation-Date: 2024-07-18T16:36:42+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
-=======
-"POT-Creation-Date: 2023-01-31T13:35:57+00:00\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.7.1\n"
->>>>>>> strangerstudios/master
 "X-Domain: pmpro-add-name-to-checkout\n"
 
 #. Plugin Name of the plugin
@@ -78,20 +64,14 @@ msgid "The last name field is required."
 msgstr ""
 
 #: pmpro-add-name-to-checkout.php:251
-<<<<<<< HEAD
 #: pmpro-add-name-to-checkout.php:287
-=======
 #: pmpro-add-name-to-checkout.php:281
->>>>>>> strangerstudios/master
 msgid "Visit Customer Support Forum"
 msgstr ""
 
 #: pmpro-add-name-to-checkout.php:251
-<<<<<<< HEAD
 #: pmpro-add-name-to-checkout.php:287
-=======
 #: pmpro-add-name-to-checkout.php:281
->>>>>>> strangerstudios/master
 msgid "Support"
 msgstr ""
 

diff --git a/languages/pmpro-add-name-to-checkout.pot b/languages/pmpro-add-name-to-checkout.pot
@@ -1,24 +1,15 @@
-<<<<<<< HEAD
 # Copyright (C) 2024 Paid Memberships Pro
 # This file is distributed under the same license as the Paid Memberships Pro - Add Name to Checkout plugin.
 msgid ""
 msgstr ""
 "Project-Id-Version: Paid Memberships Pro - Add Name to Checkout 0.7\n"
-=======
-# Copyright (C) 2023 Stranger Studios
-# This file is distributed under the same license as the Paid Memberships Pro - Add Name to Checkout Add On plugin.
-msgid ""
-msgstr ""
-"Project-Id-Version: Paid Memberships Pro - Add Name to Checkout Add On 0.6.1\n"
->>>>>>> strangerstudios/master
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2024-07-18T16:34:51+00:00\n"
+"POT-Creation-Date: 2024-07-18T16:36:42+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: pmpro-add-name-to-checkout\n"
@@ -30,18 +21,6 @@ msgstr ""
 
 #. Plugin URI of the plugin
 #: pmpro-add-name-to-checkout.php
-=======
-"POT-Creation-Date: 2023-01-31T13:35:57+00:00\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.7.1\n"
-"X-Domain: pmpro-add-name-to-checkout\n"
-
-#. Plugin Name of the plugin
-msgid "Paid Memberships Pro - Add Name to Checkout Add On"
-msgstr ""
-
-#. Plugin URI of the plugin
->>>>>>> strangerstudios/master
 msgid "https://www.paidmembershipspro.com/add-ons/add-first-last-name-to-checkout/"
 msgstr ""
 
@@ -51,7 +30,6 @@ msgid "Adds first and last name fields to the user account section at checkout f
 msgstr ""
 
 #. Author of the plugin
-<<<<<<< HEAD
 #: pmpro-add-name-to-checkout.php
 msgid "Paid Memberships Pro"
 msgstr ""
@@ -65,32 +43,11 @@ msgstr ""
 msgid "First Name"
 msgstr ""
 
-=======
-msgid "Stranger Studios"
-msgstr ""
-
-#. Author URI of the plugin
-msgid "http://www.strangerstudios.com"
-msgstr ""
-
-#: pmpro-add-name-to-checkout.php:66
-msgid "First Name"
-msgstr ""
-
->>>>>>> strangerstudios/master
 #: pmpro-add-name-to-checkout.php:70
 msgid "Last Name"
 msgstr ""
 
-<<<<<<< HEAD
 #: pmpro-add-name-to-checkout.php:150
-=======
-#: pmpro-add-name-to-checkout.php:90
-msgid "Account Information"
-msgstr ""
-
-#: pmpro-add-name-to-checkout.php:145
->>>>>>> strangerstudios/master
 msgid "The first and last name fields are required."
 msgstr ""
 
@@ -102,7 +59,6 @@ msgstr ""
 msgid "The last name field is required."
 msgstr ""
 
-<<<<<<< HEAD
 #: pmpro-add-name-to-checkout.php:286
 msgid "View Documentation"
 msgstr ""
@@ -116,12 +72,5 @@ msgid "Visit Customer Support Forum"
 msgstr ""
 
 #: pmpro-add-name-to-checkout.php:287
-=======
-#: pmpro-add-name-to-checkout.php:281
-msgid "Visit Customer Support Forum"
-msgstr ""
-
-#: pmpro-add-name-to-checkout.php:281
->>>>>>> strangerstudios/master
 msgid "Support"
 msgstr ""