From 7809e366d74238fd4613376dfcd7f0d3680e2274 Mon Sep 17 00:00:00 2001 From: Francesco Marangi Date: Sun, 15 Sep 2013 23:24:40 +0200 Subject: [PATCH 01/37] [+TASK] Italian translations --- modman | 1 + src/app/locale/it_IT/FireGento_MageSetup.csv | 147 +++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 src/app/locale/it_IT/FireGento_MageSetup.csv diff --git a/modman b/modman index 71b776ed..abaac342 100644 --- a/modman +++ b/modman @@ -3,6 +3,7 @@ src/app/etc/modules/FireGento_MageSetup.xml app/etc/module src/app/locale/de_AT/FireGento_MageSetup.csv app/locale/de_AT/FireGento_MageSetup.csv src/app/locale/de_DE/FireGento_MageSetup.csv app/locale/de_DE/FireGento_MageSetup.csv src/app/locale/de_DE/template/magesetup/ app/locale/de_DE/template/magesetup/ +src/app/locale/it_IT/FireGento_MageSetup.csv app/locale/it_IT/FireGento_MageSetup.csv src/app/locale/en_US/FireGento_MageSetup.csv app/locale/en_US/FireGento_MageSetup.csv src/app/locale/en_US/template/magesetup/ app/locale/en_US/template/magesetup/ src/app/locale/ru_RU/FireGento_MageSetup.csv app/locale/ru_RU/FireGento_MageSetup.csv diff --git a/src/app/locale/it_IT/FireGento_MageSetup.csv b/src/app/locale/it_IT/FireGento_MageSetup.csv new file mode 100644 index 00000000..f5509178 --- /dev/null +++ b/src/app/locale/it_IT/FireGento_MageSetup.csv @@ -0,0 +1,147 @@ +"Display Block below Price","Mostra blocco sotto al prezzo" +"Display tax info and shipping cost link below the price on all pages","Mostra info su tasse e spese di spedizione sotto al prezzo su tutte le pagine" +"Display Delivery time on Category Pages","Mostra tempi di consegna nelle categorie" +"CMS Page for Shipping Info","Pagina CMS per costi di spedizione" +"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Mostra ""spese di spedizione incl."" al posto di ""spese di spedizione escl.""" +"No Page","Nessuna pagina" +"No Block","Nessun blocco" +"Incl. Tax","IVA incl." +"Incl. %s Tax","incl. IVA %s" +"Excl. %s Tax","escl. IVA %s" +"excl. Shipping Cost","Spese di spedizione escl." +"incl. Shipping Cost","Spese di spedizione incl." +"Display Product Weight below Price","Mostra peso sotto al prezzo" +"Unit for Product Weight","Unità di misura per il peso" +"e.g. g, kg, lb, ...","ad es. g, kg, lb, ..." +"Shipping Weight %s","Peso spedizione %s" + +"If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Se necessario, aggiungere ulteriori vetrine dello shop (ad es. per diverse lingue) prima di utilizzare questo form" +"MageSetup has been installed.","MageSetup installato correttamente" +"Click here to set up your pages, blocks, emails and tax settings.","Clicca qui per impostare pagine CMS, blocchi, e-mail e configurazione delle tasse." +"Please choose the requested setups:","Seleziona i setup da eseguire:" +"Run MageSetup","Esegui MageSetup" +"Update System Config Settings","Aggiorna configurazione di sistema" +"i.e. newsletter confirmation, account confirmation, ..","ad es. conferma iscrizione alla newsletter, nuova registrazione, etc." +"Create CMS Pages and Blocks","Crea pagine e blocchi CMS" +"i.e. shipping, conditions, revocation","ad es. Spedizione, Condizioni generali di vendita, Diritto di recesso, ecc." +"Create Checkout Agreements","Crea note su CGV per il checkout" +"Conditions","CGV e diritto di recesso" +"Display Checkbox on Frontend","Mostra checkbox nel frontend" +"Require Confirmation on Customer Registration and/or Checkout","Campo obbligatorio per nuova registrazione e checkout" +"Language Package for CMS Pages/Blocks/Agreements","Pacchetto lingua per pagine e blocchi CMS / Condizioni di vendita" +"Create Email Templates","Creazione template e-mail" +"German Email Templates","Template e-mail in tedesco" +"Configure Tax","Configurazione tasse" +"All tax settings will be overwritten!","Attenzione: tutte le impostazioni delle tasse saranno sovrascritte!" +"Update Product Tax Classes","Aggiornamento tasse prodotto" +Old,Attuale +New,"Dopo" +"No tax","Senza tasse" +"Newsletter Subscribers Status History","Cronologia iscrizioni alla newsletter" + +"MageSetup: CMS Blocks and Pages have been created.","MageSetup: pagine e blocchi CMS creati correttamente." +"MageSetup: Checkout Agreements have been created.","MageSetup: condizioni di vendita creati correttamente." +"MageSetup: Email Templates have been created.","MageSetup: template e-mail creati correttamente." +"MageSetup: Tax Settings have been created.","MageSetup: impostazioni tasse salvate correttamente." +"MageSetup: Product Tax Classes have been updated.","MageSetup: classi tasse dei prodotti aggiornate correttamente." +"MageSetup: System Config Settings have been updated.","MageSetup: configurazione di sistema aggiornata correttamente." + +"Imprint","Impressum" +Account,"Conto corrente n°" +"Account owner","Intestatario c/c" +"Bank number",ABI/CA +"Bank name",Banca +CEO,Amministratore +"Owner","Proprietario" +"Responsible according to § 5 TMG","Inhaltlich verantwortlich gemäß § 5 TMG" +"Responsible for content","Resp. contenuti" +"Responsible for content address","Indiritto del resp. contenuti" +"Responsible in the interests of the press law","Verantwortlich im Sinne des Presserechts (V.i.S.d.P.)" +"E-Mail","E-Mail" +"Fax","Fax" +"Financial office","Ufficio tributario" +"IBAN","IBAN" +"Register court","Registro delle imprese" +"Register number","HRB-Nummer" +"SWIFT","SWIFT" +"BIC/SWIFT","BIC/SWIFT" +"Tax number","Tax number" +"Telephone","Telefono" +"Web","Web" +VAT-ID,"Partita IVA" +"Company 1","Ditta 1" +"Company 2","Ditta 2" +Street,Via +Zip,CAP +City,Città +Telephone,Telefono +"Tax number","Partita IVA" +"Register court","Tribunale competente" +"Financial office","Ufficio triburatio" +"Register number","Iscrizione al registro delle imprese n°" +"Reference for business rules (physician, physician...)","Verweis auf berufliche Regelungen (z.B. für Ärzte, Apotheker)" +"Authority (ECG)","Behörde gem. ECG (E-Commerce-Gesetz)" +"Shareholdings","Beteiligungen" +"Editorial Concept","Blattlinie" +"relevant for Austrian shops","relevant für österreichische Shops" +"Account owner","Intestatario c/c" +Account,"Conto corrente n°" +"Bank number",ABI/CAB +"Bank name",Banca + +"%s%%","%s%%" + +"Recommended Extensions","Moduli consigliati" +"Popular Payment Methods","Metodi di pagamento popolari" +"Ip anonymization","Mascheramento IP" +"Ensures that the ip address of the customers doesnt get involved into the tracking","L'indirizzo IP del cliente viene mascherato ai servizi di tracking (Tutela dei dati personali)" + +"Dynamic Shipping Tax Class Calculation","Calcolo dinamico delle tasse per le spese di spedizione" +"Set to ""yes"" if you want to calculate the shipping tax rate based on the highest product tax rate in cart.
ATTENTION: This setting overwrites the ""Tax Class for Shipping"" setting above!","Se abilitato, le tasse per la spedizione vengono calcolate in base al prodotto nel carrello con l'aliquota IVA più elevata.
ATTENZIONE: Questa impostazione sovrascriva il settaggio ""Classe tasse per le spedizioni""." + +"Shipping from","Spedizione da" +"This setting is base for the tax rate setup!","Questo settaggio è utilizzato per la configurazione delle tasse!" + +"[Show]","[Mostra]" +"Visible in Checkout","Visibile durante il checkout" + +"Display Additional Information","Mostra informazioni aggiuntive" +"Display content from text field below at the checkout confirm page directly above the checkout button","Mostra contenuto del campo sottostante nella pagina di conferma dell'ordine (sotto al pulsante ""Acquista"")" + +"Directory ""%s"" not found. Locale not installed?","Cartella ""%s"" mancante. Pacchetto lingua installato?" +"Default Setting","Impostazioni standard" +"Use Default Setting","Utilizza impostazioni standard" +"Select Locale","Scegli pacchetto lingua" +"Create Transational Email Templates to be managed in the Magento admin area","Crea template e-mail (modificabili nel backend di Magento)" +"Language Package for Email Templates","Pacchetto lingua per i template e-mail" +"If your desired locale is missing, please check if it installed.","Se il pacchetto lingua richiesto non è presente, non è ancora disponibile in MageSetup" +"If your desired locale is missing, it is not supported yet by MageSetup.","Se il pacchetto lingua richiesto non è presente, non è ancora disponibile in MageSetup" + +"Configuration Settings","Impostazioni generali" +"CMS Settings","Impostazioni CMS" +"Email Settings","Impostazioni e-mail" +"Tax Settings","Impostazioni tasse" + +"Delivery Time","Tempo di consegna" +"Shipping Costs","Spese di spedizione" +"Hide estimated shipping costs in cart","Nascondi stima delle spese di spedizione nel carrello" +"Replace with a link to the shipping costs cms page","Sostituisci con un link alla pagina CMS ""Spese di spedizione""" +"Here you find information regarding the shipping costs.","Informazioni sulle spese di spedizione" +"Hide box ""Last Ordered Items""","Nascondi box ""Articoli ordinati di recente""" +"Tax Settings","Impostazioni tasse" + +"Display on","Mostra" +"On checkout (Magento Default)","durante il checkout (Magento-Standard)" +"On customer registration (or on checkout, if customer not registered before)","Nella registrazione (o nel checkout, se il cliente non è registrato)" +"On customer registration and on checkout","Nella registrazione e nel checkout" +Nowhere,Mai +"Agreements not confirmed.","Condizioni di vendita non accettate" + +"Base Price","Prezzo Base" +"Newsletter Unsubscription for Guests, Double Opt In for registered Customers","Cancellazione newsletter per clienti non registrati e double opt-in per clienti registrati" +"Debit Payment","Bonifico bancario" +"Cash on Delivery","Contrassegno" +"Bank Payment","Pagamento anticipato" +"Invoice Payment","Pagamento su Fattura" +"Extension Key","Codice modulo" +"MagentoConnect","MagentoConnect" \ No newline at end of file From ea1d83ce44ba19bfffb1481f6582fe00964a36fa Mon Sep 17 00:00:00 2001 From: Francesco Marangi Date: Mon, 16 Sep 2013 08:24:17 +0200 Subject: [PATCH 02/37] [+TASK] Italian template translations --- modman | 3 +- .../FireGento/MageSetup/etc/it/email.xml | 495 ++++++++++++++++++ .../magesetup/agreement/business_terms.html | 3 + .../magesetup/agreement/revocation.html | 3 + .../magesetup/block/business_terms.html | 2 + .../template/magesetup/block/revocation.html | 2 + .../it_IT/template/magesetup/page/404.html | 9 + .../magesetup/page/business_terms.html | 4 + .../template/magesetup/page/imprint.html | 32 ++ .../it_IT/template/magesetup/page/order.html | 53 ++ .../template/magesetup/page/payment.html | 26 + .../template/magesetup/page/privacy.html | 4 + .../template/magesetup/page/revocation.html | 4 + .../template/magesetup/page/shipping.html | 4 + 14 files changed, 643 insertions(+), 1 deletion(-) create mode 100644 src/app/code/community/FireGento/MageSetup/etc/it/email.xml create mode 100644 src/app/locale/it_IT/template/magesetup/agreement/business_terms.html create mode 100644 src/app/locale/it_IT/template/magesetup/agreement/revocation.html create mode 100644 src/app/locale/it_IT/template/magesetup/block/business_terms.html create mode 100644 src/app/locale/it_IT/template/magesetup/block/revocation.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/404.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/business_terms.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/imprint.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/order.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/payment.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/privacy.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/revocation.html create mode 100644 src/app/locale/it_IT/template/magesetup/page/shipping.html diff --git a/modman b/modman index abaac342..d81c89d1 100644 --- a/modman +++ b/modman @@ -3,13 +3,14 @@ src/app/etc/modules/FireGento_MageSetup.xml app/etc/module src/app/locale/de_AT/FireGento_MageSetup.csv app/locale/de_AT/FireGento_MageSetup.csv src/app/locale/de_DE/FireGento_MageSetup.csv app/locale/de_DE/FireGento_MageSetup.csv src/app/locale/de_DE/template/magesetup/ app/locale/de_DE/template/magesetup/ -src/app/locale/it_IT/FireGento_MageSetup.csv app/locale/it_IT/FireGento_MageSetup.csv src/app/locale/en_US/FireGento_MageSetup.csv app/locale/en_US/FireGento_MageSetup.csv src/app/locale/en_US/template/magesetup/ app/locale/en_US/template/magesetup/ src/app/locale/ru_RU/FireGento_MageSetup.csv app/locale/ru_RU/FireGento_MageSetup.csv src/app/locale/ru_RU/template/magesetup/ app/locale/ru_RU/template/magesetup/ src/app/locale/fr_FR/FireGento_MageSetup.csv app/locale/fr_FR/FireGento_MageSetup.csv src/app/locale/fr_FR/template/magesetup/ app/locale/fr_FR/template/magesetup/ +src/app/locale/it_IT/FireGento_MageSetup.csv app/locale/it_IT/FireGento_MageSetup.csv +src/app/locale/it_IT/template/magesetup/ app/locale/it_IT/template/magesetup/ src/app/design/adminhtml/default/default/layout/magesetup.xml app/design/adminhtml/default/default/layout/magesetup.xml src/app/design/adminhtml/default/default/template/magesetup/ app/design/adminhtml/default/default/template/magesetup/ src/app/design/frontend/base/default/layout/magesetup.xml app/design/frontend/base/default/layout/magesetup.xml diff --git a/src/app/code/community/FireGento/MageSetup/etc/it/email.xml b/src/app/code/community/FireGento/MageSetup/etc/it/email.xml new file mode 100644 index 00000000..745ccee0 --- /dev/null +++ b/src/app/code/community/FireGento/MageSetup/etc/it/email.xml @@ -0,0 +1,495 @@ + + + + + + + + + 1 + Nuova password d'amministrazione + 2 + admin_password_new.html + admin/emails/forgot_email_template + 0 + 0 + 0 + + + + 1 + Resettare password d'amministrazione + 2 + admin_password_reset_confirmation.html + admin/emails/forgot_email_template + 0 + 0 + 0 + + + + 1 + Aggiornamento valuta + 1 + currency_update_warning.html + currency/import/error_email_template + 0 + 0 + 0 + + + + 1 + Nuovo account + 2 + account_new.html + customer/create_account/email_template + 1 + 0 + 0 + + + + 1 + Password dimenticata + 2 + password_new.html + customer/password/remind_email_template + 1 + 0 + 0 + + + + 1 + Attivazione nuovo account + 2 + account_new_confirmation.html + customer/create_account/email_confirmation_template + 1 + 0 + 0 + + + + 1 + Conferma attivazione account + 2 + account_new_confirmed.html + customer/create_account/email_confirmed_template + 1 + 0 + 0 + + + + 1 + Nuova password + 2 + password_new.html + customer/password/forgot_email_template + 1 + 0 + 0 + + + + 1 + Conferma aggiornamento password + 2 + account_password_reset_confirmation.html + customer/password/forgot_email_template + 1 + 0 + 0 + + + + 1 + Nuovo ordine + 2 + sales/order_new.html + sales_email/order/template + 1 + 1 + 1 + + + + 1 + Nuovo ordine ospite + 2 + sales/order_new_guest.html + sales_email/order/guest_template + 1 + 1 + 1 + + + + 1 + Aggiornamento ordine + 2 + sales/order_update.html + sales_email/order_comment/template + 1 + 0 + 0 + + + + 1 + Aggiornamento ordine ospite + 2 + sales/order_update_guest.html + sales_email/order_comment/guest_template + 1 + 0 + 0 + + + + 1 + Nuova fattura + 2 + sales/invoice_new.html + sales_email/invoice/template + 1 + 0 + 0 + + + + 1 + Nuova fattura ospite + 2 + sales/invoice_new_guest.html + sales_email/invoice/guest_template + 1 + 0 + 0 + + + + 1 + Aggiornamento fattura + 2 + sales/invoice_update.html + sales_email/invoice_comment/template + 1 + 0 + 0 + + + + 1 + Aggiornamento fattura ospite + 2 + sales/invoice_update_guest.html + sales_email/invoice_comment/guest_template + 1 + 0 + 0 + + + + 1 + Nuova nota di credito + 2 + sales/creditmemo_new.html + sales_email/creditmemo/template + 1 + 0 + 0 + + + + 1 + Nuova nota di credito ospite + 2 + sales/creditmemo_new_guest.html + sales_email/creditmemo/guest_template + 1 + 0 + 0 + + + + 1 + Aggiornamento nota di credito + 2 + sales/creditmemo_update.html + sales_email/creditmemo_comment/template + 1 + 0 + 0 + + + + 1 + Aggiornamento nota di credito ospite + 2 + sales/creditmemo_update_guest.html + sales_email/creditmemo_comment/guest_template + 1 + 0 + 0 + + + + 1 + Nuova spedizione + 2 + sales/shipment_new.html + sales_email/shipment/template + 1 + 0 + 0 + + + + 1 + Nuova spedizione ospite + 2 + sales/shipment_new_guest.html + sales_email/shipment/guest_template + 1 + 0 + 0 + + + + 1 + Aggiornamento spedizione + 2 + sales/shipment_update.html + sales_email/shipment_comment/template + 1 + 0 + 0 + + + + 1 + Aggiornamento spedizione ospite + 2 + sales/shipment_update_guest.html + sales_email/shipment_comment/guest_template + 1 + 0 + 0 + + + + 1 + Pagamento fallito + 2 + payment_failed.html + checkout/payment_failed/template + 0 + 0 + 0 + + + + 1 + Notifica pulizia file di log + 1 + log_clean_warning.html + system/log/error_email_template + 0 + 0 + 0 + + + + 1 + Richiesta di conferma iscrizione alla newsletter + 2 + newsletter_subscr_confirm.html + newsletter/subscription/confirm_email_template + 1 + 0 + 0 + + + + 1 + Conferma iscrizione alla newsletter + 2 + newsletter_subscr_success.html + newsletter/subscription/success_email_template + 1 + 0 + 0 + + + + 1 + Conferma cancellazione newsletter + 2 + newsletter_unsub_success.html + newsletter/subscription/un_email_template + 1 + 0 + 0 + + + + 1 + Condividi lista dei desideri + 2 + wishlist_share.html + wishlist/email/email_template + 0 + 0 + 0 + + + + 1 + Condividi prodotto + 2 + product_share.html + sendfriend/email/template + 1 + 0 + 0 + + + + 1 + Form contatti + 1 + contact_form.html + contacts/email/email_template + 0 + 0 + 0 + + + + 1 + Notifica generazione mappa del sito + 1 + sitemap_generate_warning.html + sitemap/generate/error_email_template + 0 + 0 + 0 + + + + 1 + Prodotto nuovamente disponibile + 2 + product_stock_alert.html + catalog/productalert/email_stock_template + 0 + 0 + 0 + + + + 1 + Aggiornamento prezzo prodotti + 2 + product_price_alert.html + catalog/productalert/email_price_template + 0 + 0 + 0 + + + + 1 + Error cron durante l'aggiornamento prodotti + 2 + product_alert_cron_error.html + catalog/productalert_cron/error_email_template + 0 + 0 + 0 + + + + 1 + Invito cliente [Invito] + 2 + enterprise_invitation.html + enterprise_invitation/email/template + 0 + 0 + 0 + + + + 1 + Modifica token OAuth [Invito] + 2 + token.html + oauth/email/template + 0 + 0 + 0 + + + + + +
+ + + {{block type="magesetup/imprint_content" template="magesetup/imprint/email_footer.phtml"}} + + + ]]> +
+ +   + + + {{block type="cms/block" block_id="business_terms"}} + + + ]]> + + +   + + + {{block type="cms/block" block_id="revocation"}} + + + ]]> + + + + + + diff --git a/src/app/locale/it_IT/template/magesetup/agreement/business_terms.html b/src/app/locale/it_IT/template/magesetup/agreement/business_terms.html new file mode 100644 index 00000000..d304a20c --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/agreement/business_terms.html @@ -0,0 +1,3 @@ + + +{{block type="cms/block" block_id="business_terms"}} \ No newline at end of file diff --git a/src/app/locale/it_IT/template/magesetup/agreement/revocation.html b/src/app/locale/it_IT/template/magesetup/agreement/revocation.html new file mode 100644 index 00000000..447d4de7 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/agreement/revocation.html @@ -0,0 +1,3 @@ + + +{{block type="cms/block" block_id="revocation"}} \ No newline at end of file diff --git a/src/app/locale/it_IT/template/magesetup/block/business_terms.html b/src/app/locale/it_IT/template/magesetup/block/business_terms.html new file mode 100644 index 00000000..509f4018 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/block/business_terms.html @@ -0,0 +1,2 @@ + +

Inserite qui le vostre Condizioni Generali di Vendita.

diff --git a/src/app/locale/it_IT/template/magesetup/block/revocation.html b/src/app/locale/it_IT/template/magesetup/block/revocation.html new file mode 100644 index 00000000..88135c27 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/block/revocation.html @@ -0,0 +1,2 @@ + +

Inserite qui le informazioni sul diritto di recesso.

diff --git a/src/app/locale/it_IT/template/magesetup/page/404.html b/src/app/locale/it_IT/template/magesetup/page/404.html new file mode 100644 index 00000000..9848dd71 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/404.html @@ -0,0 +1,9 @@ + + + +

404 - Pagina non trovata

+

Impossibile trovare la pagina richiesta, probabilmente l'indirizzo non è corretto. Ciò ha causato un errore 404. Utilizza la pagina di ricerca o torna alla homepage per navigare il nostro catalogo.

+ diff --git a/src/app/locale/it_IT/template/magesetup/page/business_terms.html b/src/app/locale/it_IT/template/magesetup/page/business_terms.html new file mode 100644 index 00000000..80f299dd --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/business_terms.html @@ -0,0 +1,4 @@ + + + +{{block type="cms/block" block_id="business_terms"}} \ No newline at end of file diff --git a/src/app/locale/it_IT/template/magesetup/page/imprint.html b/src/app/locale/it_IT/template/magesetup/page/imprint.html new file mode 100644 index 00000000..ef685b7b --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/imprint.html @@ -0,0 +1,32 @@ + + + +

DISCLAIMER

+ +

I testi a seguito hanno esclusivamente scopo dimostrativo e +devono essere sostituiti con informazioni corrette modificando +i singoli blocchi (CMS > Blocchi statici). FireGento e.V. non +è da considerarsi responsabile in merito alle informazioni +contenute in questa pagina.

+ +

Note legali (Esempio)

+ +

{{block type="magesetup/imprint_field" value="shop_name"}}

+ +

{{block type="magesetup/imprint_content" template="magesetup/imprint/address.phtml"}}

+ +

{{block type="magesetup/imprint_content" template="magesetup/imprint/communication.phtml"}}

+ +

{{block type="magesetup/imprint_content" template="magesetup/imprint/legal.phtml"}}

+ +

{{block type="magesetup/imprint_content" template="magesetup/imprint/tax.phtml"}}

+ +

{{block type="magesetup/imprint_content" template="magesetup/imprint/bank.phtml"}}

+ +

{{block type="magesetup/imprint_field" value="business_rules"}}

+ +

Potete contattare il nostro Servizio Clienti per informazioni e reclami telefonicamente al numero {{block type="magesetup/imprint_field" value="telephone"}} o tramite e-mail all'indirizzo {{block type="magesetup/imprint_field" value="email"}}. Per qualsiasi informazione è inoltre possibile usare il form sulla nostra pagina Contatti.

+ +

Responsabilità per i link (Esempio)

+ +

Nonostante un attento controllo, non ci assumiamo alcuna responsabilità in merito al contenuto di qualsiasi altro sito web cui possiate accedere dal nostro sito internet. Non abbiamo alcun controllo sui contenuti di tali siti e non siamo in grado di garantire l’attendibilità o precisione di qualsiasi informazione linkata ad una pagina esterna.

