From 683e466d0dfb6dcda89ffc80a46c2efda7479d56 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Fri, 2 Dec 2016 17:51:18 -0800
Subject: [PATCH] Added translation for the Cookie message
---
VIPSWeb/locale/bg/LC_MESSAGES/django.mo | Bin 738 -> 738 bytes
VIPSWeb/locale/bg/LC_MESSAGES/django.po | 44 ++++++++--------
VIPSWeb/locale/bs/LC_MESSAGES/django.mo | Bin 1051 -> 1051 bytes
VIPSWeb/locale/bs/LC_MESSAGES/django.po | 44 ++++++++--------
VIPSWeb/locale/de/LC_MESSAGES/django.mo | Bin 421 -> 421 bytes
VIPSWeb/locale/de/LC_MESSAGES/django.po | 32 ++++++------
VIPSWeb/locale/fi/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
VIPSWeb/locale/fi/LC_MESSAGES/django.po | 44 ++++++++--------
VIPSWeb/locale/nb/LC_MESSAGES/django.mo | Bin 2874 -> 2812 bytes
VIPSWeb/locale/nb/LC_MESSAGES/django.po | 53 +++++++++----------
VIPSWeb/locale/vi/LC_MESSAGES/django.mo | Bin 1987 -> 1659 bytes
VIPSWeb/locale/vi/LC_MESSAGES/django.po | 56 ++++++++++++---------
VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo | Bin 2574 -> 2318 bytes
VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po | 40 +++++++++------
VIPSWeb/templates/base.html | 2 +-
15 files changed, 172 insertions(+), 143 deletions(-)
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.mo b/VIPSWeb/locale/bg/LC_MESSAGES/django.mo
index 30947a0c30b3b041440b2cbdd0d657dcddf867e6..5196e6f4037927bb2699ed329c8d994135def7c8 100644
GIT binary patch
delta 27
icmaFF`iOOd2qT}Nk*<M}f}y#UiG{9##bzbO1B?J@rUvc+
delta 27
icmaFF`iOOd2qT|?xvrs+f}yFEp|Q4s(Pkya1B?J@W(MH^
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
index 2b0dd822..0671417f 100644
--- a/VIPSWeb/locale/bg/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 15:13+0200\n"
+"POT-Creation-Date: 2016-12-02 17:48-0800\n"
"PO-Revision-Date: 2014-05-14 09:31+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,19 +30,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.5\n"
-#: local_settings.py:166
+#: local_settings.py:169
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:176
+#: local_settings.py:179
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:182
+#: local_settings.py:185
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:189
+#: local_settings.py:192
msgid "Other models and services"
msgstr ""
@@ -54,40 +54,42 @@ msgstr ""
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/503.html:3 templates/503.html.py:5
-msgid "Temporarily down for maintenance"
-msgstr ""
-
-#: templates/503.html:6
-msgid ""
-"We are sorry, but the web site is currently underdoing maintenance. We "
-"should be back online shortly."
-msgstr ""
-
-#: templates/base.html:57
+#: templates/base.html:59
msgid "Toggle navigation"
msgstr "Навигация"
-#: templates/base.html:80
+#: templates/base.html:82
msgid "Language"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:93
msgid "Administration"
msgstr ""
-#: templates/base.html:93
+#: templates/base.html:95
msgid "Sign out"
msgstr ""
-#: templates/base.html:97
+#: templates/base.html:99
msgid "Sign in"
msgstr ""
-#: templates/base.html:114
+#: templates/base.html:116
msgid "This is the default page contents."
msgstr "Това е съдържанието на страницата по подразбиране. "
+#: templates/base.html:143
+msgid "This website uses cookies to give you the best possible user experience"
+msgstr ""
+
+#: templates/base.html:143
+msgid "Got it!"
+msgstr ""
+
+#: templates/base.html:143
+msgid "More info"
+msgstr ""
+
#: templates/index.html:25
msgid "Welcome"
msgstr "Добре дошли"
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.mo b/VIPSWeb/locale/bs/LC_MESSAGES/django.mo
index d9ab5621753bd319d359f1bc5282a08de565a88e..350721d2bc0029d104b405f7d7db811df302f292 100644
GIT binary patch
delta 27
icmbQuF`Hup7ZabMk*<M}f}y#UiG{9##bya6W+nhwYXz79
delta 27
icmbQuF`Hup7Zaa>xvrs+f}yFEp|Q4s(PjxIW+nhwD+P-H
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
index 090a6f51..b5a6199a 100644
--- a/VIPSWeb/locale/bs/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 15:13+0200\n"
+"POT-Creation-Date: 2016-12-02 17:48-0800\n"
"PO-Revision-Date: 2015-02-13 11:26+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -19,19 +19,19 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: local_settings.py:166
+#: local_settings.py:169
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:176
+#: local_settings.py:179
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:182
+#: local_settings.py:185
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:189
+#: local_settings.py:192
msgid "Other models and services"
msgstr ""
@@ -43,40 +43,42 @@ msgstr ""
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/503.html:3 templates/503.html.py:5
-msgid "Temporarily down for maintenance"
-msgstr ""
-
-#: templates/503.html:6
-msgid ""
-"We are sorry, but the web site is currently underdoing maintenance. We "
-"should be back online shortly."
-msgstr ""
-
-#: templates/base.html:57
+#: templates/base.html:59
msgid "Toggle navigation"
msgstr "Prebaci navigaciju "
-#: templates/base.html:80
+#: templates/base.html:82
msgid "Language"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:93
msgid "Administration"
msgstr ""
-#: templates/base.html:93
+#: templates/base.html:95
msgid "Sign out"
msgstr ""
-#: templates/base.html:97
+#: templates/base.html:99
msgid "Sign in"
msgstr ""
-#: templates/base.html:114
+#: templates/base.html:116
msgid "This is the default page contents."
msgstr "Ovo je zadani sadržaj stranice "
+#: templates/base.html:143
+msgid "This website uses cookies to give you the best possible user experience"
+msgstr ""
+
+#: templates/base.html:143
+msgid "Got it!"
+msgstr ""
+
+#: templates/base.html:143
+msgid "More info"
+msgstr ""
+
#: templates/index.html:25
msgid "Welcome"
msgstr "Dobrodošli "
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.mo b/VIPSWeb/locale/de/LC_MESSAGES/django.mo
index 0d937a96065f4e94585f8f7e3437143836cc3ece..7f1a56c8a641fd732a2f77ad0fb0b67d3cdbd657 100644
GIT binary patch
delta 25
gcmZ3=yp(xD51*ltu7Qz)p}Ccbg|30c##!8q09v{RhX4Qo
delta 25
gcmZ3=yp(xD51)ahu91a;p|O>Lv95vn##!8q09zCWhX4Qo
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.po b/VIPSWeb/locale/de/LC_MESSAGES/django.po
index cd6d1acc..5be3f1f0 100644
--- a/VIPSWeb/locale/de/LC_MESSAGES/django.po
+++ b/VIPSWeb/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: 2016-09-28 13:03-0700\n"
+"POT-Creation-Date: 2016-12-02 17:48-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:166
+#: local_settings.py:169
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:176
+#: local_settings.py:179
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:182
+#: local_settings.py:185
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:189
+#: local_settings.py:192
msgid "Other models and services"
msgstr ""
@@ -42,16 +42,6 @@ msgstr ""
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/503.html:3 templates/503.html.py:5
-msgid "Temporarily down for maintenance"
-msgstr ""
-
-#: templates/503.html:6
-msgid ""
-"We are sorry, but the web site is currently underdoing maintenance. We "
-"should be back online shortly."
-msgstr ""
-
#: templates/base.html:59
msgid "Toggle navigation"
msgstr ""
@@ -76,6 +66,18 @@ msgstr ""
msgid "This is the default page contents."
msgstr ""
+#: templates/base.html:143
+msgid "This website uses cookies to give you the best possible user experience"
+msgstr ""
+
+#: templates/base.html:143
+msgid "Got it!"
+msgstr ""
+
+#: templates/base.html:143
+msgid "More info"
+msgstr ""
+
#: templates/index.html:25
msgid "Welcome"
msgstr ""
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.mo b/VIPSWeb/locale/fi/LC_MESSAGES/django.mo
index c9c409213fcec5dfe1c0b5c5388c6505c5f37e05..80e4eae9bf8c174a04fee77dbf19177824983fa5 100644
GIT binary patch
delta 25
gcmbQpGLdD%9X>-NT>~QpLvt$=3ta<?jjz-h0bY;?9RL6T
delta 25
gcmbQpGLdD%9X<ndT|*-ULsKh5V{HSYjjz-h0bX4P5C8xG
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.po b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
index a880ff43..8792daa5 100644
--- a/VIPSWeb/locale/fi/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 15:13+0200\n"
+"POT-Creation-Date: 2016-12-02 17:48-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:166
+#: local_settings.py:169
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:176
+#: local_settings.py:179
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:182
+#: local_settings.py:185
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:189
+#: local_settings.py:192
msgid "Other models and services"
msgstr ""
@@ -42,40 +42,42 @@ msgstr ""
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/503.html:3 templates/503.html.py:5
-msgid "Temporarily down for maintenance"
-msgstr ""
-
-#: templates/503.html:6
-msgid ""
-"We are sorry, but the web site is currently underdoing maintenance. We "
-"should be back online shortly."
-msgstr ""
-
-#: templates/base.html:57
+#: templates/base.html:59
msgid "Toggle navigation"
msgstr ""
-#: templates/base.html:80
+#: templates/base.html:82
msgid "Language"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:93
msgid "Administration"
msgstr ""
-#: templates/base.html:93
+#: templates/base.html:95
msgid "Sign out"
msgstr ""
-#: templates/base.html:97
+#: templates/base.html:99
msgid "Sign in"
msgstr ""
-#: templates/base.html:114
+#: templates/base.html:116
msgid "This is the default page contents."
msgstr ""
+#: templates/base.html:143
+msgid "This website uses cookies to give you the best possible user experience"
+msgstr ""
+
+#: templates/base.html:143
+msgid "Got it!"
+msgstr ""
+
+#: templates/base.html:143
+msgid "More info"
+msgstr ""
+
#: templates/index.html:25
msgid "Welcome"
msgstr "Tervetuloa"
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.mo b/VIPSWeb/locale/nb/LC_MESSAGES/django.mo
index f3d083806fd92f80e42fcf56eaf9370c8c12e682..deef526dca12341707a514da1020286e5b6ef4ed 100644
GIT binary patch
delta 1090
zcmdlb_D8h-o)F7a1_lNO6$S<d83qOh8%72OQw9cx7$%S?1A_rG0|Ore1A`$m0|O5O
z1A_xI1A_nq1A{L!1A_<y14A4$0|P4q14A)XT_rOE11AFmLkBYhgAfA)!z5+~26hGp
zhNa953}Orn3~QMg7`Pc27>+PAFmNz1)H7UQW?<lFU|_h(%)lVQz`*blY7r9)#9)3F
zh=HOk5C_P!FffQRFfiz_Kpf!2!oVQOz`zjB!oa}7z`#%ll`msqU@%}{VCZ3iIAAXe
z*g}S*Q2sd<1_ot@dIpATEDQ`v3=9mvSQr@G85kI3Ss54v85kH+Ss56b85kJKSs56N
z7#J9SvqBuI#|AObj*Wq#h>?N8jSUh)JJ})h33iCjud_2S2s1D+ykdt~{Er=?pPd7u
zUz~%1fw!K4fkB>wfq{#GfkBr8qQHU!5=0&x3=C`x3=APq@n{Z+&$BroA<+nx?}N%u
zg^DlbfP~B@sQTj^3=Gl?3=DUn@;^BsQNhN^z))`v@-ZjGg`u1fm&I{HEJ)*oXe{Q0
zq>p}11_oya28J!15DR{AGB7M=U|`_oVqh?4U|`tD1=07E3le3YxEL51A;}0%g3<&i
z-7rH$>cMdaVMBbUzyPrnB&Ns!Ndq7@2!j$1C~=81KoTKH3>3t2AO;kJq7syLc^M$S
z1SM*a6etl&ff&%l4ocMWAZLT(8kDj@K@F7$Q?d+@Pyr=QQ1pNj87P4&PiAGVV0X_i
zQOGP&oLs}4#gSi>s*stNmOuFk^WDjhSd`r|GK&?;Q<I7_OHvg|i&KjglJoPkGgFHd
zO7a!bGs{vHD)UPfN-|Ovl2VIH6bkZ-i!+mQz)Fi0QY#8li!xL5l2a!$v!0o3%9hAy
zXryakq+n=nWn!UgV6k}#TOT7=aCX+=9eH`FMT(ORIpX<Ji@+`@%1tcJ%FmnJ$MJgd
za!yrem(;wxRESejQu7p&ib}Ini{P$F%P&$myi_4QQz0caT_H73Aw53@swTgnASbmf
iHK#ar@@dX@;=YHM=A;&vfDLB|OU=p7&&^HEV*mh(&zK(o
delta 1153
zcmew(x=XD7o)F7a1_lNOWd;TY83qOh6GjFGeFg>wA106}0|N&$0|Ore0|O^B0|O5O
z1A_!J1A_nq1A{6v1A_<y1A`ee0|P4q1A{kIT_7_911AFmLjp4cgAfA)Ll!dwgBSw?
zLoG7{12+Q$!xUx)1`Y-Wh6T(F4EziX^$aVS85krO7#Ma!Ew}_V@II9Pl$n7+l!1Za
z6VyTu76t}M1_lOM76t|u1_lOm7KpqJ3j>1z0|P@43j+f?0|P@d3&f&sD1QnI#FKMa
z7#I{77#I$)Ffb@F)H5(VWMN<sWME)mVP#-wW?*0tV`X44VqjpH#mc~t%D}*ImKE$$
z24gme!Om<93`L9#4Bl*zklDu$q0h2Ie0+zUfkBvof#E$n!~x745dAzH5dAV73=F&s
z3=AqD@p=XZ1|tqg&^U20Ft9N&F!+Ha7#J8rIUqhu<$wfzHB`O>%J1iZM8O=Wx{VwR
z4AKk?49B7Jk2xSg|AB*n!JL7Cft?fLAbU=TLp(Sc80tZB8o&wB7|Y4Ppv%C(P|3-_
zpu)hwu$&WO!5K~lhQ$mF3=cUO7>pSh7+Sd)7&1Xo#szVhGB+g74Y(N?7#SEC<QX6#
z0E$*nDgrqQM1!IWl+HkGX!5FO5NCh{ha3YWm_U-C1P4lFpo9hDD}o3H1_mi84N6d4
zP&Ozrf#Ms)1*H>E+5ja?5Fdm=iIJHB60)Fp2PJY)!c<}aIi4F5_n?$1J6V^xV)9z%
z%*hHYx8+lF3-XH+i!yU66;krc^AytZixhGbGxJJP^AhutQz!pqQJtK|dMa5Vu_#rc
zIKQZ<Qb!@Fv_zpKBUPb1HA$g3vm{j^vsfXyw5TXGuOz2Zp)@ZgwJ0S&GcO(4AU%cf
zRE6S<{L-8hg``x4q{QTGh5Wpn%sjAYQAtjv-eg_26g~rUT|*-ULsKh5V{HSY&GXs%
z7$;kB#7$nt@lw|}GbJars3bEbGhLyyBr_*HD>W}YH77G&A-$+HFE6!3p)55eCo?-W
zBR?l)av!JK<R6@G>%%e?l2WsC64O(QbQE$^^FYon&P++oQvm7D%g;?eytD{er=CJs
zrb5Qyr3I-)3Wt{}q#a(W08))&Ve#Rm3dMPeMI{Qw`MC<Yr8$}DdJMjYm*%7vmn0Tv
T<>xVkrRHSk=jNs|<uL#NjM}{M
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
index b256ca05..cb504191 100644
--- a/VIPSWeb/locale/nb/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPSWeb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 15:13+0200\n"
+"POT-Creation-Date: 2016-12-02 17:48-0800\n"
"PO-Revision-Date: 2013-11-07 20:18+0200\n"
"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,23 +30,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:166
+#: local_settings.py:169
msgid "Cereals and oilseeds"
msgstr "Korn og oljevekster"
-#: local_settings.py:176
+#: local_settings.py:179
msgid "Potato and vegetables"
msgstr "Poteter og grønnsaker"
-#: local_settings.py:182
+#: local_settings.py:185
msgid "Fruits and berries"
msgstr "Frukt og bær"
-#: local_settings.py:189
+#: local_settings.py:192
msgid "Other models and services"
msgstr "Andre modeller og tjenester"
-#: templates/404.html:3 templates/404.html.py:5
+#: templates/404.html:3
+#: templates/404.html.py:5
msgid "File not found"
msgstr "Fil ikke funnet"
@@ -54,42 +55,42 @@ msgstr "Fil ikke funnet"
msgid "We are sorry, but the requested file was not found"
msgstr "Beklager, men den etterspurte filen ble ikke funnet"
-#: templates/503.html:3 templates/503.html.py:5
-msgid "Temporarily down for maintenance"
-msgstr "Midlertidig utilgjengelig grunnet vedlikehold"
-
-#: templates/503.html:6
-msgid ""
-"We are sorry, but the web site is currently underdoing maintenance. We "
-"should be back online shortly."
-msgstr ""
-"Vi beklager, men websiden gjennomgår vedlikehold. Vi håper å få den "
-"tilgjengelig så snart som mulig."
-
-#: templates/base.html:57
+#: templates/base.html:59
msgid "Toggle navigation"
msgstr "Vis/skjul navigasjon"
-#: templates/base.html:80
+#: templates/base.html:82
msgid "Language"
msgstr "Språk"
-#: templates/base.html:91
+#: templates/base.html:93
msgid "Administration"
msgstr "Administrasjon"
-#: templates/base.html:93
+#: templates/base.html:95
msgid "Sign out"
msgstr "Logg ut"
-#: templates/base.html:97
+#: templates/base.html:99
msgid "Sign in"
msgstr "Logg inn"
-#: templates/base.html:114
+#: templates/base.html:116
msgid "This is the default page contents."
msgstr "Dette er standardinnholdet på siden"
+#: templates/base.html:143
+msgid "This website uses cookies to give you the best possible user experience"
+msgstr "Denne websiden bruker cookies for å gi deg en god brukeropplevelse"
+
+#: templates/base.html:143
+msgid "Got it!"
+msgstr "Skjønner!"
+
+#: templates/base.html:143
+msgid "More info"
+msgstr "Mer informasjon"
+
#: templates/index.html:25
msgid "Welcome"
msgstr "Velkommen"
@@ -98,8 +99,7 @@ msgstr "Velkommen"
msgid ""
"WARNING: We recommend using Chrome on Android handsets. Click OK to install "
"Chrome, or Cancel to proceed without installing Chrome."
-msgstr ""
-"ADVARSEL: Vi anbefaler å bruke nettleseren Chrome på Android-dingser. Klikk "
+msgstr "ADVARSEL: Vi anbefaler å bruke nettleseren Chrome på Android-dingser. Klikk "
"OK for å installere Chrome, eller Cancel for å fortsette uten å installere "
"Chrome."
@@ -174,3 +174,4 @@ msgstr "Velg kultur eller zoom inn for å se liste over varsler"
#: templatetags/template_helper.py:74
msgid "Information"
msgstr "Informasjon"
+
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.mo b/VIPSWeb/locale/vi/LC_MESSAGES/django.mo
index 0c6ef5c492ee201f2eaaf9f9f4357badb8fd2a82..bc62dd79be29756eed78a5cb75da52d9bb35f8fd 100644
GIT binary patch
delta 476
zcmX@i|C^`&o)F7a1_lNO5e5bZ83qQ1Jq!#CvJ4CiF^nKl28Iia3=FIc3=9_;85sB&
z7#OZIGB9v5Ffcr0WMB|uU|{&b$iTqOz`(%H#K0iIz`!8P#K6GAz`&rx1kq;+<=Znc
zFo-fRF!(S*>`G!{U|?ZjsAni=Vqh>}U|^_WVqjorU|?7arMEIMFbFa*FzjVwU@&4}
zU^vgjz`)PIz`(=|Q76RAz>vboz#zp8v9O+nfkB*sfuV;5;=m;=3=EPC3=Hd77#O%1
z7#L2lFfeE`Ffd$ZfjImx3rJr*1A_=F#6^m%3=C2X3=C$h3=9ek3=Dy+5T6yXGB9{B
zFfi1yGBEHmFfbfvWnd6sU|_h)3i0tXRtAPh1_p-zP;(;LKn61~<gqa@fC3R@ImjcR
z@C11PM1wFWRM}Y=7#M^mFJu%~6$XhRVNf8#xFG95fiJT8E+Zr3<o`@=lUFlm@);WG
d8W<@Unp>Gz=o(mTR$|F!n!K8=c=AGaB>?{8EkOVP
delta 753
zcmey(bC|#Wo)F7a1_lNOF$M+(83qQ1GYkw2vJ4CiHH;up28Iue3=FIc3=AI`85sB&
z7#O}YGB9v5Ffgz&LG%bPF)(m5FfgbyF)&ClFfbT1F);8jFfjNqLG(pJ`SDB)45ADS
z3^_~;3?d8+3{6Z73@i)`^$gRQ7#Iu~7#QX-F)*+*Ffg2j(pQ-n7!(*7816DLFbFa*
zF#Ka;U@&4}U=UztU`S<PU~pz;VBlw9U|7iv(YKSCfgy#Ff#D!C!~tro3=HBR2eCpN
z?9Ix+Aj!bM5X#EHz{SA8kk87%pvh3rz)-~s@yQZah{oNl5Eq_cWnhp3Ie-=7kRPlN
zpGvYZFnBO9FsQOIFz_-kFyyf@FbIG`j13ZUy=;(>Sk1=35Xr#6aD<J4p^1TkL5>|_
z?m~8mJ=@qB7#LL;Ag&RDgf`emP$oFoK_MbMxsg#^6%+=bfCI^b0umI+AT|httOrGo
z*yg>AjEwTBxdr(}iA9+?l?o~O<#`He`9%u3iJ5sNsd<Tc$*Gg~FnLVA$Ry%lo|>dk
zoLQ2pkXfvdTv}9=npcujsZg4il3J9KpP84AtVvHHJXN7MBfm5!MIk9wAt^CATOmI$
zCo>N$T2zu#sW+LCIfu`{T-VS@!O+yo&{*5RXmd4lHj`|~!(9t=74p)LZOBVkI5P3!
z?q-Fghr1T%E0h!+UNiYAYsuvQtSWIOMTvRo3LrOSWIo*8o~LkRB1izqIS5U93eFja
zcjcuklpNlYnRj?qo<d2{!`<^0avttlm<eWYOjal<t$es^f1W~KdSa#C<Onup03b=3
AYXATM
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.po b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
index 79585a52..9c819bcd 100644
--- a/VIPSWeb/locale/vi/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 15:13+0200\n"
+"POT-Creation-Date: 2016-12-02 17:48-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: local_settings.py:166
+#: local_settings.py:169
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:176
+#: local_settings.py:179
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:182
+#: local_settings.py:185
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:189
+#: local_settings.py:192
msgid "Other models and services"
msgstr ""
@@ -42,44 +42,44 @@ msgstr "File không tìm thấy"
msgid "We are sorry, but the requested file was not found"
msgstr "Chúng tôi rất xin lỗi, nhưng các tập tin yêu cầu không được tìm thấy"
-#: templates/503.html:3 templates/503.html.py:5
-msgid "Temporarily down for maintenance"
-msgstr "Tạm ngưng để bảo trì"
-
-#: templates/503.html:6
-msgid ""
-"We are sorry, but the web site is currently underdoing maintenance. We "
-"should be back online shortly."
-msgstr ""
-"Chúng tôi rất xin lỗi, nhưng trang web hiện đang underdoing bảo trì. Chúng "
-"tôinên trở lại trực tuyến ngay."
-
-#: templates/base.html:57
+#: templates/base.html:59
msgid "Toggle navigation"
msgstr "chuyển hướng toggle"
-#: templates/base.html:80
+#: templates/base.html:82
msgid "Language"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:93
msgid "Administration"
msgstr ""
-#: templates/base.html:93
+#: templates/base.html:95
#, fuzzy
#| msgid "Sign in"
msgid "Sign out"
msgstr "Đăng nhập"
-#: templates/base.html:97
+#: templates/base.html:99
msgid "Sign in"
msgstr "Đăng nhập"
-#: templates/base.html:114
+#: templates/base.html:116
msgid "This is the default page contents."
msgstr ""
+#: templates/base.html:143
+msgid "This website uses cookies to give you the best possible user experience"
+msgstr ""
+
+#: templates/base.html:143
+msgid "Got it!"
+msgstr ""
+
+#: templates/base.html:143
+msgid "More info"
+msgstr ""
+
#: templates/index.html:25
msgid "Welcome"
msgstr "Chào mừng"
@@ -166,6 +166,16 @@ msgstr "Chọn cây trồng hoặc phóng to để xem danh sách các dự báo
msgid "Information"
msgstr "Thông tin"
+#~ msgid "Temporarily down for maintenance"
+#~ msgstr "Tạm ngưng để bảo trì"
+
+#~ msgid ""
+#~ "We are sorry, but the web site is currently underdoing maintenance. We "
+#~ "should be back online shortly."
+#~ msgstr ""
+#~ "Chúng tôi rất xin lỗi, nhưng trang web hiện đang underdoing bảo trì. "
+#~ "Chúng tôinên trở lại trực tuyến ngay."
+
#~ msgid "Working title"
#~ msgstr "Không tiêu đề"
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo
index ff4a1df905d6f4c42f5938a9848626c0bcdcd8fb..fbc6d486622b72b9dab71625025c50342d6382cd 100644
GIT binary patch
delta 699
zcmeAZ=@Y8IC&V(9fq{WRk%56hhJk@Wg^__lpMilvhY2Lg!0>{Jfq{>Kf#D?+0|O5O
z1H%s{1_l8J1_oAU1_luZ1_m)^1_o9J1_o_rh&n@N1_n+B1_lRa1_mJp1_m!?1_m((
z28LK>1_o{h28I%51_llW28IS^1_pixhI)ohW(Ecc1_p+i%n%DUK@Hpw<sW5cU=U?s
zV7LUe@C7pigCqk3!(V0w1{MYe25}aMybKEig8>5rgAoe@13Lo)Loy4*qHHL?goS}Y
znSp_!hJ}GaiGhJ(0Sg0zAVWO^!(kQ%hGqr^hN~<L3`PtL43Vs0mofCPLJXS2%D|w^
z$iT3Km4Shcfq~%!8^odKq4XU#i29do5c!`_KFAdy^#be=d2x0~h^Vte)LDV(dIkmt
zM|OyT9_$dGghKh*AO#Ez3>8p*J=B06sDbmL>esVFg8V2{{5(4Yg9-x!!+ofJ77mDo
z+#C>lgg7Af$a63-n1X`d6e{7z!N5?-z`zjA!N8yn3K0&7!GEC!uyZmnFfuSO$W0Dp
zl4ew#oXaFGE6V`!9VoSc(g`?ifH)vLc_EX#tUQRt0P(v51H=h}43N|yvze87598!V
zEN>^9vPJP38tEDsDHxhtnONu=SZtolX3sSFJ;w>bXB(!x*tqcd>X{7B)+~ClzmEX`
DY&%D|
delta 952
zcmeAZ>JzEIC&V(9fq{WRnSp^phJk^>gpq+kpMinFhY2Lgz`()Gz`)1Az`)7Oz`(=6
zz#zfQz#zcDz@W;^z#ziFz+lGAz`)ADz~Bv47s$-Oz{$YCkig8qAjH7Hkj2cvAjZJJ
zP|M7~z|FwGFol_cfrEj8VF5D(13v>pJ;O?71_lWR28Nwb3obzoybt9+WoBRyWnf_V
z1htTZg@Hkmfq_Amg@J*Efq}uC1tM?5!oXm_z`zj1!oa}Jz`)SV0<owY%Adjl@#Gv9
z1_lKN28IJH3=B#P^$ZLTSr`}u85kH?SQ!|a85kJESQ!|M7#J94u`)2EGB7ZlWd*yG
z!I%wVurnJ2gEAungEt!k0~-SaLq0nsWXhm)Gdo261a^r00w{kul)oLy-^b3tAXLx5
zz;F&K@eoSCfEx6k9pbY;P`(fc#6Woth=pn#kRUeZfLQ3p0Z|{u0f~YfsCXF%1A__!
z14A2B|7s|`iGzV56cndBp&E}t4ZOnviIVqFi#RwL7%CYU7(_W47}OaU82ULG7+e_`
z7`AglEc(j{aTq%n0|O%i1B3izLndiP<;lKG;<9oK5XXU16DS>l(hexSfcT1&8=2f?
zL6HGUd7#vy!~pRcC_X@`MRxO3rag@EsksIDMTte3Ih6`2`Q>>EY57G8xrv#1C8>Fd
zdC94h=d-*|R!A&LRVdCcDyq~`NGdH+D9K1wC{ImND9$WNRmdz>NG>fZO3f?DsZ=P<
zOGzzC$<NG7M>a%HAv{%~I3vF_Cq*GCRUs)cIa?t=FDEk(ELv2OQ>iz(n>Citz*5)9
zLc!43%D_a|z<l#JR(mF)XS14~P2cvkan7?jyPogf@~msgWD|~);ZOH<JnP!{Y;EWJ
zJw4C&PJF(4=F>SVAo5RktbN?j^sHmzlih2c?3wj+U&qt^tDnxE_q1cfi^eG+W4g9I
eYiNAj(8Ta;!;}{r7d~G-li}H#MKAXEF#rHz{JS9l
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po
index 8700e1c2..1d3ba77f 100644
--- a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2016-12-02 17:48-0800\n"
"PO-Revision-Date: 2016-11-03 14:04+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,19 +17,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: local_settings.py:166
+#: local_settings.py:169
msgid "Cereals and oilseeds"
msgstr "谷物和油籽"
-#: local_settings.py:176
+#: local_settings.py:179
msgid "Potato and vegetables"
msgstr "土豆和蔬菜"
-#: local_settings.py:182
+#: local_settings.py:185
msgid "Fruits and berries"
msgstr "水果和浆果"
-#: local_settings.py:189
+#: local_settings.py:192
msgid "Other models and services"
msgstr "其他模型和服务"
@@ -41,16 +41,6 @@ msgstr "找不到文件"
msgid "We are sorry, but the requested file was not found"
msgstr "很抱歉，所请求的文件未找到"
-#: templates/503.html:3 templates/503.html.py:5
-msgid "Temporarily down for maintenance"
-msgstr "暂时停机维护"
-
-#: templates/503.html:6
-msgid ""
-"We are sorry, but the web site is currently underdoing maintenance. We "
-"should be back online shortly."
-msgstr "很抱歉，网站在维护中。我们会很快回到联机状态。"
-
#: templates/base.html:59
msgid "Toggle navigation"
msgstr "切换导航"
@@ -75,6 +65,18 @@ msgstr "登入"
msgid "This is the default page contents."
msgstr "这是默认页面内容"
+#: templates/base.html:143
+msgid "This website uses cookies to give you the best possible user experience"
+msgstr ""
+
+#: templates/base.html:143
+msgid "Got it!"
+msgstr ""
+
+#: templates/base.html:143
+msgid "More info"
+msgstr ""
+
#: templates/index.html:25
msgid "Welcome"
msgstr "欢迎"
@@ -158,3 +160,11 @@ msgstr "选择作物或放大看预报列表"
#: templatetags/template_helper.py:74
msgid "Information"
msgstr "信息"
+
+#~ msgid "Temporarily down for maintenance"
+#~ msgstr "暂时停机维护"
+
+#~ msgid ""
+#~ "We are sorry, but the web site is currently underdoing maintenance. We "
+#~ "should be back online shortly."
+#~ msgstr "很抱歉，网站在维护中。我们会很快回到联机状态。"
diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html
index 9dce46ce..b93cb1a7 100644
--- a/VIPSWeb/templates/base.html
+++ b/VIPSWeb/templates/base.html
@@ -140,7 +140,7 @@
{% endblock %}
<!-- Begin Cookie Consent plugin by Silktide - http://silktide.com/cookieconsent -->
<script type="text/javascript">
- window.cookieconsent_options = {"message":"Denne websiden bruker cookies for å gi deg en god brukeropplevelse","dismiss":"Skjønner!","learnMore":"Mer informasjon","link":null,"theme":"light-bottom"};
+ window.cookieconsent_options = {"message":"{% trans "This website uses cookies to give you the best possible user experience" %}","dismiss":"{% trans "Got it!" %}","learnMore":"{% trans "More info" %}","link":null,"theme":"light-bottom"};
</script>
<script type="text/javascript" src="{% static "js/3rdparty/cookieconsent.min.js" %}"></script>
--
GitLab