Updated static texts

4 files changed, 58 insertions, 117 deletions

diff --git a/templates/web/fixamingata/contact/address.html b/templates/web/fixamingata/contact/address.html
index b7ff37e5c..83442d299 100644
--- a/templates/web/fixamingata/contact/address.html
+++ b/templates/web/fixamingata/contact/address.html
@@ -1,11 +1,9 @@
 <div class="contact-details">
-<p>FixMyStreet is a service provided by mySociety, which is the project of a 
-registered charity. The charity is called UK Citizens Online Democracy and is charity number 1076346.</p>
-<p>mySociety can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
-or by post at:</p>
-<p>mySociety<br>
-483 Green Lanes<br>
-London<br>
-N13 4BS<br>
-UK</p>
+<p>FixaMinGata är en tjänst som tillhandahålls av Föreningen Sambruk, en
+förening med ca 100 medlemskommuner, med gemensamt intresse av e-tjänster.
+Du kan kontakta Föreningen Sambruk via post:</p>
+
+<p>Föreningen Sambruk<br>
+c/o SAndvikens kommun<br>
+811 80 Sandviken</p>
 </div>
diff --git a/templates/web/fixamingata/static/fun.html b/templates/web/fixamingata/static/fun.html
index 57a74a0d7..ff8f30e49 100644
--- a/templates/web/fixamingata/static/fun.html
+++ b/templates/web/fixamingata/static/fun.html
@@ -1,12 +1,13 @@
 [% INCLUDE header.html
-    title = 'Weird and Wonderful reports'
+    title = 'Udda och imponerande rapporter'
 %]
 
-<h1>Weird and Wonderful reports</h1>
+<h1>Udda och imponerande rapporter</h1>
 
-<p>Here are some of the best or strangest reports we&rsquo;ve seen on FixMyStreet.
-They&rsquo;ve all been fixed, and in one case could have saved lives!
-Do let us know if you find any more.</p>
+<p>
+Här är några av de bästa och mest udda rapporter som har synts på
+den engelska FixMyStreet. Meddela oss om du hittar några liknande
+rapporter på svenska FixaMingata!</p>
 
 <ul class="plain-list">
 
@@ -28,7 +29,6 @@ Do let us know if you find any more.</p>
     <li><h2>Dangerous Nivea Billboard</h2>
     	<p>&ldquo;The Nivea 'Oxygen is a wonderful thing' billboard here has a device on it releasing bubbles and foam. This is blowing into the road which is both distracting and dangerous to drivers. A large ball of foam hit my windscreen unexpectedly and nearly caused me to have an accident&rdquo; &mdash;
         <a href='http://www.fixmystreet.com/report/7552'>Problem report</a>
-
 </ul>
 
 [% INCLUDE footer.html %]
diff --git a/templates/web/fixamingata/static/posters.html b/templates/web/fixamingata/static/posters.html
deleted file mode 100644
index 760397b02..000000000
--- a/templates/web/fixamingata/static/posters.html
+++ /dev/null
@@ -1,39 +0,0 @@
-[% INCLUDE header.html
-    title = 'Publicity material'
-%]
-
-[% 
-    badge = '<a href="http://www.fixmystreet.com/"> <img src="http://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>'
-%]
-
-<h1>Publicity Material</h1>
-
-    <p>Copy and paste the text below to add this badge to your site:</p>
-    <p>[% badge %]</p>
-    <textarea onclick="this.select()">[% badge | html %]</textarea>
-    <p><small>(thanks to Lincolnshire Council for the image)</small></p>
-
-    <p>Here are some posters and flyers you can use to publicise FixMyStreet:</p>
-    <img hspace="5" src="/posters/poster.png" alt='Example poster'>
-    <h2>Posters</h2>
-    <ul class="issue-list-a full-width">
-        <li><a href='/posters/fixmystreet-poster-a4.pdf'>A4, colour</a>
-        <li><a href='/posters/fixmystreet-poster-a4-bw.pdf'>A4, black and white</a>
-        <li><a href='/posters/fixmystreet-poster-a4-bw-low-ink.pdf'>A4, black and white, low ink</a>
-        <li><a href='/posters/fixmystreet-poster-a4-bw-outlined.pdf'>A4, black and white, outlined</a>
-    </ul>
-    <h2>Posters with tags</h2>
-    <ul class="issue-list-a full-width">
-        <li><a href='/posters/fixmystreet-poster-tags.pdf'>A4, colour</a>
-        <li><a href='/posters/fixmystreet-poster-tags-bw.pdf'>A4, black and white</a>
-        <li><a href='/posters/fixmystreet-poster-tags-bw-low-ink.pdf'>A4, black and white, low ink</a>
-        <li><a href='/posters/fixmystreet-poster-tags-only.pdf'>A4, tags only</a>
-    </ul>
-    <h2>Flyers</h2>
-    <ul class="issue-list-a full-width">
-        <li><a href='/posters/fixmystreet-flyers-colour.pdf'>4 x A6, colour</a>
-        <li><a href='/posters/fixmystreet-flyers-bw-outlined.pdf'>4 x A6, black and white, outlined</a>
-        <li><a href='/posters/fixmystreet-flyers-bw-low-ink.pdf'>4 x A6, black and white, low ink</a>
-    </ul>
-
-[% INCLUDE footer.html %]
diff --git a/templates/web/fixamingata/static/privacy.html b/templates/web/fixamingata/static/privacy.html
index 92e096ef4..c94c2947a 100755
--- a/templates/web/fixamingata/static/privacy.html
+++ b/templates/web/fixamingata/static/privacy.html
@@ -1,84 +1,66 @@
-[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %]
+[% INCLUDE 'header.html', title => loc('Vanliga Frågor'), bodyclass => 'twothirdswidthpage' %]
 
 <div class="sticky-sidebar">
     <aside>
         <ul class="plain-list">