diff --git a/src/app/locale/it_IT/template/magesetup/page/order.html b/src/app/locale/it_IT/template/magesetup/page/order.html new file mode 100644 index 00000000..1ab16d18 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/order.html @@ -0,0 +1,53 @@ + + + +

DISCLAIMER

+ +

I testi a seguito hanno esclusivamente scopo dimostrativo e +devono essere sostituiti con informazioni corrette modificando +i singoli blocchi (CMS > Blocchi statici). FireGento e.V. non +è da considerarsi responsabile in merito alle informazioni +contenute in questa pagina.

+ +

Fare acquisti in modo semplice e veloce

+ +

Come posso fare acquisti su {{block type="magesetup/imprint_field" value="shop_name"}}?

+ +

1. Carrello

+ +

Scegliete i prodotti che desiderate ordinare cliccando sul pulsante "Aggiungi al carrello". +Così facendo, gli articoli richiesti verranno aggiunti al carrello. È possibile modificare la +vostra selezione in qualsiasi momento prima di inviare l'ordine, modificando le quantità +desiderate o rimuovendo i prodotti attraverso il tasto "Elimina". Facendo click sul pulsante +"Checkout" potrete accedere al passo successivo.

+ +

2. Checkout

+ +

Se disponete di un account cliente, effettuate il login inserendo il vostro nome utente +e la vostra passwort. In caso contrario, potete registrare un nuovo accounto o ordinare in +modalità "ospite". I vostri dati personali vengono salvati e elaborati in modo confidenziale (Informativa sulla privacy). +Facendo click su "Avanti" potrete accedere al passo successivo.

+ +

3. Verifica indirizzo di fatturazione / Scelta metodo di pagamento

+ +

Verificate ora il vostro indirizzo di fatturazione e selezionate il metodo di +pagamento che preferite. Facendo click su "Avanti" potrete accedere al passo successivo.

+ +

4. Verifica indirizzo di spedizione / Scelta metodo di spedizione

+ +

Verificate ora il vostro indirizzo di spedizione e selezionate il metodo di +spedizione che preferite. Facendo click su "Avanti" potrete accedere al passo successivo.

+ +

5. Invio dell'ordine / CGV e diritto di recesso

+ +

La pagina successiva contiene un quadro dettagliato del vostro ordine: i prodotti selezionati, +gli indirizzi di fatturazione e spedizione, i metodi di spedizione e pagamento selezionati e i +vostri recapiti. Verificate la correttezza di questi dati e controllate le nostre +Condizioni generali di vendita e +l'informativa sul diritto di recesso con attenzione. +Potete ora procedere all'acquisto, dichiarando di avere letto e accettato le CGV e il diritto di recesso. +Facendo click su "Acquista" riceveremo il vostro ordine.

+ +

Diritto di recesso

+ +

Maggiori informazioni in merito al Diritto di recesso

\ No newline at end of file diff --git a/src/app/locale/it_IT/template/magesetup/page/payment.html b/src/app/locale/it_IT/template/magesetup/page/payment.html new file mode 100644 index 00000000..6cf5e2a4 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/payment.html @@ -0,0 +1,26 @@ + + + +

DISCLAIMER

+ +

I testi a seguito hanno esclusivamente scopo dimostrativo e +devono essere sostituiti con informazioni corrette modificando +i singoli blocchi (CMS > Blocchi statici). FireGento e.V. non +è da considerarsi responsabile in merito alle informazioni +contenute in questa pagina.

+ +

Pagamenti

+ +

Al momento offriamo i seguenti metodi di pagamento Scegliete il metodo +che preferite. I costi di spedizione possono dipendere dal metodo di pagamento +selezionato.

+ +

Bonifico

+ +

Trasferite l'importo dovuto tramite bonifico bancario verso il nostro conto corrente:

+ +

Contrassegno

+ +

Il corriere incasserà in contanti l'importo dovuto in contanti (no assegni). +Il pagamento tramite contrassegno comporta un costo aggiuntivo di € 2,00, da +pagare direttamente al nostro incaricato.

diff --git a/src/app/locale/it_IT/template/magesetup/page/privacy.html b/src/app/locale/it_IT/template/magesetup/page/privacy.html new file mode 100644 index 00000000..36a23306 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/privacy.html @@ -0,0 +1,4 @@ + + + +

Inserite qui l'informativa sul trattamento dei dati personali.

diff --git a/src/app/locale/it_IT/template/magesetup/page/revocation.html b/src/app/locale/it_IT/template/magesetup/page/revocation.html new file mode 100644 index 00000000..e373d604 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/revocation.html @@ -0,0 +1,4 @@ + + + +{{block type="cms/block" block_id="revocation"}} \ No newline at end of file diff --git a/src/app/locale/it_IT/template/magesetup/page/shipping.html b/src/app/locale/it_IT/template/magesetup/page/shipping.html new file mode 100644 index 00000000..d5a437f6 --- /dev/null +++ b/src/app/locale/it_IT/template/magesetup/page/shipping.html @@ -0,0 +1,4 @@ + + + +

Inserite qui le informazioni sulle spedizioni (tempi, metodi, costi).

From 83c0e9c7226cf87b352ca3afaa9ec5db00b6151c Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Mon, 16 Sep 2013 10:34:05 +0200 Subject: [PATCH 03/37] [~TASK] Bumped version to 2.0.3 --- src/app/code/community/FireGento/MageSetup/etc/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/code/community/FireGento/MageSetup/etc/config.xml b/src/app/code/community/FireGento/MageSetup/etc/config.xml index f6172e75..26a782f3 100644 --- a/src/app/code/community/FireGento/MageSetup/etc/config.xml +++ b/src/app/code/community/FireGento/MageSetup/etc/config.xml @@ -25,7 +25,7 @@ - 2.0.2 + 2.0.3 From 858a43c280b04dbdc309bfa2340c40a5d86efe43 Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Wed, 18 Sep 2013 15:49:41 +0200 Subject: [PATCH 04/37] [~TASK] Updated default tax.xml --- .../FireGento/MageSetup/etc/default/tax.xml | 249 ++++-------------- 1 file changed, 52 insertions(+), 197 deletions(-) diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml index 0cb8419e..a97e85fb 100644 --- a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml +++ b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml @@ -19,7 +19,7 @@ * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served. * @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3) * @version $Id:$ - * @since 0.1.0 + * @since 2.0.0 */ --> @@ -27,270 +27,125 @@ - - + 1 - 3 - End Customers buy Products with full Tax + Customers buy Products with full Tax 1 0 - + 1 - 4 - End Customers buy Products with reduced Tax + Customers buy Products with reduced Tax 2 0 - - - - 1 - 6 - Taxable Companies buy Products with full Tax - 1 - 0 - - + 1 - 8 - Taxable Companies buy Products with reduced Tax - 2 - 0 - - - 1 - 10 Non-taxable Companies buy Products with full and reduced Tax - 1 - 0 - - - - - 1 - 5 - Shipping with full Tax - 3 - 0 - - - 1 - 7 - Shipping with reduced Tax - 3 + 2 0 - - + - + 1 1 Products with full Tax PRODUCT 1 - - + + 1 2 Products with reduced Tax PRODUCT 0 - - + + 1 3 - End Customers - CUSTOMER - - - 1 - 4 Shipping with full Tax PRODUCT 0 - - + + 1 - 7 + 4 Shipping with reduced Tax PRODUCT 0 - - + + 1 5 - Taxable Companies + End Customers CUSTOMER - - + + 1 6 + Taxable Companies + CUSTOMER + + + 1 + 7 Non-Taxable Companies CUSTOMER - + - + - - 4 + UK + 3 billing 1 1 1 1 - - - 12345 + UK + + SW1A 1AA 2 2 2 @@ -305,10 +160,10 @@ 0 1 1 - - - 12345 - Sample City + UK + + SW1A 1AA + London From dccfb1032f6309fe63eab113edd785a2cf7627e9 Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Wed, 18 Sep 2013 16:01:42 +0200 Subject: [PATCH 05/37] [~TASK] Updated default cms page templates --- .../template/magesetup/page/imprint.html | 21 ++--------- .../en_US/template/magesetup/page/order.html | 36 ------------------- .../template/magesetup/page/payment.html | 28 --------------- 3 files changed, 2 insertions(+), 83 deletions(-) diff --git a/src/app/locale/en_US/template/magesetup/page/imprint.html b/src/app/locale/en_US/template/magesetup/page/imprint.html index 2f228fdd..9f1c50af 100644 --- a/src/app/locale/en_US/template/magesetup/page/imprint.html +++ b/src/app/locale/en_US/template/magesetup/page/imprint.html @@ -3,15 +3,7 @@

Please insert your imprint here.

-

DISCLAIMER

- -

Die hier bereitgestellten Mustertexte sind ausdrücklich als -MUSTER zu verstehen und müssen in jedem Fall durch -eigene rechtssichere Texte unter CMS -> Statische Blöcke ersetzt -werden. Weder FireGento e.V. noch Trusted Shops tragen für die -Richtigkeit und Vollständigkeit dieser Texte eine Verantwortung.

- -

Impressum (Muster)

+

Imprint (Sample)

{{block type="magesetup/imprint_field" value="shop_name"}}

@@ -27,13 +19,4 @@

{{block type="magesetup/imprint_field" value="shop_name"}}

{{block type="magesetup/imprint_field" value="business_rules"}}

-

Sie erreichen unseren Kundendienst für Fragen Reklamationen und Beanstandungen unter Telefon: {{block type="magesetup/imprint_field" value="telephone"}} sowie per Email unter {{block type="magesetup/imprint_field" value="email"}}. Für Anfragen können Sie auch das Kontaktformular auf unserer Internetseite nutzen.

- -

Disclaimer (Muster)

- -

Bei direkten oder indirekten Verweisen auf fremde Webseiten ("Hyperlinks"), die außerhalb des Verantwortungsbereiches des Autors liegen, würde eine Haftungsverpflichtung ausschließlich in dem Fall in Kraft treten, in dem der Autor von den Inhalten Kenntnis hat und es ihm technisch möglich und zumutbar wäre, die Nutzung im Falle rechtswidriger Inhalte zu verhindern. Der Autor erklärt hiermit ausdrücklich, dass zum Zeitpunkt der Linksetzung keine illegalen Inhalte auf den zu verlinkenden Seiten erkennbar waren. Auf die aktuelle und zukünftige Gestaltung, die Inhalte oder die Urheberschaft der verlinkten/verknüpften Seiten hat der Autor keinerlei Einfluss. Deshalb distanziert er sich hiermit ausdrücklich von allen Inhalten aller verlinkten /verknüpften Seiten, die nach der Linksetzung verändert wurden. Diese Feststellung gilt für alle innerhalb des eigenen Internetangebotes gesetzten Links und Verweise sowie für Fremdeinträge in vom Autor eingerichteten Gästebüchern, Diskussionsforen, Linkverzeichnissen, Mailinglisten und in allen anderen Formen von Datenbanken, auf deren Inhalt externe Schreibzugriffe möglich sind. Für illegale, fehlerhafte oder unvollständige Inhalte und insbesondere für Schäden, die aus der Nutzung oder Nichtnutzung solcherart dargebotener Informationen entstehen, haftet allein der Anbieter der Seite, auf welche verwiesen wurde, nicht derjenige, der über Links auf die jeweilige Veröffentlichung lediglich verweist.

- -

Urheber- und Kennzeichenrecht

- -

Der Autor ist bestrebt, in allen Publikationen die Urheberrechte der verwendeten Bilder, Grafiken, Tondokumente, Videosequenzen und Texte zu beachten, von ihm selbst erstellte Bilder, Grafiken, Tondokumente, Videosequenzen und Texte zu nutzen oder auf lizenzfreie Grafiken, Tondokumente, Videosequenzen und Texte zurückzugreifen. Alle innerhalb des Internetangebotes genannten und ggf. durch Dritte geschützten Marken- und Warenzeichen unterliegen uneingeschränkt den Bestimmungen des jeweils gültigen Kennzeichenrechts und den Besitzrechten der jeweiligen eingetragenen Eigentümer. Allein aufgrund der bloßen Nennung ist nicht der Schluss zu ziehen, dass Markenzeichen nicht durch Rechte Dritter geschützt sind! Das Copyright für veröffentlichte, vom Autor selbst erstellte Objekte bleibt allein beim Autor der Seiten. Eine Vervielfältigung oder Verwendung solcher Grafiken, Tondokumente, Videosequenzen und Texte in anderen elektronischen oder gedruckten Publikationen ist ohne ausdrückliche Zustimmung des Autors nicht gestattet.

- +

Call us at {{block type="magesetup/imprint_field" value="telephone"}} or write an email to {{block type="magesetup/imprint_field" value="email"}}.

diff --git a/src/app/locale/en_US/template/magesetup/page/order.html b/src/app/locale/en_US/template/magesetup/page/order.html index badc4fd2..477c05f7 100644 --- a/src/app/locale/en_US/template/magesetup/page/order.html +++ b/src/app/locale/en_US/template/magesetup/page/order.html @@ -2,39 +2,3 @@

Please insert details about your order process here.

- -

DISCLAIMER

- -

Die hier bereitgestellten Mustertexte sind ausdrücklich als -MUSTER zu verstehen und müssen in jedem Fall durch -eigene rechtssichere Texte unter CMS -> Statische Blöcke ersetzt -werden. Weder FireGento e.V. noch Trusted Shops tragen für die -Richtigkeit und Vollständigkeit dieser Texte eine Verantwortung.

- -

Bestellvorgang, einfach und bequem bestellen

- -

Wie kann ich bei {{block type="magesetup/imprint_field" value="shop_name"}} bestellen?

- -

1. Warenkorb

- -

Wählen Sie die Produkte aus, die Sie bestellen möchten, indem Sie den "In den Warenkorb" Button anklicken. Dadurch wird Ihre Auswahl in den Warenkorb gelegt. Sie können diese Auswahl bis zum Absenden Ihrer Bestellung jederzeit ändern, in dem Sie die Anzahl der Produkte ändern, durch Anklicken des Kästchens "Entfernen" die Auswahl löschen oder den Bestellvorgang abbrechen. Durch Anklicken des Buttons "Kasse" gelangen Sie zum nächsten Bestellschritt.

- -

2. Kasse

- -

Melden Sie sich bitte mit Ihrer eMail Adresse und Ihrem Passwort an falls Sie bereits ein Kundenkonto besitzen, ansonsten registrieren Sie sich bitte als neuer Kunde. Ihre Daten werden unter Beachtung der datenschutzrechtlichen Bestimmungen erhoben, verarbeitet und genutzt (Datenschutzhinweis). Eine anderweitige Verwendung oder Weitergabe an Dritte erfolgt nicht. Sind Sie bereits angemeldet, können Sie nun die Versandart auswählen. Durch klicken des Buttons "Weiter" gelangen Sie zum nächsten Bestellschritt.

- -

3. Rechnungsadresse prüfen / Zahlungsweise auswählen

- -

Überprüfen Sie nun Ihre Rechnungsadresse und geben Sie Ihre gewünschte Zahlungsweise an. Durch Klicken des Buttons "Weiter" gelangen Sie zum nächsten Bestellschritt.

- -

4. Versandadresse prüfen / Versandart auswählen

- -

Überprüfen Sie nun Ihre Versandadresse und geben Sie Ihre gewünschte Versandart an. Durch Klicken des Buttons "Weiter" gelangen Sie zum nächsten Bestellschritt.

- -

5. Bestellvorgang abschließen / AGB und Datenschutz

- -

Sie erhalten eine Übersicht Ihrer Bestellung: die ausgewählten Produkte, die Versand- und Rechnungsadresse und Ihre Kontaktdaten. Überprüfen Sie, ob alle Angaben stimmen und lesen sich bitte die Allgemeinen Geschäftsbedingungen und die Widerrufsbelehrung aufmerksam durch. Sie können mit der Bestellung nur fortfahren, wenn Sie den AGB und der Widerrufsbelehrung zustimmen (Häkchen setzen). Mit dem Anklicken des Buttons "Jetzt kaufen" übersenden Sie Ihre Bestellung an uns. Hiermit geben Sie ein rechtsverbindliches Angebot ab.

- -

Widerrufsrecht für Verbraucher

- -

Alle Informationen zum Widerrufsrecht

\ No newline at end of file diff --git a/src/app/locale/en_US/template/magesetup/page/payment.html b/src/app/locale/en_US/template/magesetup/page/payment.html index ba841855..24066577 100644 --- a/src/app/locale/en_US/template/magesetup/page/payment.html +++ b/src/app/locale/en_US/template/magesetup/page/payment.html @@ -2,31 +2,3 @@

Please insert your payment methods and further details here.

- -

DISCLAIMER

- -

Die hier bereitgestellten Mustertexte sind ausdrücklich als -MUSTER zu verstehen und müssen in jedem Fall durch -eigene rechtssichere Texte unter CMS -> Statische Blöcke ersetzt -werden. Weder der FireGento e.V. noch Trusted Shops tragen für die -Richtigkeit und Vollständigkeit dieser Texte eine Verantwortung.

- -

Zahlungsarten

- -

Wir bieten Ihnen folgende Zahlungsarten an. Suchen Sie sich einfach die für Sie optimale Zahlart aus. Die Versandkosten sind teilweise abhängig von der gewählten Zahlungsart.

- -

Vorkasse

- -

Bitte überweisen Sie den Gesamtbetrag Ihrer Bestellung auf unser Konto.

- -

Rechnung

- -

Nur für Schulen, Behörden und im Handelsregister eingetragene Unternehmen nach Prüfung.

- -

Nachnahme

- -

Bitte halten Sie den Rechnungsbetrag bereit; der Zusteller kassiert bei Lieferung in bar (keine Schecks). Bei Nachnahme fallen zusätzlich 2,-- EUR Nachnahmegebühren an, die direkt an den Paketzusteller zu entrichten sind.

- -

Lastschrift

- -

Wir ziehen den Rechnungsbetrag Ihrer Bestellung von Ihrem hinterlegten Bankkonto nach der getätigten Bestellung ein.

