From 26279b55cac5dc889bdfbe276d1127683a15809b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 2 Dec 2009 16:05:20 +0000 Subject: [PATCH] Potlatch 1.3b: It's like Potlatch 1.3a without all the bugs * Don't say you're posting to Twitter when you're posting to identi.ca * Make "Warning!" translatable * Refer to Twitter/Identi.ca as "Microblog" * Debug: Print the i18n-key as an error when it can't be found, only visible during hacking (when something goes wrong) --- config/potlatch/locales/en.yml | 16 +++++++++------- public/potlatch/potlatch.swf | Bin 266725 -> 267037 bytes 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml index e00a08773..90115c49f 100644 --- a/config/potlatch/locales/en.yml +++ b/config/potlatch/locales/en.yml @@ -38,7 +38,7 @@ en: advice_revertingway: Reverting to last saved way (Z to undo) advice_tagconflict: Tags don't match - please check (Z to undo) advice_toolong: Too long to unlock - please split into shorter ways - advice_twatted: Updated your Twitter status + advice_microblogged: Updated your $1 status advice_uploadempty: Nothing to upload advice_uploadfail: Upload stopped advice_uploadsuccess: All data successfully uploaded @@ -66,7 +66,7 @@ en: error_nosharedpoint: Ways $1 and $2 don't share a common point any more, so I can't undo the split. error_noway: Way $1 cannot be found (perhaps you've panned away?) so I can't undo. error_readfailed: Sorry - the OpenStreetMap server didn't respond when asked for data.\n\nWould you like to try again? - error_twitter_long: "Posting to Twitter failed:\nHTTP code: $1\nError message: $2\nTwitter error: $3" + error_microblog_long: "Posting to $1 failed:\nHTTP code: $2\nError message: $3\n$1 error: $4" existingrelation: Add to an existing relation findrelation: Find a relation containing gpxpleasewait: Please wait while the GPX track is processed. @@ -106,9 +106,11 @@ en: login_title: Couldn't log in login_uid: "Username:" mail: Mail + microblog_name_twitter: Twitter + microblog_name_identica: Identi.ca more: More newchangeset: "\nPlease try again: Potlatch will start a new changeset." - "no": "No" + no: No nobackground: No background norelations: No relations in current area offset_broadcanal: Broad canal towpath @@ -137,8 +139,8 @@ en: option_thinareas: Use thinner lines for areas option_thinlines: Use thin lines at all scales option_tiger: Highlight unchanged TIGER - option_twitterid: "Twitter name:" - option_twitterpwd: "Twitter password:" + option_microblog_id: "Microblog name:" + option_microblog_pwd: "Microblog password:" option_warnings: Show floating warnings point: Point preset_icon_airport: Airport @@ -182,7 +184,7 @@ en: prompt_savechanges: Save changes prompt_taggedpoints: Some of the points on this way are tagged. Really delete? prompt_track: Convert GPS track to ways - prompt_twitter: Post to Twitter ($1 left) + prompt_microblog: Post to $1 ($2 left) prompt_unlock: Click to unlock prompt_welcome: Welcome to OpenStreetMap! retry: Retry @@ -216,4 +218,4 @@ en: uploading_way_name: Uploading way $1, $2 warning: Warning! way: Way - "yes": "Yes" + yes: Yes diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf index 9e77e2995d51c205f6c5e17ab87199c06a7c3fb4..aa8a566fff7e8286031c074697c58a4cf4b79676 100644 GIT binary patch delta 8220 zcmbt3d03Ry`rrG`%=zYHM_^`v8Ce8GR2CPs0ufi-21GN-TZl{PFB4PBZfRb-)wL|! zZoF!l*=o1d>+MczX{MD+E~I7dnz>{ysF^~h_dVwuV4!-Q-}A&DobQ}>Iq!M*bLQwP z5sO}r5dCf%X7@xb6Yb`Uwf9-HIjfgEbso}vz@c=oH%xB<(Ns8w`+}G<&!J! z9A7?h-1x~=6USDxSYN)WrXv`QxX)hwDkrFMcKh-!I|@;sUNLp@#L2fWpZWFMI`+MO zdCvaj*o0L6?2iYN+BVXZPnkYWE1z0fS(RBeePUJB_^EQCYI^0As)?18m-jjpvIl1S zidVueEYdZ7oTh2^e(q}2>|c51|9#$So2DZ#4_Jg+uvTr+jMKISs0sCX%2v%(AgM0o zR|jdvk2c*xoj!(Pc*aKOf-#25SAh;^=+%#*Jn^i}?U7uQ+|1Rewb`^{$*>09a$t(B z+bs@H;EGoQ_F3oIc?se=P3Qz%RIA<%BXyrGoQoB!~b*IZV;EufKcM8Z=`$IL53BC0hGBO+L>RY)bA=PGO8bSCOw2!t5x73z&W8)eN$5Pm+@G~fFWf7%CQk~