-            <li><a href="/faq#faq">Frequently Asked Questions</a></li>
-            <li><a href="/faq#practical">Practical Questions</a></li>
-            <li><a href="/faq#organisation">Organisation Questions</a></li>
-            <li><strong>Privacy and cookies</strong></li>
+            <li><a href="/faq#faq">Vanliga frågor</a></li>
+            <li><a href="/faq#practical">Praktiska frågor</a></li>
+            <li><a href="/faq#organisation">Organisation</a></li>
+            <li><strong>Sekretess och kakor</strong></li>
         </ul>
     </aside>
 </div>
 
-<h1>Privacy, cookies, and third party services</h1>
+<h1>Sekretess, kakor och tredjepartstjänster<h1>
 
-<p><strong>Our use of your data, cookies, and external services: what you should know, and how to opt out if you want to.</strong></p>
+<p><strong>Vår användning av din data, kakor och externa tjänster. Vad du behöver veta och hur du väljer att gå ur.</strong></p>
 
-<p>Summary: We care a lot about our users’ privacy. We provide details below,
-and we try our hardest to look after the private data that we hold. Like many
-other websites, we sometimes use cookies and Google Analytics to help us make
-our websites better. These tools are very common and used by many other sites,
-but they do have privacy implications, and as a charity concerned with socially
-positive uses of the internet, we think it’s important to explain them in full.
-If you don’t want to share your browsing activities on mySociety’s sites with
-other companies, you can adjust your usage or install opt-out browser plugins.
+<p>Sammanfattning: Vi bryr oss om våra användares privatliv. Du kan läsa
+mer detaljer om det här nedan. Vi gör vårt bästa för säkra den privata
+information som vi har i vår databas. Precis som många andra webbplatser
+använder vi ibland kakor för att hjälpa oss göra
+tjänsten bättre. De här verktygen är väldigt vanliga och används av många
+andra tjänster, men det finns nackdelar med dem och vi är måna om att du
+förstår hur din data används.</p>
 
-<h2>Privacy</h2>
+<h2>Sekretess</h2>
 
     <dl>