\ No newline at end of file From a571d699a57d98f7f7f0a5c591ae7b1ad1f31978 Mon Sep 17 00:00:00 2001 From: Christian Philipp Date: Wed, 18 Sep 2013 16:23:44 +0200 Subject: [PATCH 06/37] added contribute explanation with some screenshots --- docs/contribute/contribute.markdown | 90 ++++++++++++++++++++++ docs/contribute/images/cms-pages.png | Bin 0 -> 4660 bytes docs/contribute/images/config-xml.png | Bin 0 -> 6285 bytes docs/contribute/images/email-template.png | Bin 0 -> 11168 bytes docs/contribute/images/system-config.png | Bin 0 -> 12191 bytes 5 files changed, 90 insertions(+) create mode 100644 docs/contribute/contribute.markdown create mode 100644 docs/contribute/images/cms-pages.png create mode 100644 docs/contribute/images/config-xml.png create mode 100644 docs/contribute/images/email-template.png create mode 100644 docs/contribute/images/system-config.png diff --git a/docs/contribute/contribute.markdown b/docs/contribute/contribute.markdown new file mode 100644 index 00000000..aad83f18 --- /dev/null +++ b/docs/contribute/contribute.markdown @@ -0,0 +1,90 @@ +FireGento_MageSetup - Contribute +===================== +You would like to contribute to MageSetup by adding a new country. Thank you very much! +Here you'll find information about how to add a your country to this module. + +##Small introduction +**What does it Mage Setup do?** +- MageSetup helps you to setup your Magento-Shop at the very beginning to get correct taxes, email templates, payment +agreements, cms pages, etc. according to the country, you want to sell your products in. + +##General settings +- First of all, you have to add your country in the file config.xml (app\code\community\FireGento\MageSetup\etc\config.xml). +In config->global->available_countries you just add your country, by making a self closing tag with the iso2 code of your country. +![General Settings in config.xml](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/config-xml.png "config.xml") + +After that, add a folder here: app\code\community\FireGento\MageSetup\etc\ +The name should be the iso2 code for your country too. + +If you didn't do it, the default folder will be taken as a fallback. + +##Setting up the agreements +- If you have special billing agreements or likewise in your country, you need to copy the file agreements.xml from the default folder. +After that change the agreements.xml the way you need it. + +##Setting up the cms pages +- If special cms pages are needed in your country, copy it from the default folder and change the cms.xml the way you need it. +Here is an example of a knot for a cms page with an explanation of the tags. +![General Settings for cms pages](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/cms-pages.png "cms pages") + +
+    * magesetup_404 -> put the name of the page here in this way: magesetup_*name-of-page*
+    * execute-> put 1 here, if page should be active
+    * filename -> the path to template file
+    * footerlink -> if a footer link is added or not. (see below for more information about it)
+
+ +**What is the footer link for?** + +If the footer link is set, the cms page will be shown as a link on the footer menu in the block footer_links. + +##Setting up the email templates +- The email templates depend on the localization of your country. +If you need to change it, just copy the email.xml from default folder and change the way you need it. +Here is an example of a knot for a cms page with an explanation of the tags. +![General Settings for email templates](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/email-template.png "email template") + +
+    * admin_password_new -> the name of the mail template
+    * execute-> put 1 here, if mail template should be active
+    * template_code-> that's the heading of the mail template in backend
+    * template_type-> that's the type of the template, 1 stands for text, 2 stands for html
+    * template_file -> the name of the template file (should be located in app/local/xx_YY/template/email)
+    * config_data_path -> the configuration path to template
+    * add_footer -> if a footer is added or not. (see below for more information about it)
+    * add_business_terms -> if business terms are added or not. (see below for more information about it)
+    * add_revocation -> if revocations are added or not. (see below for more information about it)
+
+ +**What is the add_footer tag for?** + +If the footer link is set, the mail templates will get a footer at the very bottom of the template. + +**What is the add_business_terms tag for?** + +If the business terms tag is set, the mail template will include the business terms from the shop. + +**What is the add_revocation tag for?** + +If the add_revocation tag is set, the mail template will include the revocations from the shop. + +##Setting up the system configuration +- If you need to change some configuration settings, just copy the systemconfig.xml from default and change the way you need it. +![Settings for system configuration](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/system-config.png "system configuration") + +
+customer__create_account__confirm -> This is the path to the backend configuration in "Customer -> Create Account -> Confirm"
+
+If you want to add other settings, just apply to the way it's shown here. + +##Setting up the taxes +- Taxes are a bit tricky, because it's different all over the world. + * If it's an eu country and there are two vats, than copy the tax.xml from the folder uk (folder gb). + * If it's an eu country and there are three vats, than copy the tax.xml from the folder fr. + * If it's an non eu country and there are two vats, than copy the tax.xml from the folder ch. + * If it's an non eu country and there is no real tax at all, than copy the tax.xml from the folder br. + +##Setting up translation files, mail templates and agreements +- To setup all translations for mail templates and so on, you need to to this folder: app\locale +Copy the en_US folder and give it the corresponding name for your country. +After that you need to do the hard work and translate every file by hand. \ No newline at end of file diff --git a/docs/contribute/images/cms-pages.png b/docs/contribute/images/cms-pages.png new file mode 100644 index 0000000000000000000000000000000000000000..769d886bae3a12913c518b0a37c3e5ddcc904ca9 GIT binary patch literal 4660 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 B-tGVZ literal 0 HcmV?d00001 diff --git a/docs/contribute/images/config-xml.png b/docs/contribute/images/config-xml.png new file mode 100644 index 0000000000000000000000000000000000000000..5393f2386716539e5f8b159d1f191d5dfa3f20a1 GIT binary patch literal 6285 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 bCYu5K!$aKg{gL2L2oSU5md1o*7o+|MVTmOy literal 0 HcmV?d00001 diff --git a/docs/contribute/images/email-template.png b/docs/contribute/images/email-template.png new file mode 100644 index 0000000000000000000000000000000000000000..758c97454e445d964f9c7c458c82993f56c9084c GIT binary patch literal 11168 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 literal 0 HcmV?d00001 diff --git a/docs/contribute/images/system-config.png b/docs/contribute/images/system-config.png new file mode 100644 index 0000000000000000000000000000000000000000..b30780d5c9da59044e7828f7f67917008803e468 GIT binary patch literal 12191 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 literal 0 HcmV?d00001 From 9107024de7ae298e5cbe6a20d7df62f704fd6e6d Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Wed, 18 Sep 2013 16:27:39 +0200 Subject: [PATCH 07/37] [~BUGFIX] Fixed bug with loading cms page --- .../FireGento/MageSetup/Model/Setup/Cms.php | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php index 583930a2..8b6f0653 100644 --- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php +++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php @@ -161,7 +161,12 @@ protected function _createCmsPage($pageData, $locale, $override = true, $storeId $data['content'] = $templateContent; - $page = Mage::getModel('cms/page')->setStoreId($storeId)->load($data['identifier']); + if (is_null($storeId)) { + $page = $this->_getDefaultPage($data['identifier']); + } else { + $page = Mage::getModel('cms/page')->setStoreId($storeId)->load($data['identifier']); + } + if (is_array($page->getStoreId()) && !in_array(intval($storeId), $page->getStoreId())) { $page = Mage::getModel('cms/page'); } else { @@ -169,7 +174,10 @@ protected function _createCmsPage($pageData, $locale, $override = true, $storeId } if (!(int) $page->getId() || $override) { - $page->setData($data)->save(); + $page->addData($data); + Mage::log($page->getData()); + $page->save(); + Mage::log('saved'); } if (!$storeId) { @@ -322,4 +330,17 @@ protected function _getDefaultBlock($identifier) ->addFieldToFilter('identifier', $identifier) ->addStoreFilter(0)->getFirstItem(); } + + /** + * Retrieve the default page for the given identifier + * + * @param string $identifier Page Identifier + * @return Mage_Cms_Model_Page Page Model + */ + protected function _getDefaultPage($identifier) + { + return Mage::getResourceModel('cms/page_collection') + ->addFieldToFilter('identifier', $identifier) + ->addStoreFilter(0)->getFirstItem(); + } } From d9c994e1eb9c27001b9678ef79cc8dbbbff11174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20A=C3=9Fmann?= Date: Wed, 18 Sep 2013 17:45:07 +0200 Subject: [PATCH 08/37] add 'skip setup' link to backend notification --- .../MageSetup/Block/Adminhtml/Notifications.php | 9 +++++++++ .../community/FireGento/MageSetup/Helper/Data.php | 13 +++++++++++++ .../community/FireGento/MageSetup/Model/Setup.php | 4 +--- .../MageSetup/controllers/MagesetupController.php | 15 +++++++++++++-- .../template/magesetup/notifications.phtml | 5 ++++- src/app/locale/de_DE/FireGento_MageSetup.csv | 1 + src/app/locale/en_US/FireGento_MageSetup.csv | 1 + src/app/locale/fr_FR/FireGento_MageSetup.csv | 1 + src/app/locale/it_IT/FireGento_MageSetup.csv | 1 + src/app/locale/ru_RU/FireGento_MageSetup.csv | 1 + 10 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php index b43bb236..cc6a66ed 100644 --- a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php +++ b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php @@ -66,6 +66,15 @@ public function getManageUrl() return $this->getUrl('adminhtml/magesetup'); } + /** + * Get magesetup installation skip action + * @return string URL for skip action + */ + public function getSkipUrl() + { + return $this->getUrl('adminhtml/magesetup/skip'); + } + /** * ACL validation before html generation * diff --git a/src/app/code/community/FireGento/MageSetup/Helper/Data.php b/src/app/code/community/FireGento/MageSetup/Helper/Data.php index 26d9d52b..daf7338a 100644 --- a/src/app/code/community/FireGento/MageSetup/Helper/Data.php +++ b/src/app/code/community/FireGento/MageSetup/Helper/Data.php @@ -104,4 +104,17 @@ public function getEUCountries() { return explode(',', Mage::getStoreConfig(self::XML_PATH_EU_COUNTRIES_LIST)); } + + /** + * Set initialization status config flag and refresh config cache. + * + * @param boolean $isInitialized + */ + public function setIsInitialized($isInitialized = true) + { + $isInitialized = (bool)$isInitialized ? '1' : '0'; + Mage::getModel('eav/entity_setup', 'core_setup')->setConfigData('magesetup/is_initialized', $isInitialized); + Mage::app()->getCacheInstance()->cleanType('config'); + Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => 'config')); + } } diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup.php b/src/app/code/community/FireGento/MageSetup/Model/Setup.php index 404d8c2c..d500ae9b 100644 --- a/src/app/code/community/FireGento/MageSetup/Model/Setup.php +++ b/src/app/code/community/FireGento/MageSetup/Model/Setup.php @@ -125,9 +125,7 @@ public function setup($params = array(), $notify=false) } // Set a config flag to indicate that the setup has been initialized and refresh config cache. - Mage::getModel('eav/entity_setup', 'core_setup')->setConfigData('magesetup/is_initialized', '1'); - Mage::app()->getCacheInstance()->cleanType('config'); - Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => 'config')); + $this->_getHelper()->setIsInitialized(); return $this; } diff --git a/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php b/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php index d1431184..c8301fac 100644 --- a/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php +++ b/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php @@ -78,6 +78,17 @@ public function saveAction() $this->_redirect('*/*'); } + /** + * Skip setup by setting the config flag accordingly + */ + public function skipAction() + { + /* @var $helper FireGento_MageSetup_Helper_Data */ + $helper = Mage::helper('magesetup'); + $helper->setIsInitialized(); + $this->_redirectReferer(); + } + /** * Recommended extensions */ @@ -101,7 +112,7 @@ public function extensionsAction() protected function _getParams() { $params = $this->getRequest()->getParams(); - + if (!isset($params['systemconfig'])) { $params['systemconfig'] = false; } @@ -121,7 +132,7 @@ protected function _getParams() if (!isset($params['email'])) { $params['email'] = false; } - + return $params; } } diff --git a/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml b/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml index 98e72ba2..e8a96831 100644 --- a/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml +++ b/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml @@ -1,6 +1,9 @@ - + isInitialized()): ?>
+ + __('Skip installation') ?> + helper('magesetup')->__('MageSetup has been installed.') ?> helper('magesetup')->__('Click here to set up your pages, blocks, emails and tax settings.', $this->getManageUrl()) ?>
diff --git a/src/app/locale/de_DE/FireGento_MageSetup.csv b/src/app/locale/de_DE/FireGento_MageSetup.csv index 97ff5470..332c5bc8 100644 --- a/src/app/locale/de_DE/FireGento_MageSetup.csv +++ b/src/app/locale/de_DE/FireGento_MageSetup.csv @@ -17,6 +17,7 @@ "Shipping Weight %s","Versandgewicht %s" "If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Wenn Sie (z.B. für mehrere Sprachen) zusätzliche StoreViews anlegen möchten, tun Sie dies bitte, bevor Sie dieses Formular ausfüllen." +"Skip installation","Installation überspringen" "MageSetup has been installed.","MageSetup wurde installiert." "Click here to set up your pages, blocks, emails and tax settings.","Klicken Sie hier, um CMS-Seiten, Blöcke, E-Mails und Steuer-Einstellungen zu initialisieren." "Please choose the requested setups:","Bitte wählen Sie die gewünschten Setups:" diff --git a/src/app/locale/en_US/FireGento_MageSetup.csv b/src/app/locale/en_US/FireGento_MageSetup.csv index 286c2928..3ed91223 100644 --- a/src/app/locale/en_US/FireGento_MageSetup.csv +++ b/src/app/locale/en_US/FireGento_MageSetup.csv @@ -17,6 +17,7 @@ "Shipping Weight %s","Shipping Weight %s" "If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form." +"Skip installation","Skip installation" "MageSetup has been installed.","MageSetup has been installed." "Click here to set up your pages, blocks, emails and tax settings.","Click here to set up your pages, blocks, emails and tax settings." "Please choose the requested setups:","Please choose the requested setups:" diff --git a/src/app/locale/fr_FR/FireGento_MageSetup.csv b/src/app/locale/fr_FR/FireGento_MageSetup.csv index be1d5098..c2303d50 100644 --- a/src/app/locale/fr_FR/FireGento_MageSetup.csv +++ b/src/app/locale/fr_FR/FireGento_MageSetup.csv @@ -16,6 +16,7 @@ "Shipping Weight %s","Poids de la livraison %s" "If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Si vous osuhaitez ajouter des vues de magasin (e.g. site multilingue), faites le avant de soumettre ce formaulaire" +"Skip installation","Skip installation" "MageSetup has been installed.","MageSetup a été installé." "Click here to set up your pages, blocks, emails and tax settings.","Cliquez ici, pour mettre en place vos pages, blocks, emails et réglages de taxe." "Please choose the requested setups:","Veuillez choisir les réglages suivants:" diff --git a/src/app/locale/it_IT/FireGento_MageSetup.csv b/src/app/locale/it_IT/FireGento_MageSetup.csv index f5509178..4c72a4d3 100644 --- a/src/app/locale/it_IT/FireGento_MageSetup.csv +++ b/src/app/locale/it_IT/FireGento_MageSetup.csv @@ -16,6 +16,7 @@ "Shipping Weight %s","Peso spedizione %s" "If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Se necessario, aggiungere ulteriori vetrine dello shop (ad es. per diverse lingue) prima di utilizzare questo form" +"Skip installation","Skip installation" "MageSetup has been installed.","MageSetup installato correttamente" "Click here to set up your pages, blocks, emails and tax settings.","Clicca qui per impostare pagine CMS, blocchi, e-mail e configurazione delle tasse." "Please choose the requested setups:","Seleziona i setup da eseguire:" diff --git a/src/app/locale/ru_RU/FireGento_MageSetup.csv b/src/app/locale/ru_RU/FireGento_MageSetup.csv index ba6834e1..5ad0729f 100644 --- a/src/app/locale/ru_RU/FireGento_MageSetup.csv +++ b/src/app/locale/ru_RU/FireGento_MageSetup.csv @@ -16,6 +16,7 @@ "Shipping Weight %s","Вес посылки %s" "If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Если вы хотите добавить дополнительные представления магазинов (для других языков), пожалуйста, сделайте это до сохранения этой формы." +"Skip installation","Skip installation" "MageSetup has been installed.","MageSetup установлен." "Click here to set up your pages, blocks, emails and tax settings.","Нажмите сюда для настройки ваших страниц, блоков, писем и налоговых правил." "Please choose the requested setups:","Пожалуйста, выберите необходимые установки:" From 2b58097d33230ef272d5632b9fc3e4db6210aa9b Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Wed, 18 Sep 2013 17:49:56 +0200 Subject: [PATCH 09/37] [+TASK] Added Dutch tax configuration --- .../FireGento/MageSetup/etc/config.xml | 1 + .../FireGento/MageSetup/etc/nl/tax.xml | 171 ++++++++++++++++++ 2 files changed, 172 insertions(+) create mode 100644 src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml diff --git a/src/app/code/community/FireGento/MageSetup/etc/config.xml b/src/app/code/community/FireGento/MageSetup/etc/config.xml index 26a782f3..8aae0cb6 100644 --- a/src/app/code/community/FireGento/MageSetup/etc/config.xml +++ b/src/app/code/community/FireGento/MageSetup/etc/config.xml @@ -109,6 +109,7 @@ + diff --git a/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml new file mode 100644 index 00000000..63081189 --- /dev/null +++ b/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml @@ -0,0 +1,171 @@ + + + + + + + + + 1 + Customers buy Products with full Tax + 1 + 0 + + + 1 + Customers buy Products with reduced Tax + 2 + 0 + + + 1 + Non-taxable Companies buy Products with full and reduced Tax + 2 + 0 + + + + + + + + 1 + 1 + Products with full Tax + PRODUCT + 1 + + + 1 + 2 + Products with reduced Tax + PRODUCT + 0 + + + 1 + 3 + Shipping with full Tax + PRODUCT + 0 + + + 1 + 4 + Shipping with reduced Tax + PRODUCT + 0 + + + 1 + 5 + End Customers + CUSTOMER + + + 1 + 6 + Taxable Companies + CUSTOMER + + + 1 + 7 + Non-Taxable Companies + CUSTOMER + + + + + + + + 1 + 0 + * + + 21 + + + + 1 + 0 + * + + 6 + + + + 1 + 0 + * + + 0 + + + + + + + + NL + 3 + billing + 1 + 1 + 1 + 1 + NL + + 1234 + 2 + 2 + 2 + 1 + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + 1 + 1 + NL + + 1234 + Sample City + + + + + From 93d34b76461f26068b6b2c137f96f9bdea648e1e Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Wed, 18 Sep 2013 17:50:35 +0200 Subject: [PATCH 10/37] [+TASK] Updated contribute text file --- docs/contribute/contribute.markdown | 73 +++++++++++++++++------------ 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/docs/contribute/contribute.markdown b/docs/contribute/contribute.markdown index aad83f18..cab55c34 100644 --- a/docs/contribute/contribute.markdown +++ b/docs/contribute/contribute.markdown @@ -1,36 +1,45 @@ FireGento_MageSetup - Contribute ===================== You would like to contribute to MageSetup by adding a new country. Thank you very much! -Here you'll find information about how to add a your country to this module. +Here you'll find information about how to add a new country to this module. ##Small introduction -**What does it Mage Setup do?** -- MageSetup helps you to setup your Magento-Shop at the very beginning to get correct taxes, email templates, payment -agreements, cms pages, etc. according to the country, you want to sell your products in. +**What does MageSetup do?** +MageSetup helps you to setup your Magento-Shop at the very beginning to get correct taxes, email templates, payment +agreements, cms pages, etc. according to the country which you want to sell your products in. ##General settings -- First of all, you have to add your country in the file config.xml (app\code\community\FireGento\MageSetup\etc\config.xml). +First of all, you have to add your country to the file config.xml (app/code/community/FireGento/MageSetup/etc/config.xml). In config->global->available_countries you just add your country, by making a self closing tag with the iso2 code of your country. ![General Settings in config.xml](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/config-xml.png "config.xml") -After that, add a folder here: app\code\community\FireGento\MageSetup\etc\ -The name should be the iso2 code for your country too. +After that, add a folder here: app/code/community/FireGento/MageSetup/etc/ +The name should be the iso2 code of your country too. -If you didn't do it, the default folder will be taken as a fallback. +This newly created folder may contain up to 5 xml files: +- systemconfig.xml +- tax.xml +- cms.xml +- agreement.xml +- email.xml +You can take the default files from the folder app/code/community/FireGento/MageSetup/etc/default/. +If any of these 5 files does not exist, it falls back to the default folder. +Usually, having a tax.xml and in many cases an email.xml is sufficient. ##Setting up the agreements -- If you have special billing agreements or likewise in your country, you need to copy the file agreements.xml from the default folder. +If you have special billing agreements or likewise in your country, you need to copy the file agreements.xml +from the default folder. After that change the agreements.xml the way you need it. ##Setting up the cms pages - If special cms pages are needed in your country, copy it from the default folder and change the cms.xml the way you need it. -Here is an example of a knot for a cms page with an explanation of the tags. +Here is an example of a node for a cms page with an explanation of the tags. ![General Settings for cms pages](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/cms-pages.png "cms pages") 
-    * magesetup_404 -> put the name of the page here in this way: magesetup_*name-of-page*
-    * execute-> put 1 here, if page should be active
-    * filename -> the path to template file
+    * magesetup_404 -> this is the general identifier. Don't change this!
+    * execute -> enter "1" here if the page should be created
+    * filename -> the path to template file in app/locale/xx_YY/template/magesetup/page/
     * footerlink -> if a footer link is added or not. (see below for more information about it)
@@ -41,16 +50,16 @@ If the footer link is set, the cms page will be shown as a link on the footer me ##Setting up the email templates - The email templates depend on the localization of your country. If you need to change it, just copy the email.xml from default folder and change the way you need it. -Here is an example of a knot for a cms page with an explanation of the tags. +Here is an example of a node for an email template with an explanation of the tags. ![General Settings for email templates](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/email-template.png "email template") 
-    * admin_password_new -> the name of the mail template
-    * execute-> put 1 here, if mail template should be active
-    * template_code-> that's the heading of the mail template in backend
-    * template_type-> that's the type of the template, 1 stands for text, 2 stands for html
-    * template_file -> the name of the template file (should be located in app/local/xx_YY/template/email)
-    * config_data_path -> the configuration path to template
+    * admin_password_new -> the identifier of the mail template - don't change this
+    * execute -> put "1" here if mail template should be installed
+    * template_code -> that's the heading of the mail template in backend
+    * template_type -> that's the type of the template: 1 stands for text, 2 stands for html
+    * template_file -> the name of the template file (should be located in app/locale/xx_YY/template/email/ and contained in the language pack of your language)
+    * config_data_path -> the configuration path to template, don't change this.
     * add_footer -> if a footer is added or not. (see below for more information about it)
     * add_business_terms -> if business terms are added or not. (see below for more information about it)
     * add_revocation -> if revocations are added or not. (see below for more information about it)
@@ -58,7 +67,7 @@ Here is an example of a knot for a cms page with an explanation of the tags.
 
 **What is the add_footer tag for?**
 
-If the footer link is set, the mail templates will get a footer at the very bottom of the template.
+If the footer link is set, the mail templates will get a footer with shop data at the bottom of the template.
 
 **What is the add_business_terms tag for?**
 
@@ -69,7 +78,7 @@ If the business terms tag is set, the mail template will include the business te
 If the add_revocation tag is set, the mail template will include the revocations from the shop.
 
 ##Setting up the system configuration
-- If you need to change some configuration settings, just copy the systemconfig.xml from default and change the way you need it.
+If you need to change some configuration settings, just copy the systemconfig.xml from default and change the way you need it.
 ![Settings for system configuration](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/system-config.png "system configuration")
 
 
@@ -78,13 +87,17 @@ customer__create_account__confirm -> This is the path to the backend configurati
 If you want to add other settings, just apply to the way it's shown here.
 
 ##Setting up the taxes
-- Taxes are a bit tricky, because it's different all over the world.
-    * If it's an eu country and there are two vats, than copy the tax.xml from the folder uk (folder gb).
-    * If it's an eu country and there are three vats, than copy the tax.xml from the folder fr.
-    * If it's an non eu country and there are two vats, than copy the tax.xml from the folder ch.
-    * If it's an non eu country and there is no real tax at all, than copy the tax.xml from the folder br.
+Taxes are a bit tricky, because it's different all over the world.
+    * If it's an eu country and there are two tax rates, than copy the tax.xml from the folder **uk** (folder gb).
+    * If it's an eu country and there are three tax rates, than copy the tax.xml from the folder **fr**.
+    * If it's an non eu country and there are two tax rates, than copy the tax.xml from the folder **ch**.
+    * If it's an non eu country and there is no real tax at all, than copy the tax.xml from the folder **br** (in development).
+
+After that, you can adjust the settings. Please try to change only the text fields and the percentages of the tax calculation rates.
 
 ##Setting up translation files, mail templates and agreements
-- To setup all translations for mail templates and so on, you need to to this folder: app\locale
-Copy the en_US folder and give it the corresponding name for your country.
-After that you need to do the hard work and translate every file by hand.
\ No newline at end of file
+- To setup all translations for mail templates and so on, you need to create a new subfolder in app/locale.
+Copy the en_US folder and give it the corresponding name for your language.
+After that you need to do the hard work and translate the text parts of every file by hand.
+
+This step is only needed for new languages which are not supported yet.
\ No newline at end of file

From 9d597249db90fefcb737db5b0d0758f9d3494c48 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz 
Date: Wed, 18 Sep 2013 18:01:05 +0200
Subject: [PATCH 11/37] [~TASK] Updated contribute text file

---
 docs/contribute/contribute.markdown  |  17 ++++++++++-------
 docs/contribute/images/countries.png | Bin 0 -> 5365 bytes
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 docs/contribute/images/countries.png

diff --git a/docs/contribute/contribute.markdown b/docs/contribute/contribute.markdown
index cab55c34..f39b785b 100644
--- a/docs/contribute/contribute.markdown
+++ b/docs/contribute/contribute.markdown
@@ -11,17 +11,19 @@ agreements, cms pages, etc. according to the country which you want to sell your
 ##General settings
 First of all, you have to add your country to the file config.xml (app/code/community/FireGento/MageSetup/etc/config.xml).
 In config->global->available_countries you just add your country, by making a self closing tag with the iso2 code of your country.
