From 1ebb36add03e504bd1644fd17266ea24d71ec13f Mon Sep 17 00:00:00 2001 From: zamentur Date: Sun, 23 Nov 2014 18:21:07 +0100 Subject: [PATCH] [fix] Localization issue due to a host with the bad locales setup [enh] Add german text in the manifest [fix] Error on the upgrade script --- README.md | 4 +- conf/constants.php.template | 1 + manifest.json | 30 +- scripts/upgrade | 10 +- sources/app/inc/i18n.php | 11 +- sources/favicon.ico | Bin 1150 -> 0 bytes .../de_DE/{ => C.UTF-8}/LC_MESSAGES/Studs.mo | Bin .../de_DE/{ => C.UTF-8}/LC_MESSAGES/Studs.po | 0 .../en_GB/{ => C.UTF-8}/LC_MESSAGES/Studs.mo | Bin .../en_GB/{ => C.UTF-8}/LC_MESSAGES/Studs.po | 0 .../locale/en_US/C.UTF-8/LC_MESSAGES/Studs.mo | Bin 0 -> 17035 bytes .../locale/en_US/C.UTF-8/LC_MESSAGES/Studs.po | 690 ++++++++++++++++++ .../es_ES/{ => C.UTF-8}/LC_MESSAGES/Studs.mo | Bin .../es_ES/{ => C.UTF-8}/LC_MESSAGES/Studs.po | 0 .../fr_FR/{ => C.UTF-8}/LC_MESSAGES/Studs.mo | Bin .../fr_FR/{ => C.UTF-8}/LC_MESSAGES/Studs.po | 0 16 files changed, 724 insertions(+), 22 deletions(-) delete mode 100644 sources/favicon.ico rename sources/locale/de_DE/{ => C.UTF-8}/LC_MESSAGES/Studs.mo (100%) rename sources/locale/de_DE/{ => C.UTF-8}/LC_MESSAGES/Studs.po (100%) rename sources/locale/en_GB/{ => C.UTF-8}/LC_MESSAGES/Studs.mo (100%) rename sources/locale/en_GB/{ => C.UTF-8}/LC_MESSAGES/Studs.po (100%) create mode 100644 sources/locale/en_US/C.UTF-8/LC_MESSAGES/Studs.mo create mode 100644 sources/locale/en_US/C.UTF-8/LC_MESSAGES/Studs.po rename sources/locale/es_ES/{ => C.UTF-8}/LC_MESSAGES/Studs.mo (100%) rename sources/locale/es_ES/{ => C.UTF-8}/LC_MESSAGES/Studs.po (100%) rename sources/locale/fr_FR/{ => C.UTF-8}/LC_MESSAGES/Studs.mo (100%) rename sources/locale/fr_FR/{ => C.UTF-8}/LC_MESSAGES/Studs.po (100%) diff --git a/README.md b/README.md index b388ad1..80993e9 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ opensondage_ynh OpenSondage for YunoHost OpenSondage is used to poll people invite for a meeting. -https://git.framasoft.org/framasoft/framadate/tree/514369387bc27d8ad7e831d2e1fb34ba2b4c9c41 -This package contains a custom version between https://github.com/framasoft/OpenSondage and https://github.com/leblanc-simon/OpenSondage . Indeed, the version from framasoft contains legal mention about framasoft, but is more advanced. + +This package contains a custom version of Framadate (fork of OpenSondage and Studs), the sources are here: https://git.framasoft.org/framasoft/framadate/tree/514369387bc27d8ad7e831d2e1fb34ba2b4c9c41. You can see change in the history of the depot. Screen containing a meeting poll Screen containing a vote poll to choose a restaurant diff --git a/conf/constants.php.template b/conf/constants.php.template index f488340..4b38548 100644 --- a/conf/constants.php.template +++ b/conf/constants.php.template @@ -54,6 +54,7 @@ const LANGUE = 'I18NTOCHANGE'; $ALLOWED_LANGUAGES = [ 'fr_FR' => 'Français', 'en_GB' => 'English', + 'en_US' => 'English (US)', 'es_ES' => 'Español', 'de_DE' => 'Deutsch', ]; diff --git a/manifest.json b/manifest.json index 376af3e..ddf9189 100644 --- a/manifest.json +++ b/manifest.json @@ -3,42 +3,49 @@ "id": "opensondage", "description": { "en": "OpenSondage is used to poll people invite for a meeting.", - "fr": "OpenSondage sert à faire des sondages sans authentification pour trouver une date de réunion qui convienne à toutes les personnes concernées." + "fr": "OpenSondage sert à faire des sondages sans authentification pour trouver une date de réunion qui convienne à toutes les personnes concernées.", + "de": "Mit OpenSondage kann man durch einem Link (ohne Anmeldung) Umfrage schaffen, um einem Datum für einen Sitzung oder Trefffen rauszufinden." }, "categories": [ "poll" ], "license": "CeCILL-B", - "developer": { + "version": "0.8", + "maintainer": { "name": "zamentur", - "email": "valentin@grimaud.me", - "url": "https://github.com/leblanc-simon/OpenSondage/" + "email": "valentin@grimaud.me" }, "multi_instance": "true", "arguments": { "install" : [ { "name": "domain", + "type": "domain", "ask": { "en": "Choose a domain for OpenSondage", - "fr": "Choisissez un nom de domaine pour OpenSondage" + "fr": "Choisissez un nom de domaine pour OpenSondage", + "de": "Wählen Sie bitte einen Domain für OpenSondage" }, "example": "domain.org" }, { "name": "path", + "type": "path", "ask": { "en": "Choose a path for OpenSondage", - "fr": "Choisissez l'adresse pour OpenSondage" + "fr": "Choisissez l'adresse pour OpenSondage", + "de": "Tragen Sie bitte die Adresse für OpenSondage ein" }, "example": "/date", "default": "/date" }, { "name": "admin", + "type": "user", "ask": { "en": "Choose the OpenSondage administrator (must be an existing YunoHost user)", - "fr": "Choisissez l'administrateur d'OpenSondage (doit être un utilisateur YunoHost)" + "fr": "Choisissez l'administrateur d'OpenSondage (doit être un utilisateur YunoHost)", + "de": "Wählen Sie bitte den OpenSondageadministrator (er musst einen YunoHostnützer sein)" }, "example": "homer" }, @@ -46,7 +53,8 @@ "name": "legal", "ask": { "en": "Indicate a web page with legal information", - "fr": "Indiquez la page où figure les mentions légales" + "fr": "Indiquez la page où figure les mentions légales", + "de": "Tragen Sie bitte die Website ein, wo man den Impressum finden kann." }, "example": "http://example.com", "default": "./apropos.php" @@ -55,7 +63,8 @@ "name": "language", "ask": { "en": "Choose the default language of this OpenSondage", - "fr": "Choisissez la langue par défault d'OpenSondage" + "fr": "Choisissez la langue par défault d'OpenSondage", + "de": "Wählen Sie bitte die Standardsprache für OpenSondage." }, "choices": ["en_GB", "fr_FR","es_ES", "de_DE"], "default": "en_GB" @@ -64,7 +73,8 @@ "name": "public_site", "ask": { "en": "Could non member create poll ?", - "fr": "Une personne non membre peut elle créer un sondage ?" + "fr": "Une personne non membre peut elle créer un sondage ?", + "de": "Kann einen nicht-Nützer einen Umfrage schaffen?" }, "choices": ["Yes", "No"], "default": "Yes" diff --git a/scripts/upgrade b/scripts/upgrade index ac821c4..092d3b0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -52,17 +52,17 @@ sudo sed -i "s@yunoinfolegal@$legal@g" $final_path/app/inc/constants.php # Create log file sudo cp ../conf/logs_studs.txt $final_path/admin/ -chmod 700 $final_path/admin/logs_studs.txt +sudo chmod 700 $final_path/admin/logs_studs.txt # Set permissions to roundcube directory sudo chown -R www-data: $final_path # Modify Nginx configuration file and copy it to Nginx conf directory -sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf* -sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* +sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf +sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sudo yunohost app addaccess opensondage -u $admin -sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/opensondage.conf +sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/opensondage.conf sed -i "s@NAMETOCHANGE@opensondage@g" ../conf/php-fpm.conf finalphpconf=/etc/php5/fpm/pool.d/opensondage.conf @@ -78,7 +78,7 @@ sudo chmod 644 $finalphpini sudo service php5-fpm restart # Reload Nginx sudo service nginx reload -sudo yunohost app setting opensondage skipped_uris -v "/" +sudo yunohost app setting opensondage skipped_uris -v "/" if [ $public_site = "No" ]; then sudo yunohost app setting opensondage protected_uris -v "/admin,/index.php,/choix_date.php,/infos_sondage.php,/scripts" diff --git a/sources/app/inc/i18n.php b/sources/app/inc/i18n.php index 31c6f2d..cb90ae7 100644 --- a/sources/app/inc/i18n.php +++ b/sources/app/inc/i18n.php @@ -36,7 +36,7 @@ if (isset($_POST['lang']) && is_string($_POST['lang']) && in_array($_POST['lang' } -$locale = $mlocale . '.utf8';//unix format +$locale = $mlocale . '.UTF-8';//unix format if (strtoupper(substr(PHP_OS,0,3))=='WIN'){ putenv("LC_ALL=$mlocale"); //Windows env. needed to switch between languages switch ($mlocale){ @@ -47,16 +47,17 @@ if (strtoupper(substr(PHP_OS,0,3))=='WIN'){ } } -putenv('LANGUAGE=');//sert à quoi? -setlocale(LC_ALL, $locale); +putenv('LANGUAGE=C.UTF-8'); +setlocale(LC_ALL, 'C.UTF-8'); setlocale(LC_TIME, $locale); -setlocale(LC_MESSAGES, $locale); +setlocale(LC_MESSAGES, 'C.UTF-8'); $domain = 'Studs'; -bindtextdomain($domain, 'locale'); +bindtextdomain($domain, 'locale/'.$mlocale); bind_textdomain_codeset($domain, 'UTF-8'); textdomain($domain); + /* temp, for compatibility :*/ $a = explode('_', $mlocale); $_SESSION['langue'] = strtoupper($a[0]); diff --git a/sources/favicon.ico b/sources/favicon.ico deleted file mode 100644 index b7486c39c339aae7c524dce6f35242109474f35c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcma)5O=#3m5FWu_5ZRO9NiY8Ypooedy4iZ_c}ap7>8Wj!dhl*yE}LXkEG-r-9u)6x zvD)fE^ytNdime`%p1RpuT0z8aH-2C8Qo`bb36shD=9_u*X6A`(!CNW`z6WGvtH@pv zIRXI$B*UTp>#3O|Cj!Hn2zC2oXxP6Z!(M^@1bv&fUO^@XuI&JC64Hhw%4ZsS2C|?q z+9rKn-(HL}H8iv>((TuZ(+EuGP|?o+sOlVt{RKJXa=)Czn8X9as^wV4ZC%j3mIG~H z_Tw~Of>Pid^^EJ>BbR5wdLz`W=d=&_%X`XhJga$eQjm`3H6LHRzPO7V@Mj_Gb<;iy zJq}5N>L^Pt@R_4u*^5`To2^Hh8&6}sp2otO9Cel?GOV%Cw7-OgGf%wVU%I4xm-}us z4-(^3apN-ZKaft2W6uTj=ri2hRRI&y#q+-#QPxJO8iDKbD|xH7Dcwd5iqt`$fLtCcRq}8Cw;3uutUlZjrO^ R(N87(Cq^4Ny9$!l*5eqmt&P{%$5_4`8*tj zSHs8PYFIzXm;k;Wl4b6Is`5qnEci{>2mc8^8U7o568sfZx!-yod$KX7kv?1**M0Q0=@J9tmF#RsI0f zyx$C^_uDe+^Xmw?paS!;qnwk3rS{ z3Y1>{7Ha$t`}Ctw<2&XVP9MiZwRZ+Q4sM1NF*~5<^%AIculf7)Q1iSF#_)Zx36DkT zXTn9OdhdkS!rNd2o{17P-y5LT;dak^pvL=EsCoPl?u9>rYJbb=#@q^Thq8}L8LY}r zLya?r8{h#beS8|q4)23%?^{rM`L0j@6iOeDK0Q1$v)9F;#E9uCih2jFU-|9+@; zKLS<%E~x&$>eGJ*N#f@Tb={N+&X)&2bixQ6tNQ1kx;RJpsM z+WQ(*`#*$g=a-&Gve;_>RH*!Oq2_lX)Ht8-(=UZ;FM~tyHE!4%GVo465BTFrrVvb#M#(dw4y37EW><`~XzFbu<#eF{pWc6iV-RLXG=w z_+ofJRJpUxcKW{&&XT?hYTPHI9MwA;%KpxU(#u9D|GET9pD%#@unt)Y^Jb{|-3g_i zZ+iX+YJL9|J_-H?^3NR3;;)DO@DJe?a1`DQ)$aG;4E!}5fm3UpKHdn`{=1;!>c^q_ zy$7n^Uqk8pF?cRKmrPvA?14{)Z7BWhhqB*SLXGPNcs_gsWNFMncocjPqGIzisP#UU zU?_bAQ2II_s=XcXNVwCdpAWxx820D$&pXfUGs95ry&DGbUa0kX0BXH|38l~9LXGcP z18&^?P~#keD!0jV6l(n^;W4lQ<);~Z3cL{>4R7)J?}ZxoXW$gPA8MYbp)};v(jBj7#IV0IK{IP~&Jo>G4{qb$B(D zo<0aw{*&-{_-!aX{0M5jAB3v^pYW;hxFI+GGoaE#P~*D@N-x`?+M9yM!31huUI8_) zw?eJ^yZrr+LCy2?FoxfUO}KT~+2bdm>U{@Z3;zZ-;GPX`zF&gs_W{qJLyh-QsCk^Q z(U`sP6sY#+;jQoiDEm0D$(6qmYMi%1s+!NjeDAa$N9k;sQe+Hz8F4@^b}ORI+Xse zfr{U+@_Z+hJ$({t9lj5x$A_WD_j4${{o1Gd{=nJi=}_&Q2i4CQ)H+`QPlR=N5?q8Q zz&Aj(_a1-$<8Te>d!h96Q>b!}K(+TP_zZZ$X4g)?=X0UjpY-XyQ1i>7#`!v*ej8MK zAAy*P`5eTx%p*{CcPc^kCb$U(@XPQl_z&w6|tyHoH}@G7_kp7dO|&rHMX zNdFM3-c=X4{bLboUO$1-`$JIUegwW4J_aLr<%LfF_rh7y4?~T6{CTe43!&_9FO*(l zC_P^brO!9Qe)t|J|F|D&eh)$E-(2K)GSvE>1LfbFp!B~Pu7@v$Ox?T*j>2z1wcEGF z?K2x8Q#Ut2>Ek}A_P+}iSN{>J-=9O(JBCK2?+sA<%wBjpya~#lKLn+pJE7wEr=iC6 zC5UO8gYen#zo6{#8CzXEdN$O0k3#8V50t*HhHCE`D19IB>FeQPq;+?kKp=t?f1ezLC!>UeGzFP-$wotxg9C5Px0f8h-~3XJvqq=UQyxg5C(ISo+^=tCBfL$5(HRwMWM8yn#O@-?465`Gx@3bM)P9S&3f`(9W@ zrjU0aBS?9DgCAc)UWQB{=OE=(0A*cQ7|7D z!OJ>P&<-<-=Rqw^@}R$V-$!emY7x&iBeIaV)xPiUB41bO+ZAQiIH;`+=fk8*y|kl> zMHU4)|#(fqF_%F z&qrAv7mGnU7fcsfn9tHfy%Nl%wQzADV7Sap_2zr)g?XM<D4h$}m12kIJY zqL&19G4mqYUzpL{>LUnMKF-m5k!Ax@R8S2Qh8iYyl+OT7?DAFJ=qINL6Jh@>hDT`>Nt*A{sb+_z>oyb<1 zy;o$<@7#>ZI-4GL(3o*Gi`&*jBGl7+FVd1R`C7&xgG29T9l61wxkX$w@h;m^G&Vjl zF}M{)SED44%$U=c#@|G99nHHZ&kmh*7FJn@JXjqBYlGl|AS#0A1@em|ErNEGwc?_P zYN}b5yg&t#8Z{oTn6;;|Mw;d+{< zJiiuI<6PddEwvWE5aN5(Hruth`g5oObu&xLk>PZ66+cG0NvkbuMcq7WK4!ZN&umW= zra~J%mL=>c6`JhwtXjI~E4yk*P!7VHui2huX-3)o?HD&^UaYgUqntFeGaH+}-0Yxd z)|q+6n5^=(P-Ra$;skFe;2shJR47hdv{O7=9tD~)3RMw1z=7T-DVe#oTQ=H?*+G63 zRvSScHCZ=?WCMM-UoGK)YU35`ZBbNUvfgg`qe{Ip60F|bSUtesk&Q!^jltm|o5Mbl zP@2rBs8-h5&hjXc(QD=!s<-zJI>>dOFmCJ?Vs{JT8}Tnq?2bT@c|1H|`av7VR@1s2 zw%ci(6gFma>kzYIe~qjAnu~TZqcD$~iVeAFm~~(-MoB(QZ|F^IG?zp)#;_adf_CMFG~1Vtm`e!PX54PE!POm{ zxpXEXjVwG`uq&rVQCzei4anQ1Yo^q3R+zJk+AOOw=fpjgD`f{|+g>Ynx=UvZEs~8D z=|U2)y0)#N(a}5=kI1pNy$BCM4YxZd}a%fMSbY%bZ{yM|5*)>G}7 zg5DQVovhsKjM%A{roGBcM0Ex;VkW4;A0|`AcDEhpW+JWUW|s@GRnA{|T(!&+=s8(-GneghK{sC!(3yf-wGArEt^G97yvAwM#zwZT!c12)Sqv_!nQBmn zWMy%^L0;sVveTTl8>y>Mo<64)IeL|~l%XoleCWhFz+A>-9LgY;@KD4y!$W0mW;oLl z8x*qU@G`rDG9+8wM<+#(Ae<%I^p>`5S}U_Lw!%F*pgU``5>j|I&E%k~f-7!GfvQNPa0Xp?uM-}*}}tSGp+8kk6jATDd$6;{IttfBm0;m^=W+NEH!X9 z78{D4Ne6Z&462CPf?_r_4ORuP4Y%&gi-Z|=rZU#gmd_?wW$$P!kYd-e+_b^*11Dhv zsx7+xZ`pq0s+60U>L)#st(;7Gq9_(prQ zB|(i^0<`KM8oN6I!_WlEp}VIPd%HXg*mVv1CewxGd$X&iw#!Coi}PW&D9y1xOGlN` zGJ1-7lbpP4MzMjWmXxQ$>`QJSmB4Md?aV!^NZ*=<3K7%oZjok{zCM|`G?8$4YNfS! zj-y@SEX$i|=|&7fwRtfU<;mK@n~cnaJEfg)u8MHjt9dEo9&+u8qMD}rVm-MgA=`Yd z92{qS?JC;&myQ~9bdfH|rx&8xU^Yt^bR5RAaRdJFr0f1JJ6z19^NJs7gYSrsH zPVts1BlsxOMz5R*Tq*e4Vt~w&XLD zbXjsS%6rnhUXY=ABf}VD`@YU@7cCyS=A*n~+i{P?{sE8#o~ww;`v-OXICps@Ny>W^ z)|(L7na?8bl$IZu7wFWBz3TLPk-3uHL=K=XdR}pL&viLl0nw#mOLYT=*26D@EY(I_ zYz)_RZ}XOyN4=SUx98u6aT+R3Z^`i8@!E~2?CE!F@+@rE$-0$W$tP@KF5XWu7f0;? z%0rm!DlXh0-Ko~TC34#`&ueFafWf*a z@!ms*k(cZWvwezELB5z2;eMOv-;LXs3dE|&%*V`KQEGokSc@()icR)UZZu6E2vWWI z8XT_;UQYDJgGSuTaO){UmCb!qk=_6e?#kaKlD^j-0>YyrJQtAqoyoMGBp1vaHy9)y8hh3=WM1l|IwQ6|8(TS@~%4zw*%}H!ELF zR=%3Bjg|**9oji05w2Ihn%EQO%2$(>uO>XF=#9wASCf^mCLHotzM8nt$}3+@^sQKL zL07(-tb8>IR=%37d^K75YGOZ2lpk1DzM8CjH96#i_R3e2m9Hjx<9+CNmzA$3Pw+pN O{=a=S`M>tj are not permitted" +msgstr "Characters \" ' < et > are not permitted" + +msgid "The date is not correct !" +msgstr "The date is not correct !" + +########### Step 1 ########### +# Step 1 info_sondage.php +msgid "Poll creation (1 on 3)" +msgstr "Poll creation (1 on 3)" + +msgid "Framadate is not properly installed, please check the 'INSTALL' to setup the database before continuing." +msgstr "Framadate is not properly installed, please check the 'INSTALL' to setup the database before continuing." + +msgid "You are in the poll creation section." +msgstr "You are in the poll creation section." + +msgid "Required fields cannot be left blank." +msgstr "Required fields cannot be left blank." + +msgid "Poll title" +msgstr "Poll title" + +msgid "Voters can modify their vote themselves." +msgstr "Voters can modify their vote themselves." + +msgid "To receive an email for each new vote." +msgstr "To receive an email for each new vote." + +msgid "Go to step 2" +msgstr "Go to step 2" + +# Errors info_sondage.php +msgid "Enter a title" +msgstr "Enter a title" + +msgid "Characters < > and \" are not permitted" +msgstr "Characters < > and \" are not permitted" + +msgid "Enter an email address" +msgstr "Enter an email address" + +msgid "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll." +msgstr "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll." + +# Error choix_date.php/choix_autre.php +msgid "You haven't filled the first section of the poll creation." +msgstr "You haven't filled the first section of the poll creation." + +msgid "Back to step 1" +msgstr "Back to step 1" + +########### Step 2 ########### +# Step 2 choix_date.php +msgid "Poll dates (2 on 3)" +msgstr "Poll dates (2 on 3)" + +msgid "Choose the dates of your poll" +msgstr "Choose the dates of your poll" + +msgid "To schedule an event you need to propose at least two choices (two hours for one day or two days)." +msgstr "To schedule an event you need to propose at least two choices (two hours for one day or two days)." + +msgid "You can add or remove additionnal days and hours with the buttons" +msgstr "You can add or remove additionnal days and hours with the buttons" + +msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)" +msgstr "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)" + +msgid "Day" +msgstr "Day" + +msgid "Time" +msgstr "Time" + +msgid "Remove an hour" +msgstr "Remove an hour" + +msgid "Add an hour" +msgstr "Add an hour" + +msgid "Copy hours of the first day" +msgstr "Copy hours of the first day" + +msgid "Remove a day" +msgstr "Remove a day" + +msgid "Add a day" +msgstr "Add a day" + +msgid "Remove all days" +msgstr "Remove all days" + +msgid "Remove all hours" +msgstr "Remove all hours" + +# Step 2 choix_autre.php +msgid "Poll subjects (2 on 3)" +msgstr "Poll subjects (2 on 3)" + +msgid "To make a generic poll you need to propose at least two choices between differents subjects." +msgstr "To make a generic poll you need to propose at least two choices between differents subjects." + +msgid "You can add or remove additional choices with the buttons" +msgstr "You can add or remove additional choices with the buttons" + +msgid "It's possible to propose links or images by using " +msgstr "It's possible to propose links or images by using " + +msgid "the Markdown syntax" +msgstr "the Markdown syntax" + +msgid "Choice" +msgstr "Choice" + +msgid "Add a link or an image" +msgstr "Add a link or an image" + +msgid "These fields are optional. You can add a link, an image or both." +msgstr "These fields are optional. You can add a link, an image or both." + +msgid "URL of the image" +msgstr "URL of the image" + +msgid "Link" +msgstr "Link" + +msgid "Alternative text" +msgstr "Alternative text" + +msgid "Remove a choice" +msgstr "Remove a choice" + +msgid "Add a choice" +msgstr "Add a choice" + +msgid "Back to step 2" +msgstr "Back to step 2" + +msgid "Go to step 3" +msgstr "Go to step 3" + +########### Step 3 ########### +msgid "Removal date and confirmation (3 on 3)" +msgstr "Removal date and confirmation (3 on 3)" + +msgid "Confirm the creation of your poll" +msgstr "Confirm the creation of your poll" + +msgid "List of your choices" +msgstr "List of your choices" + +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll." +msgstr "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll." + +msgid "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll." +msgstr "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll." + +msgid "Create the poll" +msgstr "Create the poll" + +# Step 3 choix_date.php +msgid "Your poll will be automatically removed " +msgstr "Your poll will be automatically removed " + +msgid " after the last date of your poll:" +msgstr " after the last date of your poll:" + +msgid "Removal date:" +msgstr "Removal date:" + +# Step 3 choix_autre.php +msgid "Your poll will be automatically removed after" +msgstr "Your poll will be automatically removed after" + +msgid "You can fix another removal date for it." +msgstr "You can fix another removal date for it." + +msgid "Removal date (optional)" +msgstr "Removal date (optional)" + +############# Admin ############# +msgid "Polls administrator" +msgstr "Polls administrator" + +msgid "Confirm removal of the poll " +msgstr "Confirm removal of the poll " + +msgid "polls in the database at this time" +msgstr "polls in the database at this time" + +msgid "Poll ID" +msgstr "Poll ID" + +msgid "Format" +msgstr "Format" + +msgid "Title" +msgstr "Title" + +msgid "Author" +msgstr "Author" + +msgid "Users" +msgstr "Users" + +msgid "Actions" +msgstr "Actions" + +msgid "See the poll" +msgstr "See the poll" + +msgid "Change the poll" +msgstr "Change the poll" + +msgid "Logs" +msgstr "Logs" + +########### Mails ########### +# Mails studs.php +msgid "Poll's participation" +msgstr "Poll's participation" + +msgid "" +"has filled a line.\n" +"You can find your poll at the link" +msgstr "" +"has filled a line.\n" +"You can find your poll at the link" + +msgid "Thanks for your confidence." +msgstr "Thanks for your confidence." + +msgid "" +"\n" +"--\n" +"\n" +"« La route est longue, mais la voie est libre… »\n" +"Framasoft ne vit que par vos dons (déductibles des impôts).\n" +"Merci d'avance pour votre soutien http://soutenir.framasoft.org." +msgstr "" +"\n" +"\n" +"\n" +"\n" +" " + +# Mails adminstuds.php +msgid "[ADMINISTRATOR] New settings for your poll" +msgstr "[ADMINISTRATOR] New settings for your poll" + +msgid "" +"You have changed the settings of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"You have changed the settings of your poll. \n" +"You can modify this poll with this link" + +# Mails creation_sondage.php +msgid "" +"This is the message you have to send to the people you want to poll. \n" +"Now, you have to send this message to everyone you want to poll." +msgstr "" +"This is the message you have to send to the people you want to poll. \n" +"Now, you have to send this message to everyone you want to poll." + +msgid "hast just created a poll called" +msgstr "has just created a poll called" + +msgid "Thanks for filling the poll at the link above" +msgstr "Thanks for filling the poll at the link above" + +msgid "" +"This message should NOT be sent to the polled people. It is private for the poll's creator.\n" +"\n" +"You can now modify it at the link above" +msgstr "" +"This message should NOT be sent to the polled people. It is private for the poll's creator.\n" +"\n" +"You can now modify it at the link above" + +msgid "Author's message" +msgstr "Author's message" + +msgid "For sending to the polled users" +msgstr "For sending to the polled users" + diff --git a/sources/locale/es_ES/LC_MESSAGES/Studs.mo b/sources/locale/es_ES/C.UTF-8/LC_MESSAGES/Studs.mo similarity index 100% rename from sources/locale/es_ES/LC_MESSAGES/Studs.mo rename to sources/locale/es_ES/C.UTF-8/LC_MESSAGES/Studs.mo diff --git a/sources/locale/es_ES/LC_MESSAGES/Studs.po b/sources/locale/es_ES/C.UTF-8/LC_MESSAGES/Studs.po similarity index 100% rename from sources/locale/es_ES/LC_MESSAGES/Studs.po rename to sources/locale/es_ES/C.UTF-8/LC_MESSAGES/Studs.po diff --git a/sources/locale/fr_FR/LC_MESSAGES/Studs.mo b/sources/locale/fr_FR/C.UTF-8/LC_MESSAGES/Studs.mo similarity index 100% rename from sources/locale/fr_FR/LC_MESSAGES/Studs.mo rename to sources/locale/fr_FR/C.UTF-8/LC_MESSAGES/Studs.mo diff --git a/sources/locale/fr_FR/LC_MESSAGES/Studs.po b/sources/locale/fr_FR/C.UTF-8/LC_MESSAGES/Studs.po similarity index 100% rename from sources/locale/fr_FR/LC_MESSAGES/Studs.po rename to sources/locale/fr_FR/C.UTF-8/LC_MESSAGES/Studs.po