RNj 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 delta 7918 zcma($cYIV;*6*Cj+&3?sv`LvXN)k#MkkCR2EhL0V2#`>IE2}Pv`A%KeXj*#!%`)0@_u)p8OAKZEO)O-59S+YF1?(JaF zzif!DuGz<;^&4XD(-!T;MXR&kKmlV`cV1fAVf7z1?LeP2W&ET`4^OPj+>>dYG-b@B zNvj{*lZ&>pF%v7sSBy(s{pr3Hx-CDmvooPzNy+L553k0%B=NP0cYhbu#x)yiveL$n zeYj%M__T+{tR7eEe*g_D)%!vV8srBduJ^x$W#}KI>0>obGk&w`NR{8f5Ike0Wxs+0 z&X9Etj86RB>WHmE&6en>vTDXzt5qwivS>yPI^=T3>ZApyEa9|x4fuxgm)tz$^Qw(` z%6~wvH4qo!28;m(KW8nGXy@s-H4xS7zOW0{{KAkWs0C?uw{RvnYjuXmO}pl;0rg!A z{n|C=G7Fr3Rleq_SPR>w?nPc_pbKlEg3njJ4tl{wTDA_lgk7@U)mhVGCI3rSs%dA5 zbcywl1aO5?H$Ys}WovhPk>q^Us>}1)9KCWR@>LqU0WzbnTNj}wlzP{!c@pqX$dl+d z=%Wn~0k>!ibBVcXb-2}G!xku;T;eT1&A3VRCSJrw80K@^YWzV@Y=nV$$4XysgudZ- ztR*>BHqEFv#jD>Mg>Qm3)_N=N()LY|;{N&MCMfmMgrU*4P0-r>HDMEEQR-&M1E9&9 zp_LVdq^jNwZNpGFn6(akEaNt-!`fTu$Yv-B0Z}qQ8h)%+B{YLcH0r$tvhGju@)no{ zPf@_PP@ZTN%1VZhU^DUYg!eb|x6-TMLUhVY%3@ZQ&wILXa-=D`e3sc#tMb>ZU<3#q z$bTzD&M45Nn$Jo#-6VcYBDt9id>efk{KXEi3EfBf>r!_~jFQ-2NMACYU^TLcTEnefI75i(Plyt;v${S_*VFc0Jdr;3blD*6tJ zMn#D3d3PBEYsLmpM>pLNVCBGdYsj#57B5(kgs}>dLLHo~YZtmj9!%=SL{W6(JBV!= z&4!b^$2fH5c8q8m=`lh@I+gqfu7HCEY=dzSORKg)d}th7&quS}kXaw7841FOr=Pb$ z2TTxjqzl?9Z99Y-iEa@IRInW$@M$iL=JdgKNGWa31}(|56Z!!4|`IV6!CCw4Lx5 zNTJg^p+7I_-@|LV)RE0a>lT8Yj(iU((46#LFauiC3%g)6wh=VO526TaARXFJW(`F1 zQdk4YyiBTrKS5jCQv>f{J3(z2Y0uh%XZ; z|94abWbB1ds@@C!l(Luc5AOvX(y4AQw8CsbYldMwwcQ8)fvtt{0XT|enrTKS>bDPC z*|W_YS_>sAX57_2n`Z5USjeX8ec*)7QcSq5ijQIoGP;o8573%7m3p12_y^d9*O6*A zVHjoq2%Xq&6+c2=Ol#qkwIo1gv2s^e={xrCb=vhKB!yq++T*E1-5A6rH3;d#G)pMO z{RGd1d-gQWYb&2gnz9>x_!DdjPf-Ob3yf@tmANqnj2uBT{UL(h+0V}JPBZ^tr>3^E z#8LADkeJP~SeN0NyBu?kzyS z{b=hU=xHnDaOO%jkb(|FOin?AVBXAc^fjR2D?l^)`51W(8;sna9ytu-?1LH#ftNF! zbmB0yha$2cfxZz%W*lV5I4~7tKNZoFN1%XFzCHpic&R-CEqSpXh0o)!@f;xo!pvAn z&SWi^+Fu6AH9B+@QfzLn*T}yXq8h$ZYazy7tWu;wmZ`us8eIzmVkIH_DA^XS3PKK- zkp@iKR12LPj8Z5!lf6M6CiY`W)0|^am@-)OQbspBU5Uu!N~MCyt@|icO=SqJItF1d zlr|rO{Gi4}!zlJ=h>RE_yshIj>4wt4pJ5`D(wd)P0F;q_oHM7CZr6dmvf^S84LlB$ z{YpilqgYKFrL^rhC;4zXc8aBy(QQVzmzwP|mNOu-{%&JQ)6nFjg|5XIfH$^awf6f<3>?)U5R!lFjKY&zJt7<-^l=W@BjX%Q#YfE} z(vowK2IFb_IhYmA)+m%5-8TSvHa7QP1YbJVpXcg4{XAEaa$0ttL;26N<~)owDHG`A zB8;R}fIc+(0`y}X=XoeGQ3q0SszsQGt1-Wwf@#z-HDd-O#f&QjCr<;?*mt!hNWz6(O z`{eoqmiSE-#za<=EjyJ)-)4_abxpg?zOzgf4!Y2VTW8%JSnK(UQO?;~@3lkc+JIQt z6RitZVargaYBDes|N9hHAk3gr3qFW5)xjOMSzh`lk&h1#VKXVg2V;5Z;e$o+EWPT3 z|H9|g#Fj~awqh#GRvC@61+}qaFaEr4WrEohA+SBp5wv~;rbNy$lj#5_lMG__G{n%r zNRFF1v`k=xMD7*Im2VE^+AvDda4vNKIZt>IRq5CkUQkk-y&#-_M=f2e;x5gj%8RCA z41Gn%G@R>}KKH)T8LFhuHKp^Xl0H{SkCHU^kwVIIkY+D?bRIEJ<MB_@N_^jj}-4f@C+*G&2F9ihB8D$2L`s&i{t_Rmav~E!B{@Nai3% zHPKRkOkpw=Tvb%(kIArDx-_Eqe6z>8Lu4^C@ucY_3sbWZ?tmwNB$Us1-iIy0cLFuL zzac0-0POH4O%K4dV7C^RWaP2rf6!OFi;UF64sjmn%d(+MD^pY;X224qNzj5unk=Cw z0&zgrQgsPs+?QFlyKk^`wn}vqh}%Pqx|GfYVp3qWa5%X+J*%42Qc4KIq!hU)b8~>~ zFSdTngddBTSt}peSvVl(sS{RHMG(d%NNlO+1aM0GPf|pE8i?pv5QafDtq;PE=3=LS zU~C)4gpzJ4FCJ??{a#@(La5wgF}bpB_H=7Dx*4`+^102ht-nX4G!d;1#H>QrZYH|> z-aOL?G8EVdZV9~XQKG_26qGzspPSU z$-p;eK4Tszinqx(6o)I6%%&(cnnHQUWcsM5t$G>n!w_u2QffjlhGueQyhq9?lf}C< zlNB-bY01l`P%L&V7t(8s6x;TWVl^ALAEeS~Ic0=#v0F~gFf6b!qBOw{T7QslTC2k_ zgdtnPxJE9g%VBt&m!HD%VcY)-^?LU&>KB1WBig{`A%1?{PY1AA@@uye<%pC)>ZN0q zFg_M)$g!BOkCK9peSzUgXl|^$AB(#&^9hASVdr3Gvzpm>YR~&LG7A3@xzZE=i2QP6 zdY>Kn5d}tbaW{_?;mV0d7r>`;oTjwIEn!~>hl(_-Rt1`+hjh;uG`JOx zuzh7_#5eRwD{O9IyvpdC4qF=Ehgjz?=~gRzDAJAdb;Iq1b96p)cq$2d!W#N43H!iW zx|xKDbhJI{)I6D6=6dRpjES&;%9F9XeWT#_MlL)n%~vU#>EKPSPm}R;3-on8-WEF{ zY^HZpv3bH4p})deBFnn*tx)gEInt7iqvB>Nw#?ol#G*xC^jy4X(V|$s8ZvsrH>XX4 zeDpIINz-b3%FHv7XlNRahpn_G4d=mkRG5wf;6Jo59b3UR`ihr??ZT-n*014pVT)JQ z_@pWWySCopMshYr;&NEe|NI-`g|SmUgs>sBG-1AnYM@WN+_1r!9Xpj1+bms?dnH64edGTfV02BT_-N?jv*hNw8F+Q=z zEDm1SYfbFa7R7BhjcAWUbNAeXw%0`atBJPn9{3s)KE#CoKxcXAp&jip%C-U(=bva{ z2P}a7RNDa`N<3gPXeLi(95iRw99BBeEI@|@J&=wLn%NPX!$EqxBaUKk)px|W^uwm0 zaI+pBxkr%=Cj5%Y=qMFt@#$;nu`GNHj=A<{p$_mf9m~ePaGa7lVNUD`_gnG|9)&qE z3@mA=*~e){C+^87=)F#uVVn>S_2ODbwVm*9aFRxM<^(uJ)t$Neou+R(V+s61!Cf#X z@K;kYzWp-GlQgmmr^0WpXf*tzaH>SF_MPn;A}WY`*W}!&bsz@ z#{*zF%ej2364PCEJ+U0{vimwz-ka|*H+o|fjm`#9nQ@yRrV99i`EoAy!b@IAcu`PV zCB`JIPD0d*Y!8);KrRUj7wuT_} zX2w&=6(PHFl)5V3@!T}MaMg<%<6Yy(=Q-x8;88|3WHq>47d)Gp)(}|J|>|Jl?cW=RC}@ z`RJ;9S!r4xE=Qr$*H80PZ{Ywu2s)+YV-H@&0 zIY>7jt@sZc{1r%{#jKw%Jzk6j$RgDJ#ott@$^C_)@&*wtq3k%jZba(dR~3fKD~05; zOJHQA#N+PL^hV=P69#i>^rx2wV_Kw_ij8>DuEFTwbNoISlfu1_G~>!YEE+K;?x7MK!hf&G7{d07p`k-?4qvtp4#C$T zjvgP%OFY#N#pfY`o*%~EN|aPie&_cuWr9S?D8(^+DSo{avuCu@jh4FJUnyc$^Er

( zmK*KvgU81Wlz8d7aT3kzfxK66M?K90f4F93==vc>&;#UuDhu8Bj&###DgqfVQ>Smr z(9W;_`^vCgyc_DdHZ-Qm_Mw_#JkItQ&Q5*FHGDXp2C%zwN1|1*werfjF1K)vE60l# X`1OU6W6?EotYzU!c#qD9_@w?H1-*%= -- 2.39.5