-        <dt>Who gets to see my email address?</dt>
-        <dd>If you submit a problem, we pass on your details, and details
-of the problem, to the council contact or contacts responsible for the
-area where you located the problem, or other relevant body (for example, in
-most of London we send reports via the central London Report-It service, who
-may also publish the public details of your report). Other than the council, who obviously get your
-email address, only people we authorise to view the FixMyStreet administration interface
-will be able to see your email address and they will never use it for anything other than 
-to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, 
-unless we are obliged to by law. Your name, given in the name field, will not
-be published anywhere unless you let us (if you give your name elsewhere, e.g.
-in the public details section, it will be publicly available).</dd>
-        <dt>Will you send nasty, brutish spam to my email address?</dt>
-        <dd>Never. We will email you if someone leaves an update on a
-problem you&rsquo;ve reported, and send you a questionnaire email four weeks
-after you submit a problem, asking for a status update; we&rsquo;ll only ever
-send you emails in relation to your problem.</dd>
-    </dl>
-
-<h2>Cookies</h2>
-
-<p>To make our service easier or more useful, we sometimes place small data files on your computer or mobile phone, known as cookies; many websites do this. We use this information to, for example, remember you have logged in so you don't need to do that on every page, or to measure how people use the website so we can improve it and make sure it works properly. Below, we list the cookies and services that this site can use.
-
-<table cellpadding=5>
-<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
-<tr><td>fixmystreet_app_session</td><td nowrap>A random unique identifier</td><td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td></tr>
-</table>
-
-<h3>Measuring website usage (Google Analytics)</h3>
+        <dt>Vem ser min epostadress?</dt>
+        <dd>Om du rapporterar ett problem kommer vi att skicka din
+information och information om problemet till den kommun som är ansvarig
+för det område där du lokaliserat problemet. Förutom kommunen, som
+givetvis får se din epostadress, kommer personer som är ansvariga för
+tjänsten FixaMinGata att kunna se din epostadress. Ingen kommer att
+använda din epostadress för något annat än för att kunna administrera
+FixaMinGata. Vi kommer inte ge ut eller sälja din epostadress till någon
+annan om vi inte blir tvingade till det av domstol. Ditt namn, som du
+anger det, kommer inte att publiceras om du inte vill att vi publcierar
+det. Observera dock att om du skriver ditt namn någon annan stans,
+exempelvis i informationen om en rapport, kommer det att bli publik
+synligt.</dd>
+
+        <dt>Kommer ni att skicka spam?</dt>
+        <dd>Aldrig. Vi kommer att skicka brev till dig om någon lämnar
+en uppdatering på ett problem som du rapporterat, och skicka dig ett
+frågeformulär fyra veckor efter din rapportering där vi frågar om
+uppdatering. Vi kommer endast att skicka brev i relation till ditt problem.</dd>
 
-<p>We use Google Analytics to collect information about how people use this site. We do this to make sure it’s meeting its users’ needs and to understand how we could do it better. Google Analytics stores information such as what pages you visit, how long you are on the site, how you got here, what you click on, and information about your web browser. IP addresses are masked (only a portion is stored) and personal information is only reported in aggregate. We do not allow Google to use or share our analytics data for any purpose besides providing us with analytics information, and we recommend that any user of Google Analytics does the same.
+    </dl>
 
-<p>If you’re unhappy with data about your visit to be used in this way, you can install the <a href="http://tools.google.com/dlpage/gaoptout">official browser plugin for blocking Google Analytics</a>.
+<h2>Kakor</h2>
 
-<p>The cookies set by Google Analytics are as follows:
+<p>För att göra våra tjänster lättare och mer användbara skickar vi
+ibland små datafiler till din dator eller mobiltelefon. Dessa kallas för
+kakor och de flesta webbplatser använder dem. Vi använder den här
+informationen för att, till exempel, komma ihåg när du har loggat in
+så att du slipper göra det på varje sida, och för att mäta hur 
+tjänsten används så att vi kan förbättra den. Nedan ger vi en lista med
+de kakor som den här tjänsten använder.
 
 <table cellpadding=5>
-<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
-<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2&nbsp;years</td></tr>
-<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30&nbsp;minutes</td></tr>
-<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6&nbsp;months</td></tr>
-<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2&nbsp;years</td></tr>
+<tr align="left"><th scope="col">Namn</th><th scope="col">Innehåll</th><th scope="col">Giltighet</th></tr>
+<tr><td>fixmystreet_app_session</td><td nowrap>A slumpvis sträng</td><td>Raderas när webbläsaren stängs, eller efter fyra veckor om &lgquo;Håll mig inloggad&rdquo; är valt</td></tr>
 </table>
 
-<h4>Google’s Official Statement about Analytics Data</h4>
-
-<p>“This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage.  Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google.  You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website.  By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p>
-
-<p><a href="http://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p>
-
-<h2>Credits</h2>
-
-<p>Bits of wording taken from the <a href="http://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence).
-
 [% INCLUDE 'footer.html' pagefooter = 'yes' %]