-![General Settings in config.xml](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/config-xml.png "config.xml")
+![General Settings in config.xml](https://raw.github.com/firegento/firegento-magesetup/development/docs/contribute/images/countries.png "config.xml")
 
 After that, add a folder here: app/code/community/FireGento/MageSetup/etc/
 The name should be the iso2 code of your country too.
 
 This newly created folder may contain up to 5 xml files:
+
 - systemconfig.xml
 - tax.xml
 - cms.xml
 - agreement.xml
 - email.xml
+
 You can take the default files from the folder app/code/community/FireGento/MageSetup/etc/default/. 
 If any of these 5 files does not exist, it falls back to the default folder. 
 Usually, having a tax.xml and in many cases an email.xml is sufficient.
@@ -88,16 +90,17 @@ If you want to add other settings, just apply to the way it's shown here.
 
 ##Setting up the taxes
 Taxes are a bit tricky, because it's different all over the world.
-    * If it's an eu country and there are two tax rates, than copy the tax.xml from the folder **uk** (folder gb).
-    * If it's an eu country and there are three tax rates, than copy the tax.xml from the folder **fr**.
-    * If it's an non eu country and there are two tax rates, than copy the tax.xml from the folder **ch**.
-    * If it's an non eu country and there is no real tax at all, than copy the tax.xml from the folder **br** (in development).
+
+* If it's an eu country and there are two tax rates, than copy the tax.xml from the folder **uk** (folder gb).
+* If it's an eu country and there are three tax rates, than copy the tax.xml from the folder **fr**.
+* If it's an non eu country and there are two tax rates, than copy the tax.xml from the folder **ch**.
+* If it's an non eu country and there is no real tax at all, than copy the tax.xml from the folder **br** (in development).
 
 After that, you can adjust the settings. Please try to change only the text fields and the percentages of the tax calculation rates.
 
 ##Setting up translation files, mail templates and agreements
-- To setup all translations for mail templates and so on, you need to create a new subfolder in app/locale.
+To setup all translations for mail templates and so on, you need to create a new subfolder in app/locale.
 Copy the en_US folder and give it the corresponding name for your language.
 After that you need to do the hard work and translate the text parts of every file by hand.
 
-This step is only needed for new languages which are not supported yet.
\ No newline at end of file
+This step is only needed for new languages which were not supported before.
\ No newline at end of file
diff --git a/docs/contribute/images/countries.png b/docs/contribute/images/countries.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c1b4ece13b3c3efebe82d0b80d6318532a9127
GIT binary patch
literal 5365
zcmcIoXH=70mky$Ulu#~6F?3NZBnXI+UIhUG6_Fx|2#Qh+p$L&slnxrIL_nH=SWt*a
zkQ$XBa3e)Z=tM#n1tnmp@q5E~?|ARrZ`Q0?Ge2_jzU$=dbM~{J{p_6+Z)gJifcKrg
z=8pa#5V(>3;b=xZatDD#6Hb^I+65!NzhwpaolMk=Wg@z+L%0}k!RdbUSUO&?NNX(rJloxvKv>0M{H8SIU2xj*n
zc3r6*UsYen3f!E*J7=T%?R%%D)>)0M#Jw{||N5c6$Iuem^Rj7D+HA~K8(G#ur{Q=RDSO}DKVV^EtDX8fKyt05`N;-ul&AI)%ub^itc=HgD>hl2}0wSjv
zOX%*ToTl4t(|rU($PF1%ZkT?+%kv!6&Kb$(t20HZhtW~Ujef$iWOEU`XVPqcK}DkS
zR9h7Sf|fnM6lSic4;xW~k4N}uV3NieexI~vE&ImYN+f@aMWs=AW@kcUDKJHB3BLW)
zP|s$37=k%iwg1@6GOkS=5nCaKQ5niiR23*-eXeOU+n!FMnFjR_
zVwTgnL|$^IvN+1w!+JdTX^NTPv6J_f53lRIT!h`;_QH7ogLgF
zhLRq(ds#R0F{qRSjs5n=Sg;?>6PKXloGU;k-0b2oXvxyq9p}bb%o&k<1fwa`%w@q1
zlJ{Elmct38gF!~ri2(!1Ze?ju2w7htPxtd(@RMw2=?N^WaN}ct)+L$4tA%Tpr`Jjs
zQam`(-f}+{8w*D!KU9a9CdKcsoX%vBXS*)Rs5p~dGYRA4Y*U>`tX>gGvs7>6*7Cxt
zSzq^T7zWl6RQuk~OgV6IkVu}b?TbDPZQKw;PmKF4u6m|$1fxe^eJ+0SM~jK)DQ=PCZj8v(a}qsLFw&vxmd1LaA=+xm8MTckE7ZW{ys>cazW-T5Op)&t!Hw
za?AIG3om0+oy>AQ(}u5E_8GqDJ7K1LNId|zf?(C`N{P_fRmRjsRv|94B%`l3dMNuC
z3o9PYn=e(&Ln*|~tAAxY=?Ix^pm}=`RZ=}*kD}n3s`l^}rDL@-f>z81NU8C3E0{Wn
zP3?N4(`!GH@ph@Y)S^2|e$x{Z`tV(Ak5($B?MCmkh6-2-(z`1|-54_9q4N?p%v`c+
zQo3d)vsuVsqfUnXAo|*_h$V2hoh-4HZjp|gE%Of5(?2b=`o2AFz#PAU
z-PQb1p;(SMMS+)sbX5?#=;n7r2$vjAqf;-g5kyYm8stVxeC4ON$Wjo${kXD8R=yy9
zMV9RPx{xd^T
zB%zS%$XMYfq<(lc)DDR0T4q~?c=63iIWXsUC)(g!L#Q)(?9vhW11cI@dm!c#r2|aI
z@&)J;+C#pW?+-M}A;8wT^smx^fn)i8hqDR6r^G&)nL8<4a8iJCe^vpv0%r8oQMek4
zqRNg|->Y2)r=%Rfbk&ci=&ynvwrhHBIr#DbuJWHejevI%1?Z|5Y|uSgPtDy{@Ke2x@8r_MUT4dGCYEoLh{hTK8}@sJxmE+U1
zjqU4|vk8+{Pr0^#)qI|25!tK@qTDgd`
z;l6`au-|xpI(`OH*)ByEG95eq4lMTi1#x5fzHJM)20*QP>QVca=EMhOUnfP5|IT%6
zdpx;9Al{BII|1KIt{3=)GfTweq@K~_zBQRx@#eRuZ)%Ay-u#0&m3A%7$S^WpM|K)D
z;uZQ>WWg&vfz?AdHIjD}2tn%>DKhd%hTm0a5YDxdNH19?Wjj_X6Ubd6X
z0#UPP6>G#4b@0_Ria0ED2mbI+a+NLL5nDuOD&fSKI{$??Rnb`N5I?%K`iCLlGCOPb
zgK4MuqOlw6K|+6_4M4#~%hVztLrKH`2d1Pn3CH#{ho8IdqddX6Z3|wWq|hWm1OJ_i
z{ZN3LTd+jIEsQ@e2d8%*%e`8c2)8T9Yl<8J7VvHf!J|N`?dHJ^%F_Juq$tcLhH^LT
zV|E=vK@eEY1#rJ_?H%tb{8U};4;jQ9CGBfadP1VUcBW%bGsTlW8na7^t$G*AmYcvg
zoLfAcAhWtSC3=3c;KUZZu?vrY1owxYH93@*S8(CmeM>Re0RRauU=0dwzG$RZ^E>9%
zu>(hsN1C*MntH6KEeXK*lPVI4_?BB1$l^Z}3!VU9l8kNe9?;%W%EGvD<^P2QnTeQ5
zIOX9i(L0keQ6a?0U$TrXK=IM=pJ)oxTVneuq~pjNo_1W-O(hn!hp>P^VEOyAph^Z0I*c@vWNA%d^!25K=(7R&Y+r6Y4L|
zHVMz)H21kvchNxwVF%eAg^>RAk6ljf#WJ$
z&f7N;G=Hrye^Zfvqq~1d5X1%IW;~DoRbkk^=M2I#stb|@dA911u^=JILo`PeY7O3`
zIhKqnuo=bXLn33hu1vpgQ^NW2q0z4jqN)4p%aZV(F_yO5#AiFefD{l%#N6(K6XR-e
zg=wa1EX{x9#0n7sSyf$m_VP|wtup!WHhqgvJOvkZX@CJ9IQhyV6TaHwdryf&ax9YI!jA~O~;$9uy
zEIsSo+gWFma+8$6-7x*EhRc~|RxCIxHC=BmWP)vA0_hvfU#lZ$CH@9ucZ+{2DD_z6
zSO%1FWk3N;xh<`2wjJ$l5MJ$OJj$rJv(z`J6wp3I*gG3Qs>4s$x?HYSOxMErIMbI#
zymZ@@WDU*<$I9$JlU0_{nX>$yd?_}tcwM4o0r}L(bV1*pRzpmD@9d1o3){e5>yA$O
zvn8MXX4JTn_xb%2`$V@x2ei&KcGat{Nl6)dNJrWJFzsQS@RY_pIq6rc;=DI~1^`HE+cEyU|JozY@^0?3HGK1ptAvYe26BJ#EZ4E6A+|4y6#~&>KBzTt~s8<_b1YqzudT<)3^C-GDSM#45M`k6T?ZQ+B;8mpc)GIE(A(y
z^|q)betFV(+jRS>ESS&1AP0Pb?FXB1MEK_Z`61JVr-vGx_UPVVW2U7~qCD}T7oGfiR{9Tfx=ZZbV
zpKp$TT-F-3d0~%ahg@XQk^>kYpivm6=_;Wp&$#UNoBMgA{+Pw!nA6UXj^sPzzO%q(
zg(82E6j!JKgXBVs#nkwmX6zeM7~k_kT{S|gExwStGhne`zJSq;o7B21qx5*Z0>)b!L}R?97j;D0wR$VjUNx8Ktq~Rn~v8a$K4JF4K${8X_JOnV-V
z?Zb;znFbXVuD8#laPN@UN2V0F{Z3nWQ1w(3NpRttx$OM50gG1$kBpX~UTI)bx2)}o
zwf^GWsMaukIcI}szsr;NI}Pr@6mcO+y4rDgUbA?;Lcb48_lMhTInl|UAWu2)X#s;f
zwF$;xgMHvogRp4O%lAI}$<3q8Caq~b4uey>uR1{TU@4x3;z
zTvv^4y{OaMI@M|u6m>?=%hcDrEVoX6vw^GoK6~QC)lj!}PGBzH?V77}yzF_Z{+D~=
zE#DY+WZ@2ImwJ>Tr1+cEZ%sGo8^z1ZZn`hNa9_!+O)R7m*fAeFJl}s}*}TIwi!N!9
z{7!Cr<$XhCHMmN)eF=P`P652r)c4~-^f`2?N~xl8)40a-ZtFzFg|B{l$6|AAtjaok
zvAYr)O)W+8FJ0Ffcd&P8wtzs5>l5Cpxv%+N78$ajWQuUJO%N!$xZ>!*dCX%4qpl|J
zI^`n!<3Cs;Xxr`F4N|oukig6{4rU@+p|89YegQqVHm|ca}~bIA01p{65o@!
zeES&yegO{{d-%E-8~Z|08b;7T&f^eBg`tYJQrawrAr&CU0QelxIw3!?{Nh*7l9h+)
Wl-)gEngm=`f=-xPn>;tVaO+=S@+OY}

literal 0
HcmV?d00001


From fea29b0140b3f1ec65dbeb046eaf38ec72c9f77d Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz 
Date: Tue, 1 Oct 2013 10:24:48 +0200
Subject: [PATCH 12/37] [~BUGFIX] Added default customer tax classes and use
 them in setup default params

---
 src/app/code/community/FireGento/MageSetup/Model/Setup.php    | 4 ++--
 src/app/code/community/FireGento/MageSetup/etc/at/tax.xml     | 3 +++
 src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml     | 3 +++
 src/app/code/community/FireGento/MageSetup/etc/de/tax.xml     | 3 +++
 .../code/community/FireGento/MageSetup/etc/default/tax.xml    | 3 +++
 src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml     | 3 +++
 src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml     | 3 +++
 src/app/code/community/FireGento/MageSetup/etc/it/tax.xml     | 3 +++
 src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml     | 3 +++
 9 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup.php b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
index 404d8c2c..aba48379 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
@@ -141,12 +141,12 @@ protected function _getDefaultParams()
     {
         $productTaxClassTargets = array();
         foreach (Mage::getSingleton('magesetup/source_tax_productTaxClass')->getAllOptions() as $option) {
-            $productTaxClassTargets[$option['value']] = 1;
+            $productTaxClassTargets[$option['value']] = Mage::getSingleton('magesetup/source_tax_newProductTaxClass')->getDefaultOption();
         }
 
         $customerTaxClassTargets = array();
         foreach (Mage::getSingleton('magesetup/source_tax_customerTaxClass')->getAllOptions() as $option) {
-            $customerTaxClassTargets[$option['value']] = 1;
+            $customerTaxClassTargets[$option['value']] = Mage::getSingleton('magesetup/source_tax_newCustomerTaxClass')->getDefaultOption();
         }
 
         return array(
diff --git a/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
index 3e7f79a4..fc81305d 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
@@ -89,18 +89,21 @@
                         5
                         Endkunden
                         CUSTOMER
+                        1
                     
                     
                         1
                         6
                         USt.-pflichtige Unternehmen
                         CUSTOMER
+                        0
                     
                     
                         1
                         7
                         USt.-befreite Unternehmen
                         CUSTOMER
+                        0
                     
                 
             
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
index c977fb5c..c21c9c5b 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
@@ -90,18 +90,21 @@
                         5
                         Endkunden
                         CUSTOMER
+                        1
                     
                     
                         1
                         6
                         USt.-pflichtige Unternehmen
                         CUSTOMER
+                        0
                     
                     
                         1
                         7
                         USt.-befreite Unternehmen
                         CUSTOMER
+                        0
                     
                 
             
diff --git a/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
index c7f8b9da..c94299d7 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
@@ -89,18 +89,21 @@
                         5
                         Endkunden
                         CUSTOMER
+                        1
                     
                     
                         1
                         6
                         USt.-pflichtige Unternehmen
                         CUSTOMER
+                        0
                     
                     
                         1
                         7
                         USt.-befreite Unternehmen
                         CUSTOMER
+                        1
                     
                 
             
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
index 0cb8419e..c78c3774 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
@@ -106,6 +106,7 @@
                         3
                         End Customers
                         CUSTOMER
+                        1
                     
                     
                         1
@@ -126,12 +127,14 @@
                         5
                         Taxable Companies
                         CUSTOMER
+                        0
                     
                     
                         1
                         6
                         Non-Taxable Companies
                         CUSTOMER
+                        0
                     
                 
             
diff --git a/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
index a4664895..88feacab 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
@@ -101,18 +101,21 @@
                         5
                         Clients finaux
                         CUSTOMER
+                        1
                     
                     
                         1
                         6
                         Entreprises assujetties à la TVA
                         CUSTOMER
+                        0
                     
                     
                         1
                         7
                         Entreprises non-assujetties à la TVA
                         CUSTOMER
+                        0
                     
                 
             
diff --git a/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
index 2b6781d7..1e6c18b4 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
@@ -89,18 +89,21 @@
                         5
                         End Customers
                         CUSTOMER
+                        1
                     
                     
                         1
                         6
                         Taxable Companies
                         CUSTOMER
+                        0
                     
                     
                         1
                         7
                         Non-Taxable Companies
                         CUSTOMER
+                        0
                     
                 
             
diff --git a/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
index 69bb8dd1..a0e9ea19 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
@@ -96,18 +96,21 @@
                         5
                         Clienti privati
                         CUSTOMER
+                        1
                     
                     
                         1
                         6
                         Imprese
                         CUSTOMER
+                        0
                     
                     
                         1
                         7
                         Imprese esenti IVA
                         CUSTOMER
+                        0
                     
                 
             
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
index ef9add19..a5e3ce17 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
@@ -89,18 +89,21 @@
                         5
                         End Consumers
                         CUSTOMER
+                        1
                     
                     
                         1
                         6
                         Taxable Companies
                         CUSTOMER
+                        0
                     
                     
                         1
                         7
                         Non-Taxable Companies
                         CUSTOMER
+                        0
                     
                 
             

From 410e6b709a5944a548a1f2daa61dda4da7b96be7 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz 
Date: Fri, 4 Oct 2013 13:29:12 +0200
Subject: [PATCH 13/37] [~BUGFIX] Fixed bug with wrong tax settings on setup

---
 .../code/community/FireGento/MageSetup/Model/Setup.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup.php b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
index 11b697ee..e9c06ed2 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
@@ -43,12 +43,18 @@ class FireGento_MageSetup_Model_Setup extends Mage_Core_Model_Abstract
      */
     public function setup($params = array(), $notify=false)
     {
+        if (!isset($params['country'])) {
+            Mage::throwException(
+                $this->_getHelper()->__('MageSetup: Please set up a country in your parameters.')
+            );
+        }
+
+        Mage::register('setup_country', $params['country']);
+
         $defaultParams = $this->_getDefaultParams();
 
         $params = array_merge($defaultParams, $params);
 
-        Mage::register('setup_country', $params['country']);
-
         if ($params['systemconfig']) {
             Mage::getSingleton('magesetup/setup_systemconfig')->setup();
 

From f64a7dcb5514ba4fd38ed2c1fac8e86072b75846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylvain=20Raye=CC=81?= 
Date: Sat, 5 Oct 2013 16:38:34 +0200
Subject: [PATCH 14/37] Fix a bug with table name logic in tax calculation. If
 the table name has a prefix `mage_` for example, the b ug was that the logic
 does a query on a table mage_mage_MYTABLE.

---
 .../FireGento/MageSetup/Model/Setup/Tax.php        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
index 047b8bb0..932f78bf 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
@@ -161,7 +161,7 @@ protected function _getConfigTaxClasses()
      */
     protected function _createTaxClass($taxClassData)
     {
-        $this->_insertIntoTable('tax/tax_class', $taxClassData);
+        $this->_insertIntoTable($this->_getTable('tax/tax_class'), $taxClassData);
         return $this->_lastInsertId($this->_getTable('tax/tax_class'));
     }
 
@@ -214,7 +214,7 @@ protected function _createTaxCalcRate($taxCalcRateData)
                     'store_id' => $storeId,
                     'value' => $label,
                 );
-                $this->_insertIntoTable('tax/tax_calculation_rate_title', $bind);
+                $this->_insertIntoTable($this->_getTable('tax/tax_calculation_rate_title'), $bind);
             }
         }
 
@@ -321,14 +321,13 @@ protected function _truncateTable($table)
     /**
      * Insert a line into a database table
      *
-     * @param  string $table
+     * @param  string $tableName Table Name
      * @param  array $data
      * @return void
      */
-    protected function _insertIntoTable($table, $data)
+    protected function _insertIntoTable($tableName, $data)
     {
         unset($data['execute']);
-        $tableName = $this->_getTable($table);
         $this->_getConnection()->insert($tableName, $data);
     }
 
@@ -362,12 +361,11 @@ protected function _getTable($tableAlias)
     /**
      * Get last insert ID
      *
-     * @param string $table table alias
+     * @param string $tableName Table Name
      * @return int
      */
-    protected function _lastInsertId($table)
+    protected function _lastInsertId($tableName)
     {
-        $tableName = $this->_getTable($table);
         return $this->_getConnection()->lastInsertId($tableName);
     }
 }

From 30f00859a2bdb030166803a8c4282f53edc83264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylvain=20Raye=CC=81?= 
Date: Sat, 5 Oct 2013 16:45:51 +0200
Subject: [PATCH 15/37] Same bug fix as previously but fix it in a
 different/proper way. Reminder: Fix a bug with table name logic in tax
 calculation. If the table name has a prefix `mage_` for example, the b ug was
 that the logic does a query on a table mage_mage_MYTABLE.

---
 .../FireGento/MageSetup/Model/Setup/Tax.php    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
index 932f78bf..2531c673 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
@@ -161,8 +161,8 @@ protected function _getConfigTaxClasses()
      */
     protected function _createTaxClass($taxClassData)
     {
-        $this->_insertIntoTable($this->_getTable('tax/tax_class'), $taxClassData);
-        return $this->_lastInsertId($this->_getTable('tax/tax_class'));
+        $this->_insertIntoTable('tax/tax_class', $taxClassData);
+        return $this->_lastInsertId('tax/tax_class');
     }
 
     /**
@@ -202,7 +202,7 @@ protected function _createTaxCalcRate($taxCalcRateData)
         }
 
         // base tax rate db entry
-        $calculationRateTable = $this->_getTable('tax/tax_calculation_rate');
+        $calculationRateTable = 'tax/tax_calculation_rate';
         $this->_insertIntoTable($calculationRateTable, $taxCalcRateData);
         $rateId = $this->_lastInsertId($calculationRateTable);
 
@@ -214,7 +214,7 @@ protected function _createTaxCalcRate($taxCalcRateData)
                     'store_id' => $storeId,
                     'value' => $label,
                 );
-                $this->_insertIntoTable($this->_getTable('tax/tax_calculation_rate_title'), $bind);
+                $this->_insertIntoTable('tax/tax_calculation_rate_title', $bind);
             }
         }
 
@@ -321,13 +321,14 @@ protected function _truncateTable($table)
     /**
      * Insert a line into a database table
      *
-     * @param  string $tableName Table Name
+     * @param  string $table Table
      * @param  array $data
      * @return void
      */
-    protected function _insertIntoTable($tableName, $data)
+    protected function _insertIntoTable($table, $data)
     {
         unset($data['execute']);
+        $tableName = $this->_getTable($table);
         $this->_getConnection()->insert($tableName, $data);
     }
 
@@ -361,11 +362,12 @@ protected function _getTable($tableAlias)
     /**
      * Get last insert ID
      *
-     * @param string $tableName Table Name
+     * @param string $table Table
      * @return int
      */
-    protected function _lastInsertId($tableName)
+    protected function _lastInsertId($table)
     {
+        $tableName = $this->_getTable($table);
         return $this->_getConnection()->lastInsertId($tableName);
     }
 }

From 8a4aba8414b5e34a05fb816fa6e217ecc8b8fb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylvain=20Raye=CC=81?= 
Date: Tue, 8 Oct 2013 00:42:13 +0200
Subject: [PATCH 16/37] remove default country DE and replace it with the one
 configured from the shop, add fr_CH and de_CH locale support for CMS content.
 Idea for future is to support locale variant (fr_CH, de_CH, fr_BE, ne_BE,
 ...) for Tax and transaction emails labels which are generated during the
 Setup of this module

---
 .../FireGento/MageSetup/Model/Config.php      | 17 ++++++++-
 .../FireGento/MageSetup/etc/config.xml        | 12 ++++--
 .../scripts/GenerateCountryTaxXml.php         | 24 ------------
 .../default/template/magesetup/form.phtml     |  2 +-
 .../magesetup/agreement/business_terms.html   |  3 ++
 .../magesetup/agreement/revocation.html       |  3 ++
 .../magesetup/block/business_terms.html       |  2 +
 .../template/magesetup/block/revocation.html  |  2 +
 .../de_CH/template/magesetup/page/404.html    |  9 +++++
 .../magesetup/page/business_terms.html        |  4 ++
 .../template/magesetup/page/imprint.html      | 37 ++++++++++++++++++
 .../de_CH/template/magesetup/page/order.html  | 38 +++++++++++++++++++
 .../template/magesetup/page/payment.html      | 30 +++++++++++++++
 .../template/magesetup/page/privacy.html      |  4 ++
 .../template/magesetup/page/revocation.html   |  4 ++
 .../template/magesetup/page/shipping.html     |  4 ++
 .../magesetup/agreement/business_terms.html   |  3 ++
 .../magesetup/agreement/revocation.html       |  3 ++
 .../magesetup/block/business_terms.html       |  6 +++
 .../template/magesetup/block/revocation.html  |  2 +
 .../fr_CH/template/magesetup/page/404.html    |  9 +++++
 .../magesetup/page/business_terms.html        |  4 ++
 .../template/magesetup/page/imprint.html      | 37 ++++++++++++++++++
 .../fr_CH/template/magesetup/page/order.html  | 38 +++++++++++++++++++
 .../template/magesetup/page/payment.html      | 24 ++++++++++++
 .../template/magesetup/page/privacy.html      | 24 ++++++++++++
 .../template/magesetup/page/revocation.html   |  4 ++
 .../template/magesetup/page/shipping.html     |  4 ++
 28 files changed, 322 insertions(+), 31 deletions(-)
 delete mode 100644 src/app/code/community/FireGento/MageSetup/scripts/GenerateCountryTaxXml.php
 create mode 100644 src/app/locale/de_CH/template/magesetup/agreement/business_terms.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/agreement/revocation.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/block/business_terms.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/block/revocation.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/404.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/business_terms.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/imprint.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/order.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/payment.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/privacy.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/revocation.html
 create mode 100644 src/app/locale/de_CH/template/magesetup/page/shipping.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/agreement/business_terms.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/agreement/revocation.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/block/business_terms.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/block/revocation.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/404.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/business_terms.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/imprint.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/order.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/payment.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/privacy.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/revocation.html
 create mode 100644 src/app/locale/fr_CH/template/magesetup/page/shipping.html

diff --git a/src/app/code/community/FireGento/MageSetup/Model/Config.php b/src/app/code/community/FireGento/MageSetup/Model/Config.php
index 08076be8..3c1c8d1f 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Config.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Config.php
@@ -39,7 +39,7 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
     /**
      * @var string
      */
-    protected $_country = 'de';
+    protected $_country;
 
     /**
      * Sets cache ID and cache tags and loads configuration
@@ -66,6 +66,19 @@ public function setCountry($country)
         return $this;
     }
 
+    /**
+     * Get the current country for the config
+     *
+     * @return string
+     */
+    public function getCountry()
+    {
+        if(empty($this->_country)) {
+            $this->_country = strtolower(Mage::getStoreConfig('general/country/default'));
+        }
+        return $this->_country;
+    }
+
     /**
      * Merge default config with config from additional xml files
      *
@@ -111,7 +124,7 @@ protected function _loadConfig()
     protected function _addConfigFile($fileName, $mergeConfig)
     {
         $config = Mage::getConfig();
-        $configFile = $config->getModuleDir('etc', 'FireGento_MageSetup') . DS . $this->_country . DS . $fileName;
+        $configFile = $config->getModuleDir('etc', 'FireGento_MageSetup') . DS . $this->getCountry() . DS . $fileName;
 
         // If the given file does not exist, use the default file
         if (!file_exists($configFile)) {
diff --git a/src/app/code/community/FireGento/MageSetup/etc/config.xml b/src/app/code/community/FireGento/MageSetup/etc/config.xml
index 8aae0cb6..a9f057ad 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/config.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/config.xml
@@ -113,6 +113,14 @@
                 
             
         
+        
+            
+                
+                    
+                    
+                
+            
+        
     
     
         
@@ -374,10 +382,6 @@ Tel: {{var telephone}}
             
         
 
-        
-            de
-        
-
         
             
                 AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HU,HR,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB
diff --git a/src/app/code/community/FireGento/MageSetup/scripts/GenerateCountryTaxXml.php b/src/app/code/community/FireGento/MageSetup/scripts/GenerateCountryTaxXml.php
deleted file mode 100644
index 97a58999..00000000
--- a/src/app/code/community/FireGento/MageSetup/scripts/GenerateCountryTaxXml.php
+++ /dev/null
@@ -1,24 +0,0 @@
-getNode('general/country/eu_countries');
-
-// Generate tax_calculation_rates
-
-if ($argc == 0) {
-    die('Usage is ');
-}
-
diff --git a/src/app/design/adminhtml/default/default/template/magesetup/form.phtml b/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
index 14891e99..adb9543e 100644
--- a/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
+++ b/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
@@ -54,7 +54,7 @@
                             
                                 
                             
diff --git a/src/app/locale/de_CH/template/magesetup/agreement/business_terms.html b/src/app/locale/de_CH/template/magesetup/agreement/business_terms.html
new file mode 100644
index 00000000..d4abda77
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/agreement/business_terms.html
@@ -0,0 +1,3 @@
+
+
+{{block type="cms/block" block_id="business_terms"}}
\ No newline at end of file
diff --git a/src/app/locale/de_CH/template/magesetup/agreement/revocation.html b/src/app/locale/de_CH/template/magesetup/agreement/revocation.html
new file mode 100644
index 00000000..c54f166f
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/agreement/revocation.html
@@ -0,0 +1,3 @@
+
+
+{{block type="cms/block" block_id="revocation"}}
\ No newline at end of file
diff --git a/src/app/locale/de_CH/template/magesetup/block/business_terms.html b/src/app/locale/de_CH/template/magesetup/block/business_terms.html
new file mode 100644
index 00000000..8a387a3f
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/block/business_terms.html
@@ -0,0 +1,2 @@
+
+
Fügen Sie hier Ihre Allgemeinen Geschäftsbedingungen ein.

diff --git a/src/app/locale/de_CH/template/magesetup/block/revocation.html b/src/app/locale/de_CH/template/magesetup/block/revocation.html
new file mode 100644
index 00000000..3c03e82a
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/block/revocation.html
@@ -0,0 +1,2 @@
+
+
Fügen Sie hier Ihre vollständige Widerrufsbelehrung ein.

diff --git a/src/app/locale/de_CH/template/magesetup/page/404.html b/src/app/locale/de_CH/template/magesetup/page/404.html
new file mode 100644
index 00000000..504ad705
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/404.html
@@ -0,0 +1,9 @@
+
+
+
+
404 - Seite nicht gefunden

+
Leider konnte die angeforderte Seite nicht gefunden werden, scheinbar wurde eine nicht korrekte URL eingegeben. So ist der 404 Fehler entstanden. Bitte nutzen Sie unsere Suche oder wechseln Sie zu unserer Startseite um in unserem umfangreichen Sortiment zu stöbern.

+
diff --git a/src/app/locale/de_CH/template/magesetup/page/business_terms.html b/src/app/locale/de_CH/template/magesetup/page/business_terms.html
new file mode 100644
index 00000000..76e81463
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/business_terms.html
@@ -0,0 +1,4 @@
+
+
+
+{{block type="cms/block" block_id="business_terms"}}
\ No newline at end of file
diff --git a/src/app/locale/de_CH/template/magesetup/page/imprint.html b/src/app/locale/de_CH/template/magesetup/page/imprint.html
new file mode 100644
index 00000000..6348cfe1
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/imprint.html
@@ -0,0 +1,37 @@
+
+
+
+
DISCLAIMER

+
+
Die hier bereitgestellten Mustertexte sind ausdrücklich als 
+MUSTER zu verstehen und müssen in jedem Fall durch 
+eigene rechtssichere Texte unter CMS -> Statische Blöcke ersetzt 
+werden. Weder FireGento e.V. noch Trusted Shops tragen für die
+Richtigkeit und Vollständigkeit dieser Texte eine Verantwortung.

+
+
Impressum (Muster)

+
+
{{block type="magesetup/imprint_field" value="shop_name"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/address.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/communication.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/legal.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/tax.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/bank.phtml"}}

+
+
{{block type="magesetup/imprint_field" value="business_rules"}}

+
+
Sie erreichen unseren Kundendienst für Fragen Reklamationen und Beanstandungen unter Telefon: {{block type="magesetup/imprint_field" value="telephone"}} sowie per Email unter {{block type="magesetup/imprint_field" value="email"}}. Für Anfragen können Sie auch das Kontaktformular auf unserer Internetseite nutzen.

+
+
Disclaimer (Muster)

+
+
Bei direkten oder indirekten Verweisen auf fremde Webseiten ("Hyperlinks"), die außerhalb des Verantwortungsbereiches des Autors liegen, würde eine Haftungsverpflichtung ausschließlich in dem Fall in Kraft treten, in dem der Autor von den Inhalten Kenntnis hat und es ihm technisch möglich und zumutbar wäre, die Nutzung im Falle rechtswidriger Inhalte zu verhindern. Der Autor erklärt hiermit ausdrücklich, dass zum Zeitpunkt der Linksetzung keine illegalen Inhalte auf den zu verlinkenden Seiten erkennbar waren. Auf die aktuelle und zukünftige Gestaltung, die Inhalte oder die Urheberschaft der verlinkten/verknüpften Seiten hat der Autor keinerlei Einfluss. Deshalb distanziert er sich hiermit ausdrücklich von allen Inhalten aller verlinkten /verknüpften Seiten, die nach der Linksetzung verändert wurden. Diese Feststellung gilt für alle innerhalb des eigenen Internetangebotes gesetzten Links und Verweise sowie für Fremdeinträge in vom Autor eingerichteten Gästebüchern, Diskussionsforen, Linkverzeichnissen, Mailinglisten und in allen anderen Formen von Datenbanken, auf deren Inhalt externe Schreibzugriffe möglich sind. Für illegale, fehlerhafte oder unvollständige Inhalte und insbesondere für Schäden, die aus der Nutzung oder Nichtnutzung solcherart dargebotener Informationen entstehen, haftet allein der Anbieter der Seite, auf welche verwiesen wurde, nicht derjenige, der über Links auf die jeweilige Veröffentlichung lediglich verweist.

+
+
Urheber- und Kennzeichenrecht

+
+
Der Autor ist bestrebt, in allen Publikationen die Urheberrechte der verwendeten Bilder, Grafiken, Tondokumente, Videosequenzen und Texte zu beachten, von ihm selbst erstellte Bilder, Grafiken, Tondokumente, Videosequenzen und Texte zu nutzen oder auf lizenzfreie Grafiken, Tondokumente, Videosequenzen und Texte zurückzugreifen. Alle innerhalb des Internetangebotes genannten und ggf. durch Dritte geschützten Marken- und Warenzeichen unterliegen uneingeschränkt den Bestimmungen des jeweils gültigen Kennzeichenrechts und den Besitzrechten der jeweiligen eingetragenen Eigentümer. Allein aufgrund der bloßen Nennung ist nicht der Schluss zu ziehen, dass Markenzeichen nicht durch Rechte Dritter geschützt sind! Das Copyright für veröffentlichte, vom Autor selbst erstellte Objekte bleibt allein beim Autor der Seiten. Eine Vervielfältigung oder Verwendung solcher Grafiken, Tondokumente, Videosequenzen und Texte in anderen elektronischen oder gedruckten Publikationen ist ohne ausdrückliche Zustimmung des Autors nicht gestattet.

+
diff --git a/src/app/locale/de_CH/template/magesetup/page/order.html b/src/app/locale/de_CH/template/magesetup/page/order.html
new file mode 100644
index 00000000..6e6285c9
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/order.html
@@ -0,0 +1,38 @@
+
+
+
+
DISCLAIMER

+
+
Die hier bereitgestellten Mustertexte sind ausdrücklich als 
+MUSTER zu verstehen und müssen in jedem Fall durch 
+eigene rechtssichere Texte unter CMS -> Statische Blöcke ersetzt 
+werden. Weder FireGento e.V. noch Trusted Shops tragen für die
+Richtigkeit und Vollständigkeit dieser Texte eine Verantwortung.

+
+
Bestellvorgang, einfach und bequem bestellen

+
+
Wie kann ich bei {{block type="magesetup/imprint_field" value="shop_name"}} bestellen?

+
+
1. Warenkorb

+
+
Wählen Sie die Produkte aus, die Sie bestellen möchten, indem Sie den "In den Warenkorb" Button anklicken. Dadurch wird Ihre Auswahl in den Warenkorb gelegt. Sie können diese Auswahl bis zum Absenden Ihrer Bestellung jederzeit ändern, in dem Sie die Anzahl der Produkte ändern, durch Anklicken des Kästchens "Entfernen" die Auswahl löschen oder den Bestellvorgang abbrechen. Durch Anklicken des Buttons "Kasse" gelangen Sie zum nächsten Bestellschritt.

+
+
2. Kasse

+
+
Melden Sie sich bitte mit Ihrer eMail Adresse und Ihrem Passwort an falls Sie bereits ein Kundenkonto besitzen, ansonsten registrieren Sie sich bitte als neuer Kunde. Ihre Daten werden unter Beachtung der datenschutzrechtlichen Bestimmungen erhoben, verarbeitet und genutzt (Datenschutzhinweis). Eine anderweitige Verwendung oder Weitergabe an Dritte erfolgt nicht. Sind Sie bereits angemeldet, können Sie nun die Versandart auswählen. Durch klicken des Buttons "Weiter" gelangen Sie zum nächsten Bestellschritt.

+
+
3. Rechnungsadresse prüfen / Zahlungsweise auswählen

+
+
Überprüfen Sie nun Ihre Rechnungsadresse und geben Sie Ihre gewünschte Zahlungsweise an. Durch Klicken des Buttons "Weiter" gelangen Sie zum nächsten Bestellschritt. 

+
+
4. Versandadresse prüfen / Versandart auswählen

+
+
Überprüfen Sie nun Ihre Versandadresse und geben Sie Ihre gewünschte Versandart an. Durch Klicken des Buttons "Weiter" gelangen Sie zum nächsten Bestellschritt.

+
+
5. Bestellvorgang abschließen / AGB und Widerrufsbelehrung

+
+
Sie erhalten eine Übersicht Ihrer Bestellung: die ausgewählten Produkte, die Versand- und Rechnungsadresse und Ihre Kontaktdaten. Überprüfen Sie, ob alle Angaben stimmen und lesen sich bitte die Allgemeinen Geschäftsbedingungen und die Widerrufsbelehrung aufmerksam durch. Sie können mit der Bestellung nur fortfahren, wenn Sie den AGB und der Widerrufsbelehrung zustimmen (Häkchen setzen). Mit dem Anklicken des Buttons "Jetzt kaufen" übersenden Sie Ihre Bestellung an uns. Hiermit geben Sie ein rechtsverbindliches Angebot ab.

+
+
Widerrufsrecht für Verbraucher

+
+
Alle Informationen zum Widerrufsrecht

\ No newline at end of file
diff --git a/src/app/locale/de_CH/template/magesetup/page/payment.html b/src/app/locale/de_CH/template/magesetup/page/payment.html
new file mode 100644
index 00000000..6804f205
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/payment.html
@@ -0,0 +1,30 @@
+
+
+
+
DISCLAIMER

+
+
Die hier bereitgestellten Mustertexte sind ausdrücklich als 
+MUSTER zu verstehen und müssen in jedem Fall durch 
+eigene rechtssichere Texte unter CMS -> Statische Blöcke ersetzt 
+werden. Weder der FireGento e.V. noch Trusted Shops tragen für die
+Richtigkeit und Vollständigkeit dieser Texte eine Verantwortung.

+
+
Zahlungsarten

+
+
Wir bieten Ihnen folgende Zahlungsarten an. Suchen Sie sich einfach die für Sie optimale Zahlart aus. Die Versandkosten sind teilweise abhängig von der gewählten Zahlungsart.

+
+
Vorkasse

+
+
Bitte überweisen Sie den Gesamtbetrag Ihrer Bestellung auf unser Konto.

+
+
Rechnung

+
+
Nur für Schulen, Behörden und im Handelsregister eingetragene Unternehmen nach Prüfung.

+
+
Nachnahme

+
+
Bitte halten Sie den Rechnungsbetrag bereit; der Zusteller kassiert bei Lieferung in bar (keine Schecks). Bei Nachnahme fallen zusätzlich 2,-- EUR Nachnahmegebühren an, die direkt an den Paketzusteller zu entrichten sind.

+
+
Lastschrift

+
+
Wir ziehen den Rechnungsbetrag Ihrer Bestellung von Ihrem hinterlegten Bankkonto nach der getätigten Bestellung ein.

\ No newline at end of file
diff --git a/src/app/locale/de_CH/template/magesetup/page/privacy.html b/src/app/locale/de_CH/template/magesetup/page/privacy.html
new file mode 100644
index 00000000..82e58e4c
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/privacy.html
@@ -0,0 +1,4 @@
+
+
+
+
Fügen Sie hier Ihre Datenschutzerklärung ein.

diff --git a/src/app/locale/de_CH/template/magesetup/page/revocation.html b/src/app/locale/de_CH/template/magesetup/page/revocation.html
new file mode 100644
index 00000000..9fd4d81a
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/revocation.html
@@ -0,0 +1,4 @@
+
+
+
+{{block type="cms/block" block_id="revocation"}}
\ No newline at end of file
diff --git a/src/app/locale/de_CH/template/magesetup/page/shipping.html b/src/app/locale/de_CH/template/magesetup/page/shipping.html
new file mode 100644
index 00000000..782212b3
--- /dev/null
+++ b/src/app/locale/de_CH/template/magesetup/page/shipping.html
@@ -0,0 +1,4 @@
+
+
+
+
Fügen Sie hier Ihre Versandkostenaufstellung und weitere Einzelheiten zur Lieferung ein.

diff --git a/src/app/locale/fr_CH/template/magesetup/agreement/business_terms.html b/src/app/locale/fr_CH/template/magesetup/agreement/business_terms.html
new file mode 100644
index 00000000..4e37af1c
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/agreement/business_terms.html
@@ -0,0 +1,3 @@
+
+
+{{block type="cms/block" block_id="business_terms"}}
\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/agreement/revocation.html b/src/app/locale/fr_CH/template/magesetup/agreement/revocation.html
new file mode 100644
index 00000000..ccc46014
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/agreement/revocation.html
@@ -0,0 +1,3 @@
+
+
+{{block type="cms/block" block_id="revocation"}}
\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/block/business_terms.html b/src/app/locale/fr_CH/template/magesetup/block/business_terms.html
new file mode 100644
index 00000000..3ca90c77
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/block/business_terms.html
@@ -0,0 +1,6 @@
+
+
Remplissez ici vos conditions générales de vente.

+
+
+
Conditions de retractions

+
Veuillez remplir ici vos conditions de rétractations

\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/block/revocation.html b/src/app/locale/fr_CH/template/magesetup/block/revocation.html
new file mode 100644
index 00000000..fe6e1c09
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/block/revocation.html
@@ -0,0 +1,2 @@
+
+
Remplissez ici vos conditions de retour.

diff --git a/src/app/locale/fr_CH/template/magesetup/page/404.html b/src/app/locale/fr_CH/template/magesetup/page/404.html
new file mode 100644
index 00000000..e07555eb
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/404.html
@@ -0,0 +1,9 @@
+
+
+
+
404 - Page non trouvée

+
Malheureusement, la page auquelle vous souhaitez accéder n'a pu être trouvée, cela pourrait être dû à une adresse URL non correctement remplie.  C'est ainsi qu'est apparu cette erreur 404. Veuillez utiliser s'il vous plaît notre moteur de recherche ou bien visitez notre page d'accueil pour découvrir nos assortiments.

+
diff --git a/src/app/locale/fr_CH/template/magesetup/page/business_terms.html b/src/app/locale/fr_CH/template/magesetup/page/business_terms.html
new file mode 100644
index 00000000..e65d1043
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/business_terms.html
@@ -0,0 +1,4 @@
+
+
+
+{{block type="cms/block" block_id="business_terms"}}
\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/page/imprint.html b/src/app/locale/fr_CH/template/magesetup/page/imprint.html
new file mode 100644
index 00000000..5833ef52
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/imprint.html
@@ -0,0 +1,37 @@
+
+
+
+
DISCLAIMER

+

+    Le texte placé ci-dessous est seulement un MODELE vous permettant de vous aider à créer
+    cette page. Vous devez dans tous les cas modifier ce texte sous CMS > Block statique.
+    En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
+

+
+
Mentions légales (Patron)

+
+
{{block type="magesetup/imprint_field" value="shop_name"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/address.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/communication.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/legal.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/tax.phtml"}}

+
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/bank.phtml"}}

+
+
{{block type="magesetup/imprint_field" value="business_rules"}}

+
+

+    Vous pouvez contacter nottre service clientèle pour toutes questions ou réclamations auprès du numéro de téléphone suivant: {{block type="magesetup/imprint_field" value="telephone"}} ou bien par email {{block type="magesetup/imprint_field" value="email"}} ou encore notre formulaire de contact situé sur notre site internet.
+

+
+
Droits d'auteur et des marques

+

+    Nous, la société, sommes soucieux de prendre en compte dans toutes les publications les droits d'auteur des graphiques utilisés, des documents sonores, des séquences vidéo et textes, d'utiliser ses propres graphiques, documents sonores, séquences vidéo et textes ou d'utiliser des graphiques sans licence, des documents sonores, des séquences vidéo et des textes.

+ Tous les éléments de notre site protégées par des tiers relèvent des dispositions de la loi applicable sur les marques et les droits de propriété des propriétaires enregistrés respectifs.

+ La simple mention ne signifie pas que les marques ne sont pas protégées par des droits des tiers! Le droit d'auteur pour tout matériel créé par l'auteur reste avec la propriété de l'auteur.

+ Toute reproduction ou utilisation de tels graphiques, documents sonores, séquences vidéo et textes dans d'autres publications électroniques ou imprimées est interdite sans l'autorisation expresse de l'auteur
+

\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/page/order.html b/src/app/locale/fr_CH/template/magesetup/page/order.html
new file mode 100644
index 00000000..efa682a1
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/order.html
@@ -0,0 +1,38 @@
+
+
+
+
DISCLAIMER

+

+    Le texte placé ci-dessous est seulement un MODELE vous permettant de vous aider à créer
+    cette page. Vous devez dans tous les cas modifier ce texte sous CMS > Block statique.
+    En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
+

+
+
Commandez confortablement et simplement

+
+
Comment puis-je commander chez {{block type="magesetup/imprint_field" value="shop_name"}}?

+
+
1. Panier d'achat

+
+
Choisissez un article que vous souhaitez acheter, puis cliquez sur le bouton "Ajouter au panier d'achat". Ainsi sera déposé votre article dans le panier d'achat. Vous pouvez modifier votre panier d'achat à tout moment et avant de confirmer votre commande. Si vous souhaitez modifier le nombre d'article dans le panier, cliquez dans le champ "Quantité" du produit concerné puis validez votre modification grâce au bouton "Actualiser". Vous pouvez également supprimer l'article de votre choix en cliquant sur le bouton "Supprimer" du produit voulu.

+ Une fois que les choix faits dans votre panier d'achat vous convient, vous pouvez continuer le processus de commande et nous fournir les informations de livraison et de paiement en cliquant sur "Commander".

+
+
2. Commander

+
Enregistrez-vous s'il vous plait avec votre adresse email et votre mot de passe dans le cas où vous possédez déjà un compte dans notre boutique. A défaut, veuillez s'il vous plaît vous enregistrer en tant que nouveau client. Vos données sont collectées conformément à la réglementation de protection des données, traités et utilisés selon (Politique de confidentialité). Êtes-vous déjà inscrit, vous pouvez sélectionner la méthode d'expédition. En cliquant sur le bouton "Suivant" pour passer à l'ordre de la prochaine étape.
+

+
+
3. Vérification de l'adresse de facturation / Choix du mode de paiement

+
+
Veuillez vérifier votre adresse de facturation et choisissez votre mode de paiement. Puis cliquez sur "Suivant" pour poursuivre la prochaine étape.

+
+
4. Vérification de l'adresse de livraison / Choix du mode de livraison

+
+
Veuillez vérifier votre adresse de facturation et choisissez votre mode de livraison. Puis cliquez sur "Suivant" pour poursuivre la prochaine étape.

+
+
5. Remplissage du processus de commande / CGV et politique de retour de marchandise

+
+
Vous trouverez un sommaire de votre commande: les produits choisis, le mode et l'adresse de livraison ainsi que vos coordonnées personnelles. Vérifiez si toutes les informations fournies sont correctes puis lisez les conditions générales de vente et les conditions de retour. Vous pouvez confirmer votre commande seulement si vous avez acceptez les CGV et les conditions de retour (cochez la case correspondante). En cliquant sur le bouton "Commander", vous confirmerez l'envoi de votre commande vers nos services.

+
+
Droit de rétractation

+
+
Toutes les informations sur les droits de rétractation
.
\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/page/payment.html b/src/app/locale/fr_CH/template/magesetup/page/payment.html
new file mode 100644
index 00000000..70eb94e5
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/payment.html
@@ -0,0 +1,24 @@
+
+
+
+
DISCLAIMER

+

+    Le texte placé ci-dessous est seulement un MODELE vous permettant de vous aider à créer
+    cette page. Vous devez dans tous les cas modifier ce texte sous CMS > Block statique.
+    En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
+

+
+
Modes de paiement

+
Nous vous offrons les moyens de paiement suivant. Choisissez celui qui vosu convient le mieux. Les frais d'envoi peuvent être dépendant du mode de paiement choisi.

+
+
Virement

+
Veuillez s'il vous plaît effectuer le versement du montant total de votre commande auprès de notre compte bancaire.

+
+
Facture

+
Seulement pour les écoles, les administrations et registre du commerce après vérification.

+
+
Contre-remboursement

+
Veuillez garder votre facture avec vous; Le livreur n'acceptera à la livraison que de l'argent liquide (pas de chèque). Lors d'un contre-remboursement, des frais de l'ordre de 2 Euros s'ajoutent. Veuillez les régler directement au livreur.

+
+
Direct Débit direct

+
Aussitôt que le paiement est confirmé, nous définissons votre commande comme "Payé"

\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/page/privacy.html b/src/app/locale/fr_CH/template/magesetup/page/privacy.html
new file mode 100644
index 00000000..016a89bf
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/privacy.html
@@ -0,0 +1,24 @@
+
+
+
+
Remplissez ici votre politique de confidentialé.

+

+    Le texte placé ci-dessous est seulement un MODELE vous permettant de vous aider à créer
+    cette page. Vous devez dans tous les cas modifier ce texte sous CMS > Block statique.
+    En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
+

+
+

+(Veuillez indiquer l’identité du responsable du traitement)
+« Les informations recueillies font l’objet d’un traitement informatique destiné à …
+

+

+(Veuillez préciser la finalité)
+Les destinataires des données sont :………………………
+(précisez)
+

+

+Conformément à la loi « informatique et libertés » du 6 janvier 1978 modifiée en 2004, vous bénéficiez d’un droit d’accès et de rectification aux informations qui vous concernent, que vous pouvez exercer en vous adressant à ……………………………………
+(Veuillez préciser le service et l’adresse)
+

+
Vous pouvez également, pour des motifs légitimes, vous opposer au traitement des données vous concernant.

\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/page/revocation.html b/src/app/locale/fr_CH/template/magesetup/page/revocation.html
new file mode 100644
index 00000000..d3bf1bc6
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/revocation.html
@@ -0,0 +1,4 @@
+
+
+
+{{block type="cms/block" block_id="revocation"}}
\ No newline at end of file
diff --git a/src/app/locale/fr_CH/template/magesetup/page/shipping.html b/src/app/locale/fr_CH/template/magesetup/page/shipping.html
new file mode 100644
index 00000000..c547af6b
--- /dev/null
+++ b/src/app/locale/fr_CH/template/magesetup/page/shipping.html
@@ -0,0 +1,4 @@
+
+
+
+
Remplissez ici vos conditions de livraison (prix, mode de livraison, etc) et d'éventuelles informations complémentaires concernant les livraisons.


From 0e3128032146f8b88ea30afb0dc3603348f6613d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylvain=20Raye=CC=81?= 
Date: Tue, 8 Oct 2013 00:50:15 +0200
Subject: [PATCH 17/37] Update modman to reflect locale changes

---
 modman | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modman b/modman
index d81c89d1..34efd8f7 100644
--- a/modman
+++ b/modman
@@ -11,6 +11,8 @@ src/app/locale/fr_FR/FireGento_MageSetup.csv                      app/locale/fr_
 src/app/locale/fr_FR/template/magesetup/                          app/locale/fr_FR/template/magesetup/
 src/app/locale/it_IT/FireGento_MageSetup.csv                      app/locale/it_IT/FireGento_MageSetup.csv
 src/app/locale/it_IT/template/magesetup/                          app/locale/it_IT/template/magesetup/
+src/app/locale/de_CH/template/magesetup/                          app/locale/de_CH/template/magesetup/
+src/app/locale/fr_CH/template/magesetup/                          app/locale/fr_CH/template/magesetup/
 src/app/design/adminhtml/default/default/layout/magesetup.xml     app/design/adminhtml/default/default/layout/magesetup.xml
 src/app/design/adminhtml/default/default/template/magesetup/      app/design/adminhtml/default/default/template/magesetup/
 src/app/design/frontend/base/default/layout/magesetup.xml         app/design/frontend/base/default/layout/magesetup.xml

From b033e2d4c716b958b8a417f60dfb0fb7fd807ba5 Mon Sep 17 00:00:00 2001
From: Rouven Alexander Rieker 
Date: Sat, 12 Oct 2013 09:31:57 +0200
Subject: [PATCH 18/37] [TASK] Coding Standard

---
 .../MageSetup/Block/Adminhtml/Magesetup.php   | 28 +++++++++++--------
 .../MageSetup/Helper/Checkout/Data.php        |  2 +-
 .../FireGento/MageSetup/Helper/Data.php       |  3 +-
 .../FireGento/MageSetup/Model/Config.php      |  2 +-
 .../FireGento/MageSetup/Model/Setup.php       |  6 ++--
 .../FireGento/MageSetup/Model/Setup/Email.php |  5 ++--
 .../controllers/MagesetupController.php       |  6 ++--
 7 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
index 933b9e2c..4edfa357 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
@@ -173,20 +173,22 @@ public function getAvailableCountriesForSetup()
      */
     public function getNewProductTaxClassesJson()
     {
-        $countryTaxClasses = array();
-        foreach(Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
+        $moduleDir = Mage::getConfig()->getModuleDir('etc', 'FireGento_MageSetup');
 
-            $configFile = Mage::getConfig()->getModuleDir('etc', 'FireGento_MageSetup') . DS . $countryId . DS . 'tax.xml';
+        $countryTaxClasses = array();
+        foreach (Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
+            // Get the config file for the given country
+            $configFile = $moduleDir . DS . $countryId . DS . 'tax.xml';
 
             // If the given file does not exist, use the default file
             if (!file_exists($configFile)) {
-                $configFile = Mage::getConfig()->getModuleDir('etc', 'FireGento_MageSetup') . DS . 'default' . DS . 'tax.xml';
+                $configFile = $moduleDir . DS . 'default' . DS . 'tax.xml';
             }
 
             $xml = new SimpleXMLElement(file_get_contents($configFile));
-            
+
             $taxClasses = $xml->default->magesetup->tax_classes->default;
-            foreach($taxClasses->children() as $identifier => $taxClass) {
+            foreach ($taxClasses->children() as $identifier => $taxClass) {
                 if ($taxClass->class_type != 'PRODUCT'
                     || $taxClass->execute != 1
                     || strpos($identifier, 'shipping') === 0) {
@@ -197,7 +199,7 @@ public function getNewProductTaxClassesJson()
 
             $countryTaxClasses[$countryId][] = $this->__('No tax');
         }
-        
+
         return Zend_Json::encode($countryTaxClasses);
     }
 
@@ -206,20 +208,22 @@ public function getNewProductTaxClassesJson()
      */
     public function getNewCustomerTaxClassesJson()
     {
-        $countryTaxClasses = array();
-        foreach(Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
+        $moduleDir = Mage::getConfig()->getModuleDir('etc', 'FireGento_MageSetup');
 
-            $configFile = Mage::getConfig()->getModuleDir('etc', 'FireGento_MageSetup') . DS . $countryId . DS . 'tax.xml';
+        $countryTaxClasses = array();
+        foreach (Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
+            // Get the config file for the given country
+            $configFile = $moduleDir . DS . $countryId . DS . 'tax.xml';
 
             // If the given file does not exist, use the default file
             if (!file_exists($configFile)) {
-                $configFile = Mage::getConfig()->getModuleDir('etc', 'FireGento_MageSetup') . DS . 'default' . DS . 'tax.xml';
+                $configFile = $moduleDir. DS . 'default' . DS . 'tax.xml';
             }
 
             $xml = new SimpleXMLElement(file_get_contents($configFile));
 
             $taxClasses = $xml->default->magesetup->tax_classes->default;
-            foreach($taxClasses->children() as $identifier => $taxClass) {
+            foreach ($taxClasses->children() as $identifier => $taxClass) {
                 if ($taxClass->class_type != 'CUSTOMER'
                     || $taxClass->execute != 1) {
                     continue;
diff --git a/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php b/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
index e8277f7f..f03f9b7d 100644
--- a/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
+++ b/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
@@ -37,7 +37,7 @@ class FireGento_MageSetup_Helper_Checkout_Data
     /**
      * Avoid loss of translation
      */
-    function __construct()
+    public function __construct()
     {
         $this->_moduleName = 'Mage_Checkout';
     }
diff --git a/src/app/code/community/FireGento/MageSetup/Helper/Data.php b/src/app/code/community/FireGento/MageSetup/Helper/Data.php
index daf7338a..5723e61e 100644
--- a/src/app/code/community/FireGento/MageSetup/Helper/Data.php
+++ b/src/app/code/community/FireGento/MageSetup/Helper/Data.php
@@ -77,7 +77,8 @@ public function getAvailableCountries()
         $config = Mage::getConfig()->getNode('global/magesetup/available_countries');
         if ($config) {
             foreach (array_keys($config->asArray()) as $countryId) {
-                $availableCountries[$countryId] = Mage::app()->getLocale()->getCountryTranslation(strtoupper($countryId));
+                $countryName = Mage::app()->getLocale()->getCountryTranslation(strtoupper($countryId));
+                $availableCountries[$countryId] = $countryName;
             }
         }
         asort($availableCountries);
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Config.php b/src/app/code/community/FireGento/MageSetup/Model/Config.php
index 3c1c8d1f..13cca972 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Config.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Config.php
@@ -73,7 +73,7 @@ public function setCountry($country)
      */
     public function getCountry()
     {
-        if(empty($this->_country)) {
+        if (empty($this->_country)) {
             $this->_country = strtolower(Mage::getStoreConfig('general/country/default'));
         }
         return $this->_country;
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup.php b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
index e9c06ed2..fc02c380 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
@@ -145,12 +145,14 @@ protected function _getDefaultParams()
     {
         $productTaxClassTargets = array();
         foreach (Mage::getSingleton('magesetup/source_tax_productTaxClass')->getAllOptions() as $option) {
-            $productTaxClassTargets[$option['value']] = Mage::getSingleton('magesetup/source_tax_newProductTaxClass')->getDefaultOption();
+            $value = Mage::getSingleton('magesetup/source_tax_newProductTaxClass')->getDefaultOption();
+            $productTaxClassTargets[$option['value']] = $value;
         }
 
         $customerTaxClassTargets = array();
         foreach (Mage::getSingleton('magesetup/source_tax_customerTaxClass')->getAllOptions() as $option) {
-            $customerTaxClassTargets[$option['value']] = Mage::getSingleton('magesetup/source_tax_newCustomerTaxClass')->getDefaultOption();
+            $value = Mage::getSingleton('magesetup/source_tax_newCustomerTaxClass')->getDefaultOption();
+            $customerTaxClassTargets[$option['value']] = $value;
         }
 
         return array(
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php
index e0e73385..32a77953 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php
@@ -156,8 +156,9 @@ protected function _createEmail($emailData, $locale, $override = true, $storeId
     protected function _getLocaleEmailPath($locale)
     {
         if (!isset($this->_localeTemplatePath[$locale])) {
-            $_localeTemplatePath = Mage::getBaseDir() . DS . 'app' . DS . 'locale' . DS . $locale . DS . 'template' . DS . 'email' . DS;
-            $this->_localeTemplatePath[$locale] = $_localeTemplatePath;
+            $_localeTemplatePath =  'app' . DS . 'locale' . DS . $locale . DS . 'template' . DS . 'email' . DS;
+            $this->_localeTemplatePath[$locale] = Mage::getBaseDir() . DS . $_localeTemplatePath;
+
             if (!is_dir($this->_localeTemplatePath[$locale])) {
                 Mage::throwException(
                     Mage::helper('magesetup')->__(
diff --git a/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php b/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php
index c8301fac..40563a98 100644
--- a/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php
+++ b/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php
@@ -41,9 +41,9 @@ public function indexAction()
         $helper = Mage::helper('magesetup');
 
         if (!Mage::getStoreConfig('magesetup/is_initialized')) {
-            Mage::getSingleton('adminhtml/session')->addNotice(
-                $this->__('If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.')
-            );
+            $notice = 'If you want to add additional StoreViews (i.e. for multiple languages), ';
+            $notice .= 'please do so before submitting this form.';
+            Mage::getSingleton('adminhtml/session')->addNotice($this->__($notice));
         }
 
         $this->_title($helper->__('System'))

From 9482193133088fa98fbe3b4a20b5db752c646176 Mon Sep 17 00:00:00 2001
From: Rouven Alexander Rieker 
Date: Sat, 12 Oct 2013 09:40:30 +0200
Subject: [PATCH 19/37] [TASK] Removed if statement

---
 .../FireGento/MageSetup/Model/Setup/Tax.php        | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
index 2531c673..c9079899 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
@@ -59,15 +59,11 @@ public function __construct()
      */
     public function setup()
     {
-        $canTruncate = true;
-
-        if ($canTruncate) {
-            $this->_truncateTable('tax/tax_class');
-            $this->_truncateTable('tax/tax_calculation_rule');
-            $this->_truncateTable('tax/tax_calculation_rate');
-            $this->_truncateTable('tax/tax_calculation_rate_title');
-            $this->_truncateTable('tax/tax_calculation');
-        }
+        $this->_truncateTable('tax/tax_class');
+        $this->_truncateTable('tax/tax_calculation_rule');
+        $this->_truncateTable('tax/tax_calculation_rate');
+        $this->_truncateTable('tax/tax_calculation_rate_title');
+        $this->_truncateTable('tax/tax_calculation');
 
         // Tax classes
         $taxClasses = array();

From afc92f0dd06e0b85f15b65415081c20b77ec33be Mon Sep 17 00:00:00 2001
From: Rouven Alexander Rieker 
Date: Sat, 12 Oct 2013 12:41:06 +0200
Subject: [PATCH 20/37] [TASK] Fixed copyright in all files

---
 .../MageSetup/Block/Adminhtml/Magesetup.php      |  4 ++--
 .../Adminhtml/Newsletter/Subscriber/Status.php   |  4 ++--
 .../Newsletter/Subscriber/Status/Grid.php        |  4 ++--
 .../MageSetup/Block/Adminhtml/Notifications.php  |  4 ++--
 .../Block/Bundle/Catalog/Product/Price.php       |  4 ++--
 .../Bundle/Catalog/Product/Price/Abstract.php    |  4 ++--
 .../MageSetup/Block/Catalog/Product/Price.php    |  4 ++--
 .../Block/Catalog/Product/Price/Abstract.php     |  4 ++--
 .../MageSetup/Block/Checkout/Agreements.php      |  4 ++--
 .../MageSetup/Block/Checkout/Information.php     |  4 ++--
 .../Block/Customer/Account/Agreements.php        |  4 ++--
 .../community/FireGento/MageSetup/Block/Ga.php   |  4 ++--
 .../MageSetup/Block/Imprint/Content.php          |  4 ++--
 .../FireGento/MageSetup/Block/Imprint/Field.php  |  4 ++--
 .../Helper/Catalog/Product/Configuration.php     |  4 ++--
 .../FireGento/MageSetup/Helper/Checkout/Data.php |  4 ++--
 .../FireGento/MageSetup/Helper/Data.php          |  4 ++--
 .../FireGento/MageSetup/Model/Config.php         |  4 ++--
 .../MageSetup/Model/Newsletter/Observer.php      |  4 ++--
 .../Model/Newsletter/Subscriber/Status.php       |  4 ++--
 .../FireGento/MageSetup/Model/Observer.php       |  4 ++--
 .../Resource/Newsletter/Subscriber/Status.php    |  4 ++--
 .../Newsletter/Subscriber/Status/Collection.php  |  4 ++--
 .../FireGento/MageSetup/Model/Setup.php          |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Abstract.php |  4 ++--
 .../MageSetup/Model/Setup/Agreements.php         |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Cms.php      |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Email.php    |  4 ++--
 .../MageSetup/Model/Setup/Systemconfig.php       |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Tax.php      |  4 ++--
 .../MageSetup/Model/Source/AgreementType.php     |  4 ++--
 .../MageSetup/Model/Source/Cms/Block.php         |  4 ++--
 .../MageSetup/Model/Source/Cms/Page.php          |  4 ++--
 .../Model/Source/Tax/CustomerTaxClass.php        |  4 ++--
 .../MageSetup/Model/Source/Tax/DynamicType.php   |  4 ++--
 .../Model/Source/Tax/NewCustomerTaxClass.php     |  4 ++--
 .../Model/Source/Tax/NewProductTaxClass.php      |  4 ++--
 .../Model/Source/Tax/ProductTaxClass.php         |  4 ++--
 .../FireGento/MageSetup/Model/Tax/Config.php     |  4 ++--
 .../FireGento/MageSetup/Test/Config/Main.php     |  4 ++--
 .../Test/Model/Source/AgreementType.php          |  4 ++--
 .../Test/Model/Source/Tax/DynamicType.php        |  4 ++--
 .../Adminhtml/NewsletterController.php           |  4 ++--
 .../MageSetup/controllers/FrontendController.php |  4 ++--
 .../controllers/MagesetupController.php          |  4 ++--
 .../magesetup_setup/data-upgrade-2.0.0-2.0.1.php |  4 ++--
 .../magesetup_setup/data-upgrade-2.0.1-2.0.2.php |  6 +++---
 .../FireGento/MageSetup/etc/at/email.xml         |  2 +-
 .../community/FireGento/MageSetup/etc/at/tax.xml |  2 +-
 .../FireGento/MageSetup/etc/ch/email.xml         |  2 +-
 .../community/FireGento/MageSetup/etc/ch/tax.xml |  2 +-
 .../community/FireGento/MageSetup/etc/config.xml |  2 +-
 .../FireGento/MageSetup/etc/de/email.xml         |  2 +-
 .../community/FireGento/MageSetup/etc/de/tax.xml |  2 +-
 .../MageSetup/etc/default/agreement.xml          |  2 +-
 .../FireGento/MageSetup/etc/default/cms.xml      |  2 +-
 .../FireGento/MageSetup/etc/default/email.xml    |  2 +-
 .../MageSetup/etc/default/systemconfig.xml       |  2 +-
 .../FireGento/MageSetup/etc/default/tax.xml      |  2 +-
 .../FireGento/MageSetup/etc/fr/email.xml         |  2 +-
 .../community/FireGento/MageSetup/etc/fr/tax.xml | 16 ++++++++--------
 .../community/FireGento/MageSetup/etc/gb/tax.xml |  2 +-
 .../FireGento/MageSetup/etc/it/email.xml         |  2 +-
 .../community/FireGento/MageSetup/etc/it/tax.xml |  2 +-
 .../community/FireGento/MageSetup/etc/nl/tax.xml |  2 +-
 .../community/FireGento/MageSetup/etc/ru/cms.xml |  2 +-
 .../FireGento/MageSetup/etc/ru/email.xml         |  2 +-
 .../FireGento/MageSetup/etc/ru/systemconfig.xml  |  2 +-
 .../community/FireGento/MageSetup/etc/ru/tax.xml |  2 +-
 .../community/FireGento/MageSetup/etc/system.xml |  2 +-
 .../sql/magesetup_setup/mysql4-install-0.5.0.php |  4 ++--
 .../mysql4-upgrade-1.0.4-1.0.5.php               |  4 ++--
 .../mysql4-upgrade-1.1.2-1.1.3.php               |  4 ++--
 .../mysql4-upgrade-1.1.3-1.1.4.php               |  4 ++--
 .../mysql4-upgrade-1.1.4-1.2.0.php               |  4 ++--
 .../mysql4-upgrade-1.2.0-1.2.1.php               |  4 ++--
 .../mysql4-upgrade-1.2.1-1.2.2.php               |  4 ++--
 .../mysql4-upgrade-1.2.2-1.2.3.php               |  4 ++--
 .../default/default/layout/magesetup.xml         |  2 +-
 .../default/template/magesetup/form.phtml        | 10 +++++-----
 .../template/magesetup/checkout/additional.phtml |  2 +-
 .../checkout/multishipping/agreements.phtml      |  4 ++--
 .../checkout/multishipping/overview.phtml        |  2 +-
 .../magesetup/checkout/onepage/agreements.phtml  |  4 ++--
 .../customer/form/tc-confirmation.phtml          |  4 ++--
 .../template/magesetup/delivery_time.phtml       |  4 ++--
 .../template/magesetup/imprint/address.phtml     |  2 +-
 .../template/magesetup/imprint/bank.phtml        |  2 +-
 .../magesetup/imprint/communication.phtml        |  2 +-
 .../magesetup/imprint/email_footer.phtml         |  2 +-
 .../template/magesetup/imprint/legal.phtml       |  2 +-
 .../default/template/magesetup/imprint/tax.phtml |  2 +-
 .../default/template/magesetup/price_info.phtml  |  4 ++--
 .../default/template/magesetup/shipping.phtml    |  4 ++--
 src/app/etc/modules/FireGento_MageSetup.xml      |  2 +-
 95 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
index 4edfa357..3ba93699 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.4.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.4.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php
index 85b66d93..e09f2682 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php
index e6d299d7..bb10bd1d 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php
index cc6a66ed..f2f2eaa3 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.4.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.4.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php b/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php
index 913e3c28..62c6ce04 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -27,7 +27,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price/Abstract.php b/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price/Abstract.php
index c8cebb1d..c8dd20c0 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price/Abstract.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price/Abstract.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -27,7 +27,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php b/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php
index 0878b29d..52cf736e 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -27,7 +27,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price/Abstract.php b/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price/Abstract.php
index a3c03b1f..24bdf446 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price/Abstract.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price/Abstract.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -27,7 +27,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php b/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php
index 60f78f2d..1683b3d0 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.2
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Checkout/Information.php b/src/app/code/community/FireGento/MageSetup/Block/Checkout/Information.php
index deae0323..90bcbf0e 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Checkout/Information.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Checkout/Information.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Customer/Account/Agreements.php b/src/app/code/community/FireGento/MageSetup/Block/Customer/Account/Agreements.php
index c9f7cf15..1478a9d5 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Customer/Account/Agreements.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Customer/Account/Agreements.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.2
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Ga.php b/src/app/code/community/FireGento/MageSetup/Block/Ga.php
index a8d93dcc..8c7e8a6f 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Ga.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Ga.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php
index 0379e6ac..90bdb8db 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
index 39d75ca9..10f905f0 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php b/src/app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php
index d89008d7..44e29f50 100644
--- a/src/app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php
+++ b/src/app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.5
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.5
diff --git a/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php b/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
index f03f9b7d..03ff0799 100644
--- a/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
+++ b/src/app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Helper/Data.php b/src/app/code/community/FireGento/MageSetup/Helper/Data.php
index 5723e61e..69e8b419 100644
--- a/src/app/code/community/FireGento/MageSetup/Helper/Data.php
+++ b/src/app/code/community/FireGento/MageSetup/Helper/Data.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Config.php b/src/app/code/community/FireGento/MageSetup/Model/Config.php
index 13cca972..8a26a94c 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Config.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Config.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Observer.php b/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Observer.php
index d3182d9f..a9985e7a 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Observer.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Observer.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php b/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php
index 0467e1d8..ac063f37 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Observer.php b/src/app/code/community/FireGento/MageSetup/Model/Observer.php
index 7db5aa95..ae3ffdcd 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Observer.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Observer.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php b/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php
index 964ad517..53ac51e8 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php b/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php
index 3f1debfa..f7672abb 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup.php b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
index fc02c380..82c094a6 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Abstract.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Abstract.php
index 96b4c782..8d12ae7f 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Abstract.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Abstract.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php
index cfe959b4..1bdeaefd 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.5.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
index 8b6f0653..d3fc49cb 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.5.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php
index 32a77953..82fb1868 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Email.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.5.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Systemconfig.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Systemconfig.php
index b5d48faf..580742b4 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Systemconfig.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Systemconfig.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.5.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
index c9079899..5ebdd1ca 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.5.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/AgreementType.php b/src/app/code/community/FireGento/MageSetup/Model/Source/AgreementType.php
index c0f59fb3..50ab418a 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/AgreementType.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/AgreementType.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.2
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php b/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php
index 2ed344e6..f2763fb1 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php b/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php
index b79ad7d9..6959d8f9 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/CustomerTaxClass.php b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/CustomerTaxClass.php
index a9935870..0c9ef429 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/CustomerTaxClass.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/CustomerTaxClass.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php
index 5c7edaf0..c798a88a 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php
index 31916f17..21f7dcb7 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php
index 0df5d7e8..bf6008eb 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.5.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/ProductTaxClass.php b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/ProductTaxClass.php
index c2e9b3d7..143dfbfa 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/ProductTaxClass.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Source/Tax/ProductTaxClass.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.0
diff --git a/src/app/code/community/FireGento/MageSetup/Model/Tax/Config.php b/src/app/code/community/FireGento/MageSetup/Model/Tax/Config.php
index 69b50eaa..859eedd5 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Tax/Config.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Tax/Config.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.6.2
diff --git a/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php b/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php
index a5b15fc4..83377743 100644
--- a/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php
+++ b/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
diff --git a/src/app/code/community/FireGento/MageSetup/Test/Model/Source/AgreementType.php b/src/app/code/community/FireGento/MageSetup/Test/Model/Source/AgreementType.php
index 4efab1cf..5115ab87 100644
--- a/src/app/code/community/FireGento/MageSetup/Test/Model/Source/AgreementType.php
+++ b/src/app/code/community/FireGento/MageSetup/Test/Model/Source/AgreementType.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
diff --git a/src/app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType.php b/src/app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType.php
index 709a96ae..4c300083 100644
--- a/src/app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType.php
+++ b/src/app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
diff --git a/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php b/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php
index ed6d51cc..448b7771 100644
--- a/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php
+++ b/src/app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.1.4
diff --git a/src/app/code/community/FireGento/MageSetup/controllers/FrontendController.php b/src/app/code/community/FireGento/MageSetup/controllers/FrontendController.php
index 3c1c9f2d..fd32d3d3 100644
--- a/src/app/code/community/FireGento/MageSetup/controllers/FrontendController.php
+++ b/src/app/code/community/FireGento/MageSetup/controllers/FrontendController.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.4.0
diff --git a/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php b/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php
index 40563a98..ef368723 100644
--- a/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php
+++ b/src/app/code/community/FireGento/MageSetup/controllers/MagesetupController.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.4.0
diff --git a/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.0-2.0.1.php b/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.0-2.0.1.php
index b4ebe336..1eb812ee 100644
--- a/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.0-2.0.1.php
+++ b/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.0-2.0.1.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.1
@@ -27,7 +27,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.1
diff --git a/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.1-2.0.2.php b/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.1-2.0.2.php
index 070d7d84..4f2c1830 100644
--- a/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.1-2.0.2.php
+++ b/src/app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.1-2.0.2.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.1
@@ -27,7 +27,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.2
@@ -42,4 +42,4 @@
     $this->setConfigData('magesetup/is_initialized', 1);
 }
 
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/src/app/code/community/FireGento/MageSetup/etc/at/email.xml b/src/app/code/community/FireGento/MageSetup/etc/at/email.xml
index d8d2179a..758d9942 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/at/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/at/email.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
index fc81305d..0f184a9e 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml b/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml
index d8d2179a..758d9942 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
index c21c9c5b..f6d0fcd7 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/config.xml b/src/app/code/community/FireGento/MageSetup/etc/config.xml
index a9f057ad..bcfe4678 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/config.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/config.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/de/email.xml b/src/app/code/community/FireGento/MageSetup/etc/de/email.xml
index 3e02612e..579f4701 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/de/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/de/email.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
index c94299d7..2c69ea27 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml b/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml
index fd661c3c..6a071fe3 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml b/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml
index 31e34f71..414e3007 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/email.xml b/src/app/code/community/FireGento/MageSetup/etc/default/email.xml
index 8a33b973..9de4d74e 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/email.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml b/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
index df3d892d..d7b3c325 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
index 7a7e0e04..47f63e8c 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml b/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml
index 598292ef..ea95df28 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
index 88feacab..a15125c8 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -35,7 +35,7 @@
                         1
                         0
                     
-                    
+
                     
@@ -44,7 +44,7 @@
                         1
                         0
                     
-                    
+
                     
@@ -53,7 +53,7 @@
                         1
                         0
                     
-                    
+
                     
@@ -87,7 +87,7 @@
                         Produits au taux réduit de 5.5%
                         PRODUCT
                         0
-                                        
+                    
                     
                         1
                         4
@@ -95,7 +95,7 @@
                         PRODUCT
                         0
                     
-                    
+
                     
                         1
                         5
@@ -137,7 +137,7 @@
                         
                         7
                     
-                    
+
                     
                         1
                         0
@@ -145,7 +145,7 @@
                         
                         5.5
                     
-                    
+
                     
                         1
                         0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
index 1e6c18b4..79076926 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/it/email.xml b/src/app/code/community/FireGento/MageSetup/etc/it/email.xml
index 745ccee0..34640abd 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/it/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/it/email.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.1
diff --git a/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
index a0e9ea19..e2371b44 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     2.0.1
diff --git a/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml
index 63081189..795bbd87 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml
index b526d42e..ca173368 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml
index d6beff68..cb76c92c 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml
index 469be9c5..3a30f361 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
index a5e3ce17..d1c450ca 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/etc/system.xml b/src/app/code/community/FireGento/MageSetup/etc/system.xml
index 864da2a6..dff48688 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/system.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/system.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-install-0.5.0.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-install-0.5.0.php
index a4a99666..ac4c89c7 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-install-0.5.0.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-install-0.5.0.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php
index 23f7c80f..4d40dfa1 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.5
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.5
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php
index 5dff2ab4..c886d3c2 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.7
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.7
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php
index cea70ec5..af0c2ca5 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.7
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.0.7
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.4-1.2.0.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.4-1.2.0.php
index e69d8a12..07437b31 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.4-1.2.0.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.4-1.2.0.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.0-1.2.1.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.0-1.2.1.php
index e8662965..074f55e1 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.0-1.2.1.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.0-1.2.1.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.1
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php
index f2757fbe..32d1da32 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @since     0.1.0
  */
@@ -25,7 +25,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.2
diff --git a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.2-1.2.3.php b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.2-1.2.3.php
index 31104530..5bc515f4 100644
--- a/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.2-1.2.3.php
+++ b/src/app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.2-1.2.3.php
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.3
diff --git a/src/app/design/adminhtml/default/default/layout/magesetup.xml b/src/app/design/adminhtml/default/default/layout/magesetup.xml
index 12015ab8..13aa02c7 100644
--- a/src/app/design/adminhtml/default/default/layout/magesetup.xml
+++ b/src/app/design/adminhtml/default/default/layout/magesetup.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/adminhtml/default/default/template/magesetup/form.phtml b/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
index adb9543e..6ce99519 100644
--- a/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
+++ b/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.4.0
@@ -156,8 +156,8 @@
                 
             
         
-        
-        
+
+
         

             
__('CMS Settings') ?>

             

@@ -330,9 +330,9 @@
             
         }
     }
-    
+
     updateNewTaxClassSelect($F('select_country'));
-    
+
     $('select_country').observe('change', function(event) {
         updateNewTaxClassSelect($F('select_country'));
     });
diff --git a/src/app/design/frontend/base/default/template/magesetup/checkout/additional.phtml b/src/app/design/frontend/base/default/template/magesetup/checkout/additional.phtml
index c1fca7f6..acadfdd6 100644
--- a/src/app/design/frontend/base/default/template/magesetup/checkout/additional.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/checkout/additional.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/agreements.phtml b/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/agreements.phtml
index 8f0ce59b..6b61fbe8 100644
--- a/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/agreements.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/agreements.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/overview.phtml b/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/overview.phtml
index 381dbe7d..acee9739 100644
--- a/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/overview.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/checkout/multishipping/overview.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/checkout/onepage/agreements.phtml b/src/app/design/frontend/base/default/template/magesetup/checkout/onepage/agreements.phtml
index 922f055a..78a37b55 100644
--- a/src/app/design/frontend/base/default/template/magesetup/checkout/onepage/agreements.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/checkout/onepage/agreements.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.2
diff --git a/src/app/design/frontend/base/default/template/magesetup/customer/form/tc-confirmation.phtml b/src/app/design/frontend/base/default/template/magesetup/customer/form/tc-confirmation.phtml
index f0e14467..95c903a0 100644
--- a/src/app/design/frontend/base/default/template/magesetup/customer/form/tc-confirmation.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/customer/form/tc-confirmation.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/delivery_time.phtml b/src/app/design/frontend/base/default/template/magesetup/delivery_time.phtml
index f77a7dc7..57aa24f4 100644
--- a/src/app/design/frontend/base/default/template/magesetup/delivery_time.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/delivery_time.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/address.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/address.phtml
index 04728af6..a8d26e49 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/address.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/address.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml
index 585d48f9..9dde4379 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml
index 1112e9b9..06970ccc 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
index e1b89e0f..8247d0c7 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml
index b5fa7ce7..29731da9 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/tax.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/tax.phtml
index 4032bed6..b5eab2d0 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/tax.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/tax.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/price_info.phtml b/src/app/design/frontend/base/default/template/magesetup/price_info.phtml
index 6dc96815..ac5f2610 100644
--- a/src/app/design/frontend/base/default/template/magesetup/price_info.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/price_info.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
diff --git a/src/app/design/frontend/base/default/template/magesetup/shipping.phtml b/src/app/design/frontend/base/default/template/magesetup/shipping.phtml
index 9bd70549..aff2ea52 100644
--- a/src/app/design/frontend/base/default/template/magesetup/shipping.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/shipping.phtml
@@ -15,7 +15,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0
@@ -26,7 +26,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     1.2.0
diff --git a/src/app/etc/modules/FireGento_MageSetup.xml b/src/app/etc/modules/FireGento_MageSetup.xml
index deba5925..397fd544 100644
--- a/src/app/etc/modules/FireGento_MageSetup.xml
+++ b/src/app/etc/modules/FireGento_MageSetup.xml
@@ -16,7 +16,7 @@
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
- * @copyright 2013 FireGento Team (http://www.firegento.de). All rights served.
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  * @version   $Id:$
  * @since     0.1.0

From 22498f3c137569a7f8ec52d11ca903cbd8879d9d Mon Sep 17 00:00:00 2001
From: Rouven Alexander Rieker 
Date: Sat, 12 Oct 2013 12:58:06 +0200
Subject: [PATCH 21/37] [TASK] Fixed file comment to be more generic

---
 .../MageSetup/Block/Adminhtml/Magesetup.php        |  4 ++--
 .../Adminhtml/Newsletter/Subscriber/Status.php     |  4 ++--
 .../Newsletter/Subscriber/Status/Grid.php          |  4 ++--
 .../MageSetup/Block/Adminhtml/Notifications.php    |  4 ++--
 .../Block/Bundle/Catalog/Product/Price.php         |  4 ++--
 .../Bundle/Catalog/Product/Price/Abstract.php      |  4 ++--
 .../MageSetup/Block/Catalog/Product/Price.php      |  4 ++--
 .../Block/Catalog/Product/Price/Abstract.php       |  4 ++--
 .../MageSetup/Block/Checkout/Agreements.php        |  4 ++--
 .../MageSetup/Block/Checkout/Information.php       |  4 ++--
 .../Block/Customer/Account/Agreements.php          |  4 ++--
 .../community/FireGento/MageSetup/Block/Ga.php     |  4 ++--
 .../FireGento/MageSetup/Block/Imprint/Content.php  |  4 ++--
 .../FireGento/MageSetup/Block/Imprint/Field.php    |  4 ++--
 .../Helper/Catalog/Product/Configuration.php       |  4 ++--
 .../FireGento/MageSetup/Helper/Checkout/Data.php   |  4 ++--
 .../community/FireGento/MageSetup/Helper/Data.php  |  4 ++--
 .../community/FireGento/MageSetup/Model/Config.php |  4 ++--
 .../MageSetup/Model/Newsletter/Observer.php        |  4 ++--
 .../Model/Newsletter/Subscriber/Status.php         |  4 ++--
 .../FireGento/MageSetup/Model/Observer.php         |  4 ++--
 .../Resource/Newsletter/Subscriber/Status.php      |  4 ++--
 .../Newsletter/Subscriber/Status/Collection.php    |  4 ++--
 .../community/FireGento/MageSetup/Model/Setup.php  |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Abstract.php   |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Agreements.php |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Cms.php        |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Email.php      |  4 ++--
 .../MageSetup/Model/Setup/Systemconfig.php         |  4 ++--
 .../FireGento/MageSetup/Model/Setup/Tax.php        |  4 ++--
 .../MageSetup/Model/Source/AgreementType.php       |  4 ++--
 .../FireGento/MageSetup/Model/Source/Cms/Block.php |  4 ++--
 .../FireGento/MageSetup/Model/Source/Cms/Page.php  |  4 ++--
 .../Model/Source/Tax/CustomerTaxClass.php          |  4 ++--
 .../MageSetup/Model/Source/Tax/DynamicType.php     |  4 ++--
 .../Model/Source/Tax/NewCustomerTaxClass.php       |  4 ++--
 .../Model/Source/Tax/NewProductTaxClass.php        |  4 ++--
 .../MageSetup/Model/Source/Tax/ProductTaxClass.php |  4 ++--
 .../FireGento/MageSetup/Model/Tax/Config.php       | 14 +++++---------
 .../FireGento/MageSetup/Test/Config/Main.php       |  4 ++--
 .../MageSetup/Test/Model/Source/AgreementType.php  |  4 ++--
 .../Test/Model/Source/Tax/DynamicType.php          |  4 ++--
 .../controllers/Adminhtml/NewsletterController.php |  4 ++--
 .../MageSetup/controllers/FrontendController.php   |  4 ++--
 .../MageSetup/controllers/MagesetupController.php  |  4 ++--
 .../magesetup_setup/data-upgrade-2.0.0-2.0.1.php   |  4 ++--
 .../magesetup_setup/data-upgrade-2.0.1-2.0.2.php   |  4 ++--
 .../community/FireGento/MageSetup/etc/at/email.xml |  4 ++--
 .../community/FireGento/MageSetup/etc/at/tax.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/ch/email.xml |  4 ++--
 .../community/FireGento/MageSetup/etc/ch/tax.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/config.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/de/email.xml |  4 ++--
 .../community/FireGento/MageSetup/etc/de/tax.xml   |  4 ++--
 .../FireGento/MageSetup/etc/default/agreement.xml  |  4 ++--
 .../FireGento/MageSetup/etc/default/cms.xml        |  4 ++--
 .../FireGento/MageSetup/etc/default/email.xml      |  4 ++--
 .../MageSetup/etc/default/systemconfig.xml         |  4 ++--
 .../FireGento/MageSetup/etc/default/tax.xml        |  4 ++--
 .../community/FireGento/MageSetup/etc/fr/email.xml |  4 ++--
 .../community/FireGento/MageSetup/etc/fr/tax.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/gb/tax.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/it/email.xml |  4 ++--
 .../community/FireGento/MageSetup/etc/it/tax.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/nl/tax.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/ru/cms.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/ru/email.xml |  4 ++--
 .../FireGento/MageSetup/etc/ru/systemconfig.xml    |  4 ++--
 .../community/FireGento/MageSetup/etc/ru/tax.xml   |  4 ++--
 .../community/FireGento/MageSetup/etc/system.xml   |  4 ++--
 .../sql/magesetup_setup/mysql4-install-0.5.0.php   |  4 ++--
 .../magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php |  4 ++--
 .../magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php |  4 ++--
 .../magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php |  4 ++--
 .../magesetup_setup/mysql4-upgrade-1.1.4-1.2.0.php |  4 ++--
 .../magesetup_setup/mysql4-upgrade-1.2.0-1.2.1.php |  4 ++--
 .../magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php |  4 ++--
 .../magesetup_setup/mysql4-upgrade-1.2.2-1.2.3.php |  4 ++--
 .../adminhtml/default/default/layout/magesetup.xml |  4 ++--
 .../default/default/template/magesetup/form.phtml  |  4 ++--
 .../template/magesetup/checkout/additional.phtml   |  4 ++--
 .../checkout/multishipping/agreements.phtml        |  4 ++--
 .../checkout/multishipping/overview.phtml          |  4 ++--
 .../magesetup/checkout/onepage/agreements.phtml    |  4 ++--
 .../magesetup/customer/form/tc-confirmation.phtml  |  4 ++--
 .../default/template/magesetup/delivery_time.phtml |  4 ++--
 .../template/magesetup/imprint/address.phtml       |  4 ++--
 .../default/template/magesetup/imprint/bank.phtml  |  4 ++--
 .../template/magesetup/imprint/communication.phtml |  4 ++--
 .../template/magesetup/imprint/email_footer.phtml  |  4 ++--
 .../default/template/magesetup/imprint/legal.phtml |  4 ++--
 .../default/template/magesetup/imprint/tax.phtml   |  4 ++--
 .../default/template/magesetup/price_info.phtml    |  4 ++--
 .../base/default/template/magesetup/shipping.phtml |  4 ++--
 src/app/etc/modules/FireGento_MageSetup.xml        |  4 ++--
 95 files changed, 193 insertions(+), 197 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
index 3ba93699..a2110289 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
@@ -1,8 +1,8 @@
 
- * @copyright 2013 FireGento Team (http://www.firegento.com)
- * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.6.2
+ * @category FireGento
+ * @package  FireGento_MageSetup
+ * @author   FireGento Team 
  */
 class FireGento_MageSetup_Model_Tax_Config extends Mage_Tax_Model_Config
 {
diff --git a/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php b/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php
index 83377743..cd5bec6a 100644
--- a/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php
+++ b/src/app/code/community/FireGento/MageSetup/Test/Config/Main.php
@@ -1,8 +1,8 @@
 
 
 
     
         
diff --git a/src/app/code/community/FireGento/MageSetup/etc/at/email.xml b/src/app/code/community/FireGento/MageSetup/etc/at/email.xml
index 83ae4025..7b2929f4 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/at/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/at/email.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
index 6749158f..0e7abeee 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/at/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml b/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml
index 83ae4025..7b2929f4 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ch/email.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
index dc141d3f..830b16d6 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ch/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/config.xml b/src/app/code/community/FireGento/MageSetup/etc/config.xml
index 7104ea4a..e8a0a193 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/config.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/config.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/de/email.xml b/src/app/code/community/FireGento/MageSetup/etc/de/email.xml
index 55465ee0..6bfa17e6 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/de/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/de/email.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
index a6582837..b53df7e6 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/de/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml b/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml
index 78f80674..c695f9be 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/agreement.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     2.0.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml b/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml
index bf10da7f..ac02d5d1 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/cms.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/email.xml b/src/app/code/community/FireGento/MageSetup/etc/default/email.xml
index fc2aa18e..697d667b 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/email.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml b/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
index 232c1cb3..0beaf3a8 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
index 776e5fb9..311b399a 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/default/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     2.0.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml b/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml
index 93f327ee..1416d18c 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/fr/email.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
index a6bf6ce7..cc40a4e2 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/fr/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
index a3a74736..311b399a 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/gb/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/it/email.xml b/src/app/code/community/FireGento/MageSetup/etc/it/email.xml
index a8d92882..e85895fe 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/it/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/it/email.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     2.0.1
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
index 00d76a07..d3957870 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/it/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     2.0.1
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml
index c9d8a3b3..7bbf90be 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/nl/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml
index c18c8beb..c9f7285e 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/cms.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml
index 71c4934f..fefc484e 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/email.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml
index 569642db..ff8bdbfa 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/systemconfig.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml b/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
index 61172a97..42a6b909 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/ru/tax.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/code/community/FireGento/MageSetup/etc/system.xml b/src/app/code/community/FireGento/MageSetup/etc/system.xml
index 05bc7feb..5354777f 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/system.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/system.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/design/adminhtml/default/default/layout/magesetup.xml b/src/app/design/adminhtml/default/default/layout/magesetup.xml
index d944323b..10d5c832 100644
--- a/src/app/design/adminhtml/default/default/layout/magesetup.xml
+++ b/src/app/design/adminhtml/default/default/layout/magesetup.xml
@@ -11,15 +11,11 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.1.0
  */
  -->
 
diff --git a/src/app/design/adminhtml/default/default/template/magesetup/extensions.phtml b/src/app/design/adminhtml/default/default/template/magesetup/extensions.phtml
index ca0481af..8b05fc88 100644
--- a/src/app/design/adminhtml/default/default/template/magesetup/extensions.phtml
+++ b/src/app/design/adminhtml/default/default/template/magesetup/extensions.phtml
@@ -1,3 +1,27 @@
+
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
+ * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
+ */
+?>
+
 

     
__('Recommended Extensions') ?>

     

diff --git a/src/app/design/adminhtml/default/default/template/magesetup/form.phtml b/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
index d74bf7cd..41f760a8 100644
--- a/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
+++ b/src/app/design/adminhtml/default/default/template/magesetup/form.phtml
@@ -10,20 +10,15 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * PHP version 5
- *
  * @category  FireGento
  * @package   FireGento_MageSetup
  * @author    FireGento Team 
  * @copyright 2013 FireGento Team (http://www.firegento.com)
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
- * @version   $Id:$
- * @since     0.4.0
  */
 ?>
 
diff --git a/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml b/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml
index e8a96831..0fbab756 100644
--- a/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml
+++ b/src/app/design/adminhtml/default/default/template/magesetup/notifications.phtml
@@ -1,10 +1,33 @@
-
+
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
+ * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
+ */
+?>
+
 isInitialized()): ?>
-

-    
-        __('Skip installation') ?>
-    
-    helper('magesetup')->__('MageSetup has been installed.') ?>
-    helper('magesetup')->__('Click here to set up your pages, blocks, emails and tax settings.', $this->getManageUrl()) ?>
-

+    

+        
+            __('Skip installation') ?>
+        
+        helper('magesetup')->__('MageSetup has been installed.') ?>
+        helper('magesetup')->__('Click here to set up your pages, blocks, emails and tax settings.', $this->getManageUrl()) ?>
+    

 
diff --git a/src/app/design/frontend/base/default/layout/magesetup.xml b/src/app/design/frontend/base/default/layout/magesetup.xml
index 477c7798..7bb49b73 100644
--- a/src/app/design/frontend/base/default/layout/magesetup.xml
+++ b/src/app/design/frontend/base/default/layout/magesetup.xml
@@ -1,4 +1,23 @@
 
+
 
 
     
 
diff --git a/src/skin/frontend/base/default/css/magesetup/checkout.css b/src/skin/frontend/base/default/css/magesetup/checkout.css
index a824ae32..7917c9ca 100644
--- a/src/skin/frontend/base/default/css/magesetup/checkout.css
+++ b/src/skin/frontend/base/default/css/magesetup/checkout.css
@@ -1,3 +1,21 @@
+/**
+ * This file is part of a FireGento e.V. module.
+ *
+ * This FireGento e.V. module is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This script is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * @category  FireGento
+ * @package   FireGento_MageSetup
+ * @author    FireGento Team 
+ * @copyright 2013 FireGento Team (http://www.firegento.com)
+ * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
+ */
+
 #checkout-review-table tfoot tr {
     background-color: #FBFAF6 !important;
 }
@@ -61,4 +79,4 @@
 
 #review-buttons-container p.f-left {
     display: none;
-}
\ No newline at end of file
+}

From 6277b9727ddefce595e5aa487d3b97b16d1840ac Mon Sep 17 00:00:00 2001
From: Rouven Alexander Rieker 
Date: Sat, 12 Oct 2013 16:58:20 +0200
Subject: [PATCH 28/37] [TASK] Minifed css file (at least a bit)

---
 .../base/default/css/magesetup/checkout.css   | 77 ++++---------------
 1 file changed, 13 insertions(+), 64 deletions(-)

diff --git a/src/skin/frontend/base/default/css/magesetup/checkout.css b/src/skin/frontend/base/default/css/magesetup/checkout.css
index 7917c9ca..3b3c4aa3 100644
--- a/src/skin/frontend/base/default/css/magesetup/checkout.css
+++ b/src/skin/frontend/base/default/css/magesetup/checkout.css
@@ -16,67 +16,16 @@
  * @license   http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
  */
 
-#checkout-review-table tfoot tr {
-    background-color: #FBFAF6 !important;
-}
-
-#checkout-review-table tr.odd,
-#checkout-review-table tr.even {
-    background-color: #FBFAF6;
-}
-
-#checkout-review-table td.last {
-    text-align: right;
-}
-#checkout-review-table td.last .price {
-    font-weight: bold;
-}
-
-#checkout-review-table-wrapper {
-    border: 2px solid #0A263D;
-    border-bottom: 0;
-}
-
-#opc-review #checkout-step-review .additional-information {
-    border: 2px solid #0A263D;
-    border-top: 0;
-    border-bottom: 0;
-}
-
-#checkout-review-submit {
-    background-color: #FBFAF6;
-    border: 2px solid #0A263D;
-    border-top: 0;
-}
-
-#opc-review .additional-information {
-	clear: both;
-	margin:0;
-	padding: 15px 10px;
-	text-align: right;
-}
-
-.checkout-multishipping-overview .additional-information {
-	margin: 0;
-	padding: 0 10px 25px;
-	text-align: right;
-}
-
-.checkout-multishipping-overview .checkout-agreements {
-	margin-bottom: 25px;
-}
-
-.opc .checkout-agreements li,
-.checkout-multishipping-overview .checkout-agreements li {
-	margin: 10px 0;
-}
-
-.opc .checkout-agreements .agree,
-.checkout-multishipping-overview .checkout-agreements .agree {
-	padding-top: 0px;
-	padding-bottom: 0px;
-}
-
-#review-buttons-container p.f-left {
-    display: none;
-}
+#checkout-review-table tfoot tr{background-color:#FBFAF6!important}
+#checkout-review-table tr.odd,#checkout-review-table tr.even{background-color:#FBFAF6}
+#checkout-review-table td.last{text-align:right}
+#checkout-review-table td.last .price{font-weight:700}
+#checkout-review-table-wrapper{border:2px solid #0A263D;border-bottom:0}
+#opc-review #checkout-step-review .additional-information{border:2px solid #0A263D;border-top:0;border-bottom:0}
+#checkout-review-submit{background-color:#FBFAF6;border:2px solid #0A263D;border-top:0}
+#opc-review .additional-information{clear:both;margin:0;padding:15px 10px;text-align:right}
+.checkout-multishipping-overview .additional-information{margin:0;padding:0 10px 25px;text-align:right}
+.checkout-multishipping-overview .checkout-agreements{margin-bottom:25px}
+.opc .checkout-agreements li,.checkout-multishipping-overview .checkout-agreements li{margin:10px 0}
+.opc .checkout-agreements .agree,.checkout-multishipping-overview .checkout-agreements .agree{padding-top:0;padding-bottom:0}
+#review-buttons-container p.f-left{display:none}

From 6b04dc37dfa44363bbef94036847c8cd76d2a6b2 Mon Sep 17 00:00:00 2001
From: Rouven Alexander Rieker 
Date: Sat, 12 Oct 2013 19:28:49 +0200
Subject: [PATCH 29/37] readme cleanup

---
 README.markdown | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.markdown b/README.markdown
index 2153e07a..ce05e7c9 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,5 +1,5 @@
 FireGento_MageSetup
-=====================
+===================
 MageSetup configures a shop for a national market. It's the international variant and successor of [GermanSetup](https://github.com/firegento/firegento-germansetup).
 
 Currently supported countries: Austria, France, Germany, Italy, Russia, Switzerland, United Kingdom. More to follow.
@@ -10,14 +10,14 @@ Build Status
 * Development Branch: [![Development Branch](https://travis-ci.org/firegento/firegento-magesetup.png?branch=development)](https://travis-ci.org/firegento/firegento-magesetup)
 
 Facts
-------
+-----
 - Version: check [config.xml](https://github.com/firegento/firegento-magesetup/blob/master/src/app/code/community/FireGento/MageSetup/etc/config.xml)
 - Extension key: FireGento_MageSetup
 - [Extension on GitHub](https://github.com/firegento/firegento-magesetup/)
-- Composer name: firegento/magesetup on [packages.firegento.com](http://packages.firegento.com/)
+- Composer name: `firegento/magesetup` on [packages.firegento.com](http://packages.firegento.com/)
 
 Description
-------------
+-----------
 Central features of MageSetup are:
 
 * Setting of important configuration settings
@@ -38,11 +38,11 @@ Requirements
 - PHP >= 5.3.0
 
 Compatibility
---------------
+-------------
 - Magento >= 1.6
 
 Installation
------------------------
+------------
 Please create the desired websites and store views as well as install any language packs before running MageSetup.
 
 Copy all files from the src/ folder to your magento directory in order to install the MageSetup module.

From d56d8a8fecfd9ee1b72edd28e9f21bf7a7b5ef5b Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz 
Date: Tue, 5 Nov 2013 16:55:11 +0100
Subject: [PATCH 30/37] [TASK] Removed Mage::log calls

---
 src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php b/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
index 352e40d9..58012cf6 100644
--- a/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
+++ b/src/app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
@@ -171,9 +171,7 @@ protected function _createCmsPage($pageData, $locale, $override = true, $storeId
 
         if (!(int) $page->getId() || $override) {
             $page->addData($data);
-            Mage::log($page->getData());
             $page->save();
-            Mage::log('saved');
         }
 
         if (!$storeId) {

From 75153889d283abe1936c2fbc2ed03391d20c3d04 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz 
Date: Tue, 5 Nov 2013 20:04:00 +0100
Subject: [PATCH 31/37] [~BUGFIX] Fixed error on deactivated checkout
 agreements (closes #19)

---
 .../MageSetup/Block/Checkout/Agreements.php   | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php b/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php
index b1db6ebe..b91dbdbb 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php
@@ -32,24 +32,31 @@ class FireGento_MageSetup_Block_Checkout_Agreements extends Mage_Checkout_Block_
     /**
      * Filter by "Agreement Type"
      *
-     * @return Mage_Checkout_Model_Resource_Agreement_Collection Agreements
+     * @return Mage_Checkout_Model_Resource_Agreement_Collection Agreements|array
      */
     public function getAgreements()
     {
-        $agreements = parent::getAgreements();
-        if ($this->_getCustomerSession()->isLoggedIn()) {
-            $agreements->addFieldToFilter('agreement_type', array('in' => array(
-                FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CHECKOUT,
-                FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
-            )));
-        } else {
-            $agreements->addFieldToFilter('agreement_type', array('in' => array(
-                FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CUSTOMER,
-                FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CHECKOUT,
-                FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
-            )));
+        if (!$this->hasAgreements()) {
+            if (!Mage::getStoreConfigFlag('checkout/options/enable_agreements')) {
+                $agreements = array();
+            } else {
+                $agreements = parent::getAgreements();
+                if ($this->_getCustomerSession()->isLoggedIn()) {
+                    $agreements->addFieldToFilter('agreement_type', array('in' => array(
+                        FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CHECKOUT,
+                        FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
+                    )));
+                } else {
+                    $agreements->addFieldToFilter('agreement_type', array('in' => array(
+                        FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CUSTOMER,
+                        FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CHECKOUT,
+                        FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
+                    )));
+                }
+            }
+            $this->setAgreements($agreements);
         }
-        return $agreements;
+        return $this->getData('agreements');
     }
 
     /**

From b142e7ca2ee1d85835ff6c06eb514ce1bb936fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylvain=20Raye=CC=81?= 
Date: Sun, 10 Nov 2013 18:11:23 +0100
Subject: [PATCH 32/37] add Clearing information to the bank information

---
 src/app/code/community/FireGento/MageSetup/etc/system.xml | 8 ++++++++
 .../base/default/template/magesetup/imprint/bank.phtml    | 5 ++++-
 .../default/template/magesetup/imprint/email_footer.phtml | 3 +++
 src/app/locale/de_AT/FireGento_MageSetup.csv              | 3 ++-
 src/app/locale/de_DE/FireGento_MageSetup.csv              | 4 +++-
 src/app/locale/en_US/FireGento_MageSetup.csv              | 4 +++-
 src/app/locale/fr_FR/FireGento_MageSetup.csv              | 4 +++-
 src/app/locale/it_IT/FireGento_MageSetup.csv              | 4 +++-
 src/app/locale/ru_RU/FireGento_MageSetup.csv              | 2 ++
 9 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/etc/system.xml b/src/app/code/community/FireGento/MageSetup/etc/system.xml
index 864da2a6..9da39886 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/system.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/system.xml
@@ -356,6 +356,14 @@
                             1
                             1
                         
+                        
+                            
+                            text
+                            300
+                            1
+                            1
+                            1
+                        
                     
                 
             
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml
index 585d48f9..ad577dae 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/bank.phtml
@@ -28,7 +28,7 @@
 ?>
 
 getBankAccount())) || strlen(trim($this->getSwift()))): ?>
-    
Bankverbindung

+    
__('Bank Information'); ?>

 
 
 getBankAccountOwner()))): ?>
@@ -49,3 +49,6 @@
 getIban()))): ?>
     __('IBAN') ?>: getIban() ?>

 
+getClearing()))): ?>
+    __('Clearing') ?>: getClearing() ?>

+
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
index e1b89e0f..b26afe00 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
@@ -99,4 +99,7 @@
     getIban()))): ?>
         __('IBAN') ?>: getIban() ?>

     
+    getClearing()))): ?>
+        __('Clearing') ?>: getClearing() ?>

+    
 

diff --git a/src/app/locale/de_AT/FireGento_MageSetup.csv b/src/app/locale/de_AT/FireGento_MageSetup.csv
index 64585534..4b12a45b 100644
--- a/src/app/locale/de_AT/FireGento_MageSetup.csv
+++ b/src/app/locale/de_AT/FireGento_MageSetup.csv
@@ -1,3 +1,4 @@
 "VAT-ID","UID"
 "Register number","Firmenbuchnummer"
-"SWIFT","BIC/SWIFT"
\ No newline at end of file
+"SWIFT","BIC/SWIFT"
+"Bank Information","Bankverbindung"
\ No newline at end of file
diff --git a/src/app/locale/de_DE/FireGento_MageSetup.csv b/src/app/locale/de_DE/FireGento_MageSetup.csv
index 332c5bc8..b60fc6b7 100644
--- a/src/app/locale/de_DE/FireGento_MageSetup.csv
+++ b/src/app/locale/de_DE/FireGento_MageSetup.csv
@@ -65,6 +65,7 @@
 "Fax","Fax"
 "Financial office","Finanzamt"
 "IBAN","IBAN"
+"Clearing","Clearing"
 "Register court","Registergericht"
 "Register number","HRB-Nummer"
 "SWIFT","SWIFT"
@@ -149,4 +150,5 @@
 "Bank Payment","Vorkasse"
 "Invoice Payment","Rechnung"
 "Extension Key","Extension Key"
-"MagentoConnect","MagentoConnect"
\ No newline at end of file
+"MagentoConnect","MagentoConnect"
+"Bank Information","Bankverbindung"
\ No newline at end of file
diff --git a/src/app/locale/en_US/FireGento_MageSetup.csv b/src/app/locale/en_US/FireGento_MageSetup.csv
index 3ed91223..3616bac8 100644
--- a/src/app/locale/en_US/FireGento_MageSetup.csv
+++ b/src/app/locale/en_US/FireGento_MageSetup.csv
@@ -65,6 +65,7 @@
 "Fax","Fax"
 "Financial office","Financial office"
 "IBAN","IBAN"
+"Clearing","Clearing"
 "Register court","Register court"
 "Register number","Register number"
 "SWIFT","SWIFT"
@@ -149,4 +150,5 @@
 "Bank Payment","Bank Payment"
 "Invoice Payment","Invoice Payment"
 "Extension Key","Extension Key"
-"MagentoConnect","MagentoConnect"
\ No newline at end of file
+"MagentoConnect","MagentoConnect"
+"Bank Information","Bank Information"
\ No newline at end of file
diff --git a/src/app/locale/fr_FR/FireGento_MageSetup.csv b/src/app/locale/fr_FR/FireGento_MageSetup.csv
index c2303d50..6c632b34 100644
--- a/src/app/locale/fr_FR/FireGento_MageSetup.csv
+++ b/src/app/locale/fr_FR/FireGento_MageSetup.csv
@@ -62,6 +62,7 @@
 "Fax","Fax"
 "Financial office","Bureau des finances"
 "IBAN","IBAN"
+"Clearing","Clearing"
 "Register court","Tribunal de commerce"
 "Register number","Numéro du tribunal de commerce"
 "SWIFT","SWIFT"
@@ -141,4 +142,5 @@
 "Bank Payment","Virement"
 "Invoice Payment","Facture"
 "Extension Key","Extension Key"
-"MagentoConnect","MagentoConnect"
\ No newline at end of file
+"MagentoConnect","MagentoConnect"
+"Bank Information","Information bancaire"
\ No newline at end of file
diff --git a/src/app/locale/it_IT/FireGento_MageSetup.csv b/src/app/locale/it_IT/FireGento_MageSetup.csv
index 4c72a4d3..ea24218e 100644
--- a/src/app/locale/it_IT/FireGento_MageSetup.csv
+++ b/src/app/locale/it_IT/FireGento_MageSetup.csv
@@ -62,6 +62,7 @@ CEO,Amministratore
 "Fax","Fax"
 "Financial office","Ufficio tributario"
 "IBAN","IBAN"
+"Clearing","Clearing"
 "Register court","Registro delle imprese"
 "Register number","HRB-Nummer"
 "SWIFT","SWIFT"
@@ -145,4 +146,5 @@ Nowhere,Mai
 "Bank Payment","Pagamento anticipato"
 "Invoice Payment","Pagamento su Fattura"
 "Extension Key","Codice modulo"
-"MagentoConnect","MagentoConnect"
\ No newline at end of file
+"MagentoConnect","MagentoConnect"
+"Bank Information","Bank Information"
\ No newline at end of file
diff --git a/src/app/locale/ru_RU/FireGento_MageSetup.csv b/src/app/locale/ru_RU/FireGento_MageSetup.csv
index 5ad0729f..516a3104 100644
--- a/src/app/locale/ru_RU/FireGento_MageSetup.csv
+++ b/src/app/locale/ru_RU/FireGento_MageSetup.csv
@@ -57,6 +57,7 @@
 "E-Mail","E-Mail"
 "Fax","Факс"
 "IBAN","IBAN"
+"Clearing","Clearing"
 "SWIFT","SWIFT"
 "BIC/SWIFT","BIC/SWIFT"
 "Tax number","Tax number"
@@ -130,3 +131,4 @@
 "Invoice Payment","Invoice Payment"
 "Extension Key","Ключ модуля"
 "MagentoConnect","MagentoConnect"
+"Bank Information","Bank Information"
\ No newline at end of file

From 63c0738bffa0078b914c9233f41baa939e887a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylvain=20Raye=CC=81?= 
Date: Sun, 10 Nov 2013 20:22:58 +0100
Subject: [PATCH 33/37] add an antispam logic when emails are displayed in
 frontend

---
 .../MageSetup/Block/Imprint/Content.php       | 29 +++++++++++++++++++
 .../MageSetup/Block/Imprint/Field.php         |  6 +++-
 .../magesetup/imprint/communication.phtml     |  2 +-
 .../magesetup/imprint/email_footer.phtml      |  2 +-
 .../template/magesetup/page/imprint.html      |  2 +-
 .../template/magesetup/page/imprint.html      |  2 +-
 .../template/magesetup/page/imprint.html      |  2 +-
 .../template/magesetup/page/imprint.html      |  2 +-
 .../template/magesetup/page/imprint.html      |  2 +-
 .../template/magesetup/page/imprint.html      |  2 +-
 10 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php
index 59cf5330..9b63933a 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Content.php
@@ -96,4 +96,33 @@ public function getCountry()
 
         return Mage::app()->getLocale()->getCountryTranslation($countryCode);
     }
+
+    /**
+     * Try to limit spam by generating a javascript email link
+     *
+     * @return string
+     */
+    public function getEmail($antispam = false)
+    {
+        $email = $this->getData('email');
+        $parts = explode('@', $email);
+
+        if (!$antispam) {return $email;}
+        if (count($parts) == 0) {return;}
+
+        $html = '';
+        $html .= $parts[0] .'nospamplease@nospamplease'.$parts[1];
+        $html .= '';
+        $html .= $this->getEmailJs($parts);
+
+        return $html;
+    }
+
+    public function getEmailJs($parts)
+    {
+        $js = <<function toRecipient(){var m = '$parts[0]';m += '@';m += '$parts[1]';location.href= "mailto:"+m;}
+JS;
+        return $js;
+    }
 }
diff --git a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
index 9ee012b6..97834960 100644
--- a/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
+++ b/src/app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
@@ -36,6 +36,10 @@ class FireGento_MageSetup_Block_Imprint_Field extends FireGento_MageSetup_Block_
      */
     protected function _toHtml()
     {
+        if ($this->getValue() == 'email') {
+            return $this->getEmail(true);
+        }
+
         return $this->getData($this->getValue());
     }
-}
+}
\ No newline at end of file
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml
index 769ab18f..f24d8d44 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/communication.phtml
@@ -31,4 +31,4 @@
 getWeb()))): ?>
 __('Web') ?>: getWeb() ?>

 
-__('E-Mail') ?>: getEmail() ?>
+__('E-Mail') ?>: getEmail(true) ?>
diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
index 63dcdb99..00ba0631 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
@@ -43,7 +43,7 @@
     getWeb()))): ?>
     __('Web') ?>: getWeb() ?>

     
-    __('E-Mail') ?>: getEmail() ?>
+    __('E-Mail') ?>: getEmail(false) ?>
 

 
 

diff --git a/src/app/locale/de_CH/template/magesetup/page/imprint.html b/src/app/locale/de_CH/template/magesetup/page/imprint.html
index 6348cfe1..82e58cb6 100644
--- a/src/app/locale/de_CH/template/magesetup/page/imprint.html
+++ b/src/app/locale/de_CH/template/magesetup/page/imprint.html
@@ -25,7 +25,7 @@ 
{{block type="magesetup/imprint_field" value="shop_name"}}

 
 
{{block type="magesetup/imprint_field" value="business_rules"}}

 
-
Sie erreichen unseren Kundendienst für Fragen Reklamationen und Beanstandungen unter Telefon: {{block type="magesetup/imprint_field" value="telephone"}} sowie per Email unter {{block type="magesetup/imprint_field" value="email"}}. Für Anfragen können Sie auch das Kontaktformular auf unserer Internetseite nutzen.

+
Sie erreichen unseren Kundendienst für Fragen Reklamationen und Beanstandungen unter Telefon: {{block type="magesetup/imprint_field" value="telephone"}} sowie per Email unter {{block type="magesetup/imprint_field" value="email"}}. Für Anfragen können Sie auch das Kontaktformular auf unserer Internetseite nutzen.

 
 
Disclaimer (Muster)

 
diff --git a/src/app/locale/de_DE/template/magesetup/page/imprint.html b/src/app/locale/de_DE/template/magesetup/page/imprint.html
index 6348cfe1..82e58cb6 100644
--- a/src/app/locale/de_DE/template/magesetup/page/imprint.html
+++ b/src/app/locale/de_DE/template/magesetup/page/imprint.html
@@ -25,7 +25,7 @@ 
{{block type="magesetup/imprint_field" value="shop_name"}}

 
 
{{block type="magesetup/imprint_field" value="business_rules"}}

 
-
Sie erreichen unseren Kundendienst für Fragen Reklamationen und Beanstandungen unter Telefon: {{block type="magesetup/imprint_field" value="telephone"}} sowie per Email unter {{block type="magesetup/imprint_field" value="email"}}. Für Anfragen können Sie auch das Kontaktformular auf unserer Internetseite nutzen.

+
Sie erreichen unseren Kundendienst für Fragen Reklamationen und Beanstandungen unter Telefon: {{block type="magesetup/imprint_field" value="telephone"}} sowie per Email unter {{block type="magesetup/imprint_field" value="email"}}. Für Anfragen können Sie auch das Kontaktformular auf unserer Internetseite nutzen.

 
 
Disclaimer (Muster)

 
diff --git a/src/app/locale/en_US/template/magesetup/page/imprint.html b/src/app/locale/en_US/template/magesetup/page/imprint.html
index 9f1c50af..17892050 100644
--- a/src/app/locale/en_US/template/magesetup/page/imprint.html
+++ b/src/app/locale/en_US/template/magesetup/page/imprint.html
@@ -19,4 +19,4 @@ 
{{block type="magesetup/imprint_field" value="shop_name"}}

 
 
{{block type="magesetup/imprint_field" value="business_rules"}}

 
-
Call us at {{block type="magesetup/imprint_field" value="telephone"}} or write an email to {{block type="magesetup/imprint_field" value="email"}}.

+
Call us at {{block type="magesetup/imprint_field" value="telephone"}} or write an email to {{block type="magesetup/imprint_field" value="email"}}.

diff --git a/src/app/locale/fr_CH/template/magesetup/page/imprint.html b/src/app/locale/fr_CH/template/magesetup/page/imprint.html
index 5833ef52..0b8347e9 100644
--- a/src/app/locale/fr_CH/template/magesetup/page/imprint.html
+++ b/src/app/locale/fr_CH/template/magesetup/page/imprint.html
@@ -25,7 +25,7 @@ 
{{block type="magesetup/imprint_field" value="shop_name"}}

 
{{block type="magesetup/imprint_field" value="business_rules"}}

 
 

-    Vous pouvez contacter nottre service clientèle pour toutes questions ou réclamations auprès du numéro de téléphone suivant: {{block type="magesetup/imprint_field" value="telephone"}} ou bien par email {{block type="magesetup/imprint_field" value="email"}} ou encore notre formulaire de contact situé sur notre site internet.
+    Vous pouvez contacter nottre service clientèle pour toutes questions ou réclamations auprès du numéro de téléphone suivant: {{block type="magesetup/imprint_field" value="telephone"}} ou bien par email {{block type="magesetup/imprint_field" value="email"}} ou encore notre formulaire de contact situé sur notre site internet.
 

 
 
Droits d'auteur et des marques

diff --git a/src/app/locale/fr_FR/template/magesetup/page/imprint.html b/src/app/locale/fr_FR/template/magesetup/page/imprint.html
index 5833ef52..0b8347e9 100644
--- a/src/app/locale/fr_FR/template/magesetup/page/imprint.html
+++ b/src/app/locale/fr_FR/template/magesetup/page/imprint.html
@@ -25,7 +25,7 @@ 
{{block type="magesetup/imprint_field" value="shop_name"}}

 
{{block type="magesetup/imprint_field" value="business_rules"}}

 
 

-    Vous pouvez contacter nottre service clientèle pour toutes questions ou réclamations auprès du numéro de téléphone suivant: {{block type="magesetup/imprint_field" value="telephone"}} ou bien par email {{block type="magesetup/imprint_field" value="email"}} ou encore notre formulaire de contact situé sur notre site internet.
+    Vous pouvez contacter nottre service clientèle pour toutes questions ou réclamations auprès du numéro de téléphone suivant: {{block type="magesetup/imprint_field" value="telephone"}} ou bien par email {{block type="magesetup/imprint_field" value="email"}} ou encore notre formulaire de contact situé sur notre site internet.
 

 
 
Droits d'auteur et des marques

diff --git a/src/app/locale/it_IT/template/magesetup/page/imprint.html b/src/app/locale/it_IT/template/magesetup/page/imprint.html
index ef685b7b..7928bc57 100644
--- a/src/app/locale/it_IT/template/magesetup/page/imprint.html
+++ b/src/app/locale/it_IT/template/magesetup/page/imprint.html
@@ -25,7 +25,7 @@ 
{{block type="magesetup/imprint_field" value="shop_name"}}

 
 
{{block type="magesetup/imprint_field" value="business_rules"}}

 
-
Potete contattare il nostro Servizio Clienti per informazioni e reclami telefonicamente al numero {{block type="magesetup/imprint_field" value="telephone"}} o tramite e-mail all'indirizzo {{block type="magesetup/imprint_field" value="email"}}. Per qualsiasi informazione è inoltre possibile usare il form sulla nostra pagina Contatti.

+
Potete contattare il nostro Servizio Clienti per informazioni e reclami telefonicamente al numero {{block type="magesetup/imprint_field" value="telephone"}} o tramite e-mail all'indirizzo {{block type="magesetup/imprint_field" value="email"}}. Per qualsiasi informazione è inoltre possibile usare il form sulla nostra pagina Contatti.

 
 
Responsabilità per i link (Esempio)

 

From 27f56f364b059694b657d4dca5117ad510229b5c Mon Sep 17 00:00:00 2001
From: Rico Neitzel 
Date: Mon, 25 Nov 2013 09:41:14 +0100
Subject: [PATCH 34/37] [FIX] Duplicate VATID output in legal.html removed

it's already present in tax.phtml and doesn't need a second output
---
 .../base/default/template/magesetup/imprint/legal.phtml        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml b/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml
index f50fe092..e17b16ee 100644
--- a/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml
+++ b/src/app/design/frontend/base/default/template/magesetup/imprint/legal.phtml
@@ -40,9 +40,6 @@
 getContentResponsablePressLaw()))): ?>
 __('Responsible in the interests of the press law') ?>: getContentResponsablePressLaw() ?>

 
-getVatId()))): ?>
-    __('VAT-ID') ?>: getVatId() ?>

-
 getCourt()))): ?>
     __('Register court') ?>: getCourt() ?>

 

From 0022e84765a03eb30081caa715807beba36772a0 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz 
Date: Mon, 9 Dec 2013 22:07:56 +0100
Subject: [PATCH 35/37] [+TASK[ Add additional information to composer.json for
 automatic creation of MagentoConnect Package, using
 https://github.com/avstudnitz/Magento-Packager

---
 composer.json | 151 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 129 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index 1f26be15..5354d619 100644
--- a/composer.json
+++ b/composer.json
@@ -1,25 +1,132 @@
 {
-  "name": "firegento/magesetup",
-  "license": ["GPL-3.0"],
-  "type": "magento-module",
-  "description": "MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.",
-  "homepage": "https://github.com/firegento/firegento-magesetup",
-  "require": {
-    "magento-hackathon/magento-composer-installer": "*"
-  },
-  "require-dev": {
-    "ecomdev/mage-ci": "master-dev"
-  },
-  "config": {
-    "bin-dir": "bin"
-  },
-  "repositories": [
-    {
-      "type": "composer",
-      "url": "http://packages.firegento.com"
+    "name": "firegento/magesetup",
+    "license": "GPL-3.0",
+    "type": "magento-module",
+    "description": "
Central features of MageSetup are:
  • Setting of important configuration settings
  • Predefined tax settings and tax classes for shipping from several countries to worldwide destinations
  • Assign new tax classes to all products (configurable)
  • Creation of email templates based on the local language pack. Legal texts can be added to some templates automatically.
  • Creation and Activation of Checkout Agreements. Agreements can be shown at customer registration instead of or additional to the checkout. They can be required or not.
  • Creation of default CMS pages like imprint, terms and conditions, privacy, shipping, payment methods.
  • Create email templates, cms pages and blocks as well as checkout agreements for store views with a different language as well
  • Possibility to add tax and/or shipping info to all prices
  • Automatical generation of meta data to products
  • Saving of every status change of newsletter subscriptions
  • Presets are configurable via xml files for every country seperately
  • Many more, see the full list of features including several screenshots.
",
+    "homepage": "https://github.com/firegento/firegento-magesetup",
+    "authors": [
+        {
+            "name":"Team FireGento",
+            "email":"team@firegento.com"
+        }
+    ],
+    "require": {
+        "magento-hackathon/magento-composer-installer": "*"
+    },
+    "require-dev": {
+        "ecomdev/mage-ci": "master-dev"
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://packages.firegento.com"
+        }
+    ],
+    "extra": {
+        "magento-root-dir": "test/",
+        "magento_connect":{
+            "name":"FireGento_MageSetup",
+            "summary":"MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.",
+            "channel":"community",
+            "php_min":"5.3.0",
+            "php_max":"7.9.9",
+            "stability":"stable",
+            "license_uri":"http://www.gnu.org/licenses/gpl-3.0.html",
+            "content":[
+                {
+                    "type":"magecommunity",
+                    "structure":"dir",
+                    "path":"FireGento/MageSetup"
+                },
+                {
+                    "type":"mageetc",
+                    "structure":"file",
+                    "path":"modules/FireGento_MageSetup.xml"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"de_AT/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"de_DE/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"de_DE/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"en_US/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"en_US/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"ru_RU/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"ru_RU/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"fr_FR/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"fr_FR/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"it_IT/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"it_IT/template/magesetup"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"file",
+                    "path":"adminhtml/default/default/layout/magesetup.xml"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"dir",
+                    "path":"adminhtml/default/default/template/magesetup"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"file",
+                    "path":"frontend/base/default/layout/magesetup.xml"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"dir",
+                    "path":"frontend/base/default/template/magesetup"
+                },
+                {
+                    "type":"mageskin",
+                    "structure":"dir",
+                    "path":"frontend/base/default/css/magesetup"
+                }
+            ]
+        }
     }
-  ],
-  "extra":{
-    "magento-root-dir": "test/"
-  }
 }

From 8b472e28de22fc2d7284f7cdd7a9c0abf6918e14 Mon Sep 17 00:00:00 2001
From: Rouven Alexander Rieker 
Date: Mon, 9 Dec 2013 22:54:38 +0100
Subject: [PATCH 36/37] [TASK] Add locales 'de_CH' and 'fr_CH' to composer.json
 for MC package generation

---
 composer.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/composer.json b/composer.json
index 5354d619..98223a23 100644
--- a/composer.json
+++ b/composer.json
@@ -51,6 +51,11 @@
                     "structure":"file",
                     "path":"de_AT/FireGento_MageSetup.csv"
                 },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"de_CH/template/magesetup"
+                },
                 {
                     "type":"magelocale",
                     "structure":"file",
@@ -81,6 +86,11 @@
                     "structure":"dir",
                     "path":"ru_RU/template/magesetup"
                 },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"fr_CH/template/magesetup"
+                },
                 {
                     "type":"magelocale",
                     "structure":"file",

From 5ea63fcd556b4ed3e1d0339b559b4eb62ea09a19 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz 
Date: Sat, 14 Dec 2013 21:53:32 +0100
Subject: [PATCH 37/37] [~TASK] Bumped version to 2.1.0

---
 src/app/code/community/FireGento/MageSetup/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/code/community/FireGento/MageSetup/etc/config.xml b/src/app/code/community/FireGento/MageSetup/etc/config.xml
index e8a0a193..0dd96a2f 100644
--- a/src/app/code/community/FireGento/MageSetup/etc/config.xml
+++ b/src/app/code/community/FireGento/MageSetup/etc/config.xml
@@ -21,7 +21,7 @@
 
     
         
-            2.0.3
+            2.1.0