From b5bb26e445e87a63c19cbffc503e5ac90b70191d Mon Sep 17 00:00:00 2001 From: Levi Date: Tue, 13 Jun 2017 01:48:36 -0500 Subject: [PATCH 1/3] added missing translations for datacenterlight --- Changelog | 2 ++ .../locale/de/LC_MESSAGES/django.mo | Bin 5294 -> 5459 bytes .../locale/de/LC_MESSAGES/django.po | 18 +++++++++++++++++- .../templates/datacenterlight/index.html | 8 ++++---- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Changelog b/Changelog index 199ce724..fe281422 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +1.0.13: 2017-06-13 + * [datacenterlight] Added translations for email and name placeholders fields 1.0.12: 2017-06-13 * [datacenterlight] Added from address for EmailMessage that was missing 1.0.11: 2017-06-12 diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 0e1ee99d9c5623899fd6c0667dc4338f570f6765..b35db4f41660ceafe888e35eac6545e67f02825b 100644 GIT binary patch delta 1075 zcmX}rPe@cz6vy#1I%dAfwCSH(+Ot2F;}|mzN!TVBr%;+eTBM7RL59+r84%luHJgMW zf@IKb!EQatg4&pr4;FdrC3mwLPF^&O# zY&0ucf(~=mj|Xu8b>k?8aRT#r&z~>jZpJ$}K(fkW9tO!miEMGv`Z8+$4(>;XMSHLf zFJTwf@&7hS=Q0yB{tch-JmWPyf=->;HS9n=c-nUsRkbJh5v9f1nFJJ5xjwms09u6-p-nll36I6=`B|@erLTorjpj2K3roLpq~4g!w3vT6-%N@oJPGO{A{fRCu%K(T7+oQ`KxJHT6j_en#!cg=p3~}J?uEqNvJh@RIU`K zQqB{2n$U-%O{r-UN=#K%h18-R#wmE&x8pHFr8z^W=^WKuf-kP}BI@((AoQ+K*-EM5 ze`_q|s@*^^ml?lPdK6r)X&EWpope(gTcvw7lgnDJke|9Wmv)9j2{#t+i}!ZN&c#Y^ gor$VasQyK5Ykzh;pLJ8+X)V*htt?9y@|h|72Q>g}#{d8T delta 936 zcmYk*%}Z2K7{~EvbS7U$Q)ebK9UWiFamI>9n|x`J(i@5hV&cXaMr4Wtd;0?hT1bnC zpcfi&5o!=Iw3(H)sZHuaC?Z@05-r@=AK~|Ryo(NV?&qE}_ulh7&$;(!@?#>u8}h$0 zS`R%+pYxfeak-2G?S8pg5+C4IT*k}z7mr}K->d@9U=Y(dj-%fADONLngDG6adi;g_ z^0vqE7!&)b3w;5z5Z2%##!&Omuo4S6MvyC5VEm6L6u=S(cOB~f0*0}OHTVUu;Wk!b zgoj;ceQV=H7vyjdA7Kj?aT+&K4~}w|jN@tS!*`hR<^%kx3e=-AjpAJboy1d&Kk?@* z{=u6#$f8xOZ?8EaD0_=4&3l}}bv%l}T30G-#BpWtV# z!z(llgCV`bYqc2XK;dX775hd%G z>$n#8R1j)Ph9bD8txz@CRn}Df|7%U0Qx)r`pY-PSE)a*SL@Sc4%NE>=q{{Wso9Uf& zZ9$B#uSwgajCoh>1YL~}htzYqdk+_~^Q9l<5npNF|26Ppqk1-&YEKOepYQ8Em+mhm Nf_KVFE442x4ge=aO(p;U diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index d658eda9..299163f9 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-11 23:23+0200\n" +"POT-Creation-Date: 2017-06-13 01:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -206,6 +206,22 @@ msgstr "Standort des Datacenters ist in der Schweiz" msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" +#: templates/datacenterlight/index.html:289 +msgid "Name" +msgstr "" + +#: templates/datacenterlight/index.html:290 +msgid "Your Name" +msgstr "Dein Name" + +#: templates/datacenterlight/index.html:293 +msgid "Email" +msgstr "E-Mail-Adresse" + +#: templates/datacenterlight/index.html:294 +msgid "Your Email" +msgstr "Deine E-Mail" + #: templates/datacenterlight/index.html:297 #: templates/datacenterlight/order.html:133 #: templates/datacenterlight/pricing.html:161 diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 74c98913..91772785 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -286,12 +286,12 @@ Ipv6 Only
-->
- - + +
- - + +
From 11e59c8ea32c5f754846585a8a54c7790f07e7d1 Mon Sep 17 00:00:00 2001 From: Levi Date: Tue, 13 Jun 2017 13:47:55 -0500 Subject: [PATCH 2/3] added translations --- .../locale/de/LC_MESSAGES/django.mo | Bin 5879 -> 5867 bytes .../locale/de/LC_MESSAGES/django.po | 219 +++--------------- .../templates/datacenterlight/home.html | 4 +- 3 files changed, 35 insertions(+), 188 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index a9ce890d574e5c3ebd71565ebcacb3f5768795ed..028dfcbe636433a6b1ec9cb1da5fde536671ad7f 100644 GIT binary patch delta 628 zcmXZYODIHP6u|LwXUv!}#`~G~tJKWM7)4lEk+2X+Nn}A%Qu4^cM0uo0b0f;55wWnF zg=E3XO4x|SWMN~$UUvS6soVLT@7()+_k8Eu_vzc(53Y;IlTE~r{dSQA+&~BJVw)in z#y!@b@gm8%%u7<)M*aQ()9@VA@fs8H5!*3}POK!fVh!s1d8Y)Wo@A9m9^PU%Mo|y0 zCa8@BFSg(*PQ~iEE)gCnC+G#Lah!&SQ5$*SFBSNX9(1_>8?VI_)=lo9NEb;bg$N#D z5_S{fa2Ts_6m`Q+tbT@i;05ZBUU3b-@EE5V(-`KkNhh|1dgBnj(BKiiv7QYwH*)Fa z6s9brsH2_0Y@ESN+(aGm3HIP6>SPi#MEWorb>AdT;2aj>2M(g0L$rYr)O}Ofj3o;s zcO*B+)MO>=-w<}NJ~Xc^d4`zJmNKK%{IL|d3#c-tzk8>d71lbV+#Il$8Tsa-wa7?~ dgsoQ=bI4v3*|mFZ4u7E7A84rcNA6u7*Du~(Nge^O7+C*|Ofp$E= z9!=x~6Rf{-L<(@5m!y(H_5BgL@eGUc2J`S4d+`k&*h+|E7pnJb4$&n{Vo>nl9S-6f zs)IWT$|%8)19*sfrtWi!@JN8rf}J=+!!cBiJaLN;Kd=!?T>p(nu#k1POBd-U8KGce z8uM|2kcBa9#yM0Q_A_-8)q&@zE_%gv{KkD;VocN6z$P`ZEmVJ;#77!T;|uE*ow4Or9V1w` zL2^xUi%d;+%KlAaAM0b|!s5}2j0cNXt1^BpHLgmkjOp*c8w{T{q}3baR+a74IZE5QWgw0E5qw^PH=1+S7 diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 4daea92f..f97b2a6b 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,8 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -"POT-Creation-Date: 2017-06-09 16:08-0500\n" +"POT-Creation-Date: 2017-06-13 13:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -76,58 +75,7 @@ msgstr "" msgid "Thank you!" msgstr "Vielen Dank!" -<<<<<<< HEAD #: templates/datacenterlight/home.html:15 -======= -#: templates/datacenterlight/index.html:62 -#: templates/datacenterlight/index.html:160 -#: templates/datacenterlight/index.html:383 -#: templates/datacenterlight/order.html:24 -#: templates/datacenterlight/order.html:165 -#: templates/datacenterlight/pricing.html:62 -#: templates/datacenterlight/pricing.html:190 -#: templates/datacenterlight/success.html:23 -msgid "What is it" -msgstr "Was ist es?" - -#: templates/datacenterlight/index.html:65 -#: templates/datacenterlight/index.html:189 -#: templates/datacenterlight/index.html:386 -#: templates/datacenterlight/order.html:27 -#: templates/datacenterlight/order.html:168 -#: templates/datacenterlight/pricing.html:65 -#: templates/datacenterlight/pricing.html:193 -#: templates/datacenterlight/success.html:26 -msgid "Scale out" -msgstr "Skalierung" - -#: templates/datacenterlight/index.html:68 -#: templates/datacenterlight/index.html:215 -#: templates/datacenterlight/index.html:389 -#: templates/datacenterlight/order.html:30 -#: templates/datacenterlight/order.html:171 -#: templates/datacenterlight/pricing.html:68 -#: templates/datacenterlight/pricing.html:196 -#: templates/datacenterlight/success.html:29 -msgid "Reliable and light" -msgstr "Zuverlässig und leicht" - -#: templates/datacenterlight/index.html:71 -msgid "Order VM" -msgstr "VM bestellen" - -#: templates/datacenterlight/index.html:74 -#: templates/datacenterlight/index.html:396 -#: templates/datacenterlight/order.html:36 -#: templates/datacenterlight/order.html:178 -#: templates/datacenterlight/pricing.html:74 -#: templates/datacenterlight/pricing.html:203 -#: templates/datacenterlight/success.html:35 -msgid "Contact" -msgstr "Kontakt" - -#: templates/datacenterlight/index.html:127 ->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa msgid "Finally, an affordable VM hosting in Switzerland!" msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" @@ -140,7 +88,8 @@ msgid "I want it!" msgstr "Das will ich haben!" #: templates/datacenterlight/home.html:46 -#: templates/datacenterlight/includes/_footer.html:14 +#: templates/datacenterlight/includes/_footer.html:11 +#: templates/datacenterlight/includes/_footer.html:31 #: templates/datacenterlight/includes/_navbar.html:26 msgid "What is it" msgstr "Was ist es?" @@ -157,7 +106,7 @@ msgstr "" "errichten.
" #: templates/datacenterlight/home.html:61 -msgid "Only wants you to pay for what you actually need.\\u2028" +msgid "Only wants you to pay for what you actually need." msgstr "" "Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine " "Ressourcen individuell aus!
" @@ -165,7 +114,7 @@ msgstr "" #: templates/datacenterlight/home.html:65 msgid "" "Is creative, using a modern and alternative design for a data center in " -"order to make it more sustainable and affordable at the same time.\\u2028" +"order to make it more sustainable and affordable at the same time." msgstr "" "Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze " "macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu " @@ -181,7 +130,8 @@ msgstr "" "Lizenzgebühren verzichten können.
" #: templates/datacenterlight/home.html:89 -#: templates/datacenterlight/includes/_footer.html:17 +#: templates/datacenterlight/includes/_footer.html:14 +#: templates/datacenterlight/includes/_footer.html:34 #: templates/datacenterlight/includes/_navbar.html:29 msgid "Scale out" msgstr "Skalierung" @@ -197,7 +147,8 @@ msgstr "" "komponenten hinzugekauft und skalieren so das Datencenter." #: templates/datacenterlight/home.html:115 -#: templates/datacenterlight/includes/_footer.html:20 +#: templates/datacenterlight/includes/_footer.html:17 +#: templates/datacenterlight/includes/_footer.html:37 #: templates/datacenterlight/includes/_navbar.html:32 msgid "Reliable and light" msgstr "Zuverlässig und leicht" @@ -212,27 +163,16 @@ msgstr "" "Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser " "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." -<<<<<<< HEAD #: templates/datacenterlight/home.html:136 #: templates/datacenterlight/order.html:9 #: templates/datacenterlight/pricing.html:9 msgid "We are cutting down the costs significantly!" msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" -======= -#: templates/datacenterlight/index.html:236 -#: templates/datacenterlight/order.html:143 -#: templates/datacenterlight/pricing.html:168 -msgid "Simple and affordable: Try our virtual machine with featherlight price." -msgstr "" -"Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit " -"federleichten Preisen." ->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa #: templates/datacenterlight/home.html:137 msgid "Affordable VM hosting based in Switzerland" msgstr "Bezahlbares VM Hosting in der Schweiz" -<<<<<<< HEAD #: templates/datacenterlight/home.html:144 #: templates/datacenterlight/order.html:22 #: templates/datacenterlight/pricing.html:22 @@ -265,22 +205,24 @@ msgstr "Fragen?" msgid "Contact us!" msgstr "Kontaktiere uns!" -#: templates/datacenterlight/includes/_footer.html:10 -msgid "Home" -msgstr "Home" +#: templates/datacenterlight/includes/_footer.html:20 +#: templates/datacenterlight/includes/_navbar.html:35 +msgid "Order VM" +msgstr "VM bestellen" #: templates/datacenterlight/includes/_footer.html:23 -msgid "Pricing" -msgstr "Preise" - -#: templates/datacenterlight/includes/_footer.html:27 +#: templates/datacenterlight/includes/_footer.html:44 #: templates/datacenterlight/includes/_navbar.html:38 msgid "Contact" msgstr "Kontakt" -#: templates/datacenterlight/includes/_navbar.html:35 -msgid "Order VM" -msgstr "VM bestellen" +#: templates/datacenterlight/includes/_footer.html:27 +msgid "Home" +msgstr "Home" + +#: templates/datacenterlight/includes/_footer.html:40 +msgid "Pricing" +msgstr "Preise" #: templates/datacenterlight/order.html:30 #: templates/datacenterlight/pricing.html:30 @@ -301,88 +243,6 @@ msgstr "" #: templates/datacenterlight/order.html:87 #: templates/datacenterlight/pricing.html:86 -======= -#: templates/datacenterlight/index.html:248 -#: templates/datacenterlight/order.html:81 -#: templates/datacenterlight/pricing.html:119 -msgid "VM hosting" -msgstr "VM Hosting" - - -#: templates/datacenterlight/index.html:252 -msgid "month" -msgstr "Monat" - -#: templates/datacenterlight/index.html:256 -#: templates/datacenterlight/order.html:89 -#: templates/datacenterlight/pricing.html:127 -msgid "Hosted in Switzerland" -msgstr "Standort des Datacenters ist in der Schweiz" - -#: templates/datacenterlight/index.html:273 -#: templates/datacenterlight/order.html:106 -#: templates/datacenterlight/pricing.html:144 -msgid "GB Storage (SSD)" -msgstr "GB Storage (SSD)" - -#: templates/datacenterlight/index.html:297 -#: templates/datacenterlight/order.html:133 -#: templates/datacenterlight/pricing.html:161 -msgid "Order Now!" -msgstr "Bestelle jetzt!" - -#: templates/datacenterlight/index.html:302 -msgid "Want to know more? Subscribe to our newsletter!" -msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" - -#: templates/datacenterlight/index.html:364 -#: templates/datacenterlight/index.html:279 -#: templates/datacenterlight/index.html:317 -msgid "I want to have it!" -msgstr "Das möchte ich haben!" - -#: templates/datacenterlight/index.html:344 -msgid "Switzerland " -msgstr "Schweiz" - -#: templates/datacenterlight/index.html:361 -msgid "Questions?" -msgstr "Fragen?" - -#: templates/datacenterlight/index.html:361 -msgid "Contact us!" -msgstr "Kontaktiere uns!" - -#: templates/datacenterlight/index.html:379 -#: templates/datacenterlight/order.html:161 -#: templates/datacenterlight/pricing.html:186 -msgid "Home" -msgstr "Home" - -#: templates/datacenterlight/index.html:377 -#: templates/datacenterlight/index.html:354 -#: templates/datacenterlight/new-order.html:212 -#: templates/datacenterlight/order.html:212 -#: templates/datacenterlight/index.html:392 -#: templates/datacenterlight/order.html:174 -#: templates/datacenterlight/pricing.html:199 -msgid "Pricing" -msgstr "Preise" - -#: templates/datacenterlight/order.html:33 -#: templates/datacenterlight/pricing.html:71 -#: templates/datacenterlight/success.html:32 -msgid "Buy VM" -msgstr "VM Kaufen" - -#: templates/datacenterlight/order.html:68 -#: templates/datacenterlight/pricing.html:106 -msgid "We are cutting down the costs significantly!" -msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" - -#: templates/datacenterlight/order.html:146 -#: templates/datacenterlight/pricing.html:171 ->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa msgid "" "Our VMs are hosted in Glarus, Switzerland, and our website is currently " "running in BETA mode. If you want more information that you did not find on " @@ -398,21 +258,28 @@ msgstr "" "uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein " "Anliegen kümmern!" -<<<<<<< HEAD #: templates/datacenterlight/success.html:8 -======= -#: templates/datacenterlight/success.html:62 ->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa msgid "Thank you for order! Our team will contact you via email" msgstr "" "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit " "Ihnen via E-Mail in Verbindung." -<<<<<<< HEAD #: templates/datacenterlight/success.html:10 msgid "as soon as possible!" msgstr "" +#~ msgid "month" +#~ msgstr "Monat" + +#~ msgid "Want to know more? Subscribe to our newsletter!" +#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" + +#~ msgid "I want to have it!" +#~ msgstr "Das möchte ich haben!" + +#~ msgid "Buy VM" +#~ msgstr "VM Kaufen" + #~ msgid "" #~ "Reuse existing factory halls intead of building an expensive building." #~ msgstr "" @@ -433,26 +300,6 @@ msgstr "" #~ msgid "More Info" #~ msgstr "Weitere Informationen" -#~ msgid "Want to know more? Subscribe to our newsletter!" -#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" - -#~ msgid "I want to have it!" -#~ msgstr "Das möchte ich haben!" - -#~ msgid "Buy VM" -#~ msgstr "VM Kaufen" -======= -#: templates/datacenterlight/success.html:64 -msgid "as soon as possible!" -msgstr "" - -#~ msgid "Based in Switzerland" -#~ msgstr "Standort des Datacenters ist in der Schweiz" - -#~ msgid "10 GB Storage (SSD)" -#~ msgstr "10 GB Storage (SSD)" ->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa - #~ msgid "Request Newsletter" #~ msgstr "Newsletter abonnieren" diff --git a/datacenterlight/templates/datacenterlight/home.html b/datacenterlight/templates/datacenterlight/home.html index eb2decd2..84785b05 100755 --- a/datacenterlight/templates/datacenterlight/home.html +++ b/datacenterlight/templates/datacenterlight/home.html @@ -58,11 +58,11 @@
  • -

    {% trans "Only wants you to pay for what you actually need.
" %}

    +

    {% trans "Only wants you to pay for what you actually need." %}

  • -

    {% trans "Is creative, using a modern and alternative design for a data center in order to make it more sustainable and affordable at the same time.
" %}

    +

    {% trans "Is creative, using a modern and alternative design for a data center in order to make it more sustainable and affordable at the same time." %}

  • From 8ec290a59f6dddb9355c918b65f0638b0a6a34ba Mon Sep 17 00:00:00 2001 From: Levi Date: Tue, 13 Jun 2017 14:11:11 -0500 Subject: [PATCH 3/3] cleaned up index.html --- .../templates/datacenterlight/index.html | 44 +------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 8082764b..088e6466 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -224,7 +224,7 @@ - --> --> + -->
    @@ -266,47 +266,5 @@
    - - {% endblock %} \ No newline at end of file