From 0bce69fe9c0d9d66e6242c5673cf8c9bf6564d0b Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 17 Mar 2011 14:55:25 -0700 Subject: [PATCH] swedush string update via erikl --- view/sv/strings.php | 143 -------------------------------------------- 1 file changed, 143 deletions(-) diff --git a/view/sv/strings.php b/view/sv/strings.php index d30a14b1fc..6685130bb9 100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php @@ -60,11 +60,7 @@ $a->strings['December'] = 'december'; $a->strings['Birthdays this week:'] = 'Födelsedagar denna vecka:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28Justerad till lokal tid\x29"; $a->strings['[today]'] = '[today]'; -<<<<<<< HEAD -$a->strings['link to source'] = 'länk till källa'; -======= $a->strings['link to source'] = 'link to source'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['No recipient selected.'] = 'Ingen mottagare vald.'; $a->strings['[no subject]'] = '[no subject]'; $a->strings['Unable to locate contact information.'] = 'Hittar inga kontaktuppgifter.'; @@ -98,20 +94,12 @@ $a->strings['Could not access contact record.'] = 'Could not access contact reco $a->strings['Could not locate selected profile.'] = 'Hittade inte vald profil.'; $a->strings['Contact updated.'] = 'Kontakten har uppdaterats.'; $a->strings['Failed to update contact record.'] = 'Failed to update contact record.'; -<<<<<<< HEAD -$a->strings['Contact has been '] = 'Kontakten '; -======= $a->strings['Contact has been '] = 'Kontakt '; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['blocked'] = 'spärrad'; $a->strings['unblocked'] = 'inte längre spärrad'; $a->strings['ignored'] = 'ignoreras'; $a->strings['unignored'] = 'ignoreras inte längre'; -<<<<<<< HEAD -$a->strings['stopped following'] = 'följer inte längre'; -======= $a->strings['stopped following'] = 'stopped following'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Contact has been removed.'] = 'Kontakten har tagits bort.'; $a->strings['Contact not found.'] = 'Kontakten hittades inte.'; $a->strings['Mutual Friendship'] = 'Ömsesidig vänskap'; @@ -154,41 +142,20 @@ $a->strings['No user record found for '] = 'No user record found for '; $a->strings['Our site encryption key is apparently messed up.'] = 'Det är något fel på webbplatsens krypteringsnyckel.'; $a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.'; $a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.'; -<<<<<<< HEAD -$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'Det ID som angavs av ditt system är samma som på vårt system. Det borde fungera om du provar igen.'; -======= $a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.'; $a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system'; $a->strings["Connection accepted at "] = "Connection accepted at "; $a->strings['Administrator'] = 'Administratör'; $a->strings['noreply'] = 'noreply'; -<<<<<<< HEAD -$a->strings[' commented on an item at '] = ' har kommenterat '; -$a->strings[" commented on an item at "] = " har kommenterat "; -$a->strings[' welcomes '] = ' välkomnar '; -$a->strings["This introduction has already been accepted."] = "Den här förfrågan har redan accepterats."; -======= $a->strings[' commented on an item at '] = ' skrev en kommentar på '; $a->strings[" commented on an item at "] = " skrev en kommentar på "; $a->strings[' welcomes '] = ' välkomnar '; $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted."; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profiladressen är ogiltig eller innehåller ingen profilinformation.'; $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.'; $a->strings['Warning: profile location has no profile photo.'] = 'Warning: profile location has no profile photo.'; $a->strings[' required parameter'] = ' obligatoriskt fält'; -<<<<<<< HEAD -$a->strings[" was "] = " var "; -$a->strings["s were "] = " var "; -$a->strings["not found at the given location."] = "finns inte på platsen som angavs."; -$a->strings["Introduction complete."] = "Presentationen klar."; -$a->strings['Unrecoverable protocol error.'] = 'Irreparabelt protokollfel.'; -$a->strings['Profile unavailable.'] = 'Profilen är inte tillgänglig.'; -$a->strings[' has received too many connection requests today.'] = ' har tagit emot för många förfrågningar idag.'; -$a->strings['Spam protection measures have been invoked.'] = 'Åtgärder för skydd mot spam har aktiverats.'; -======= $a->strings[" was "] = " was "; $a->strings["s were "] = "s were "; $a->strings["not found at the given location."] = "finns inte på platsen som angavs."; @@ -197,28 +164,18 @@ $a->strings['Unrecoverable protocol error.'] = 'Unrecoverable protocol error.'; $a->strings['Profile unavailable.'] = 'Profilen är inte tillgänglig.'; $a->strings[' has received too many connection requests today.'] = ' has received too many connection requests today.'; $a->strings['Spam protection measures have been invoked.'] = 'Spam protection measures have been invoked.'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.'; $a->strings["Invalid locator"] = "Invalid locator"; $a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location."; $a->strings['You have already introduced yourself here.'] = 'Du har redan presenterat dig här.'; $a->strings['Apparently you are already friends with .'] = 'Du är tydligen redan vän med .'; $a->strings['Invalid profile URL.'] = 'Ogiltig profil-URL.'; -<<<<<<< HEAD -$a->strings['Disallowed profile URL.'] = 'Otillåten profil-URL.'; -$a->strings['Your introduction has been sent.'] = 'Presentationen har skickats.'; -$a->strings["Please login to confirm introduction."] = "Logga in för att acceptera förfrågan."; -$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Incorrect identity currently logged in. Please login to this profile."; -$a->strings['[Name Withheld]'] = '[Name Withheld]'; -$a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrågan'; -======= $a->strings['Disallowed profile URL.'] = 'Disallowed profile URL.'; $a->strings['Your introduction has been sent.'] = 'Presentationen har skickats.'; $a->strings["Please login to confirm introduction."] = "Please login to confirm introduction."; $a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Incorrect identity currently logged in. Please login to this profile."; $a->strings['[Name Withheld]'] = '[Name Withheld]'; $a->strings['Friend/Connection Request'] = 'Friend/Connection Request'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Please answer the following:'] = 'Besvara följande, tack:'; $a->strings['Does $name know you?'] = 'Känner $name dig?'; $a->strings['Yes'] = 'Ja'; @@ -315,26 +272,16 @@ $a->strings['Remote privacy information not available.'] = 'Remote privacy infor $a->strings['Visible to:'] = 'Synlig för:'; $a->strings['Password reset requested at '] = 'Lösenordsåterställning begärd kl '; $a->strings["Welcome back "] = "Välkommen tillbaka "; -<<<<<<< HEAD -$a->strings['Manage Identities and/or Pages'] = 'Ändra identitet eller sidor'; -$a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29"; -$a->strings['Select an identity to manage: '] = 'Välj vilken identitet du vill ändra: '; -======= $a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages'; $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29"; $a->strings['Select an identity to manage: '] = 'Select an identity to manage: '; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Normal View'] = 'Normal vy'; $a->strings['New Item View'] = 'New Item View'; $a->strings['Share'] = 'Dela'; $a->strings['Insert YouTube video'] = 'Infoga klipp från YouTube'; $a->strings['Set your location'] = 'Ange plats'; $a->strings['Clear browser location'] = 'Clear browser location'; -<<<<<<< HEAD -$a->strings['Permission settings'] = 'Åtkomstinställningar'; -======= $a->strings['Permission settings'] = 'Permission settings'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['No such group'] = 'Gruppen finns inte'; $a->strings['Group is empty'] = 'Gruppen är tom'; $a->strings['Group: '] = 'Grupp: '; @@ -344,17 +291,10 @@ $a->strings['Discard'] = 'Kasta bort'; $a->strings['Ignore'] = 'Ignorera'; $a->strings['Show Ignored Requests'] = 'Show Ignored Requests'; $a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests'; -<<<<<<< HEAD -$a->strings['Claims to be known to you: '] = 'Hävdar att du vet vem han/hon är: '; -$a->strings['yes'] = 'ja'; -$a->strings['no'] = 'nej'; -$a->strings['Approve as: '] = 'Godkänn som: '; -======= $a->strings['Claims to be known to you: '] = 'Claims to be known to you: '; $a->strings['yes'] = 'ja'; $a->strings['no'] = 'nej'; $a->strings['Approve as: '] = 'Approve as: '; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Friend'] = 'Vän'; $a->strings['Fan/Admirer'] = 'Fan/Beundrare'; $a->strings['Notification type: '] = 'Notification type: '; @@ -371,11 +311,7 @@ $a->strings['Profile Photos'] = 'Profilbilder'; $a->strings['Album not found.'] = 'Albumet finns inte.'; $a->strings['Delete Album'] = 'Ta bort album'; $a->strings['Delete Photo'] = 'Ta bort foto'; -<<<<<<< HEAD -$a->strings['was tagged in a'] = 'har taggats i'; -======= $a->strings['was tagged in a'] = 'was tagged in a'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['by'] = 'av'; $a->strings['Image exceeds size limit of '] = 'Bilden överskrider den tillåtna storleken '; $a->strings['Unable to process image.'] = 'Bilden kunde inte bahandlas.'; @@ -384,11 +320,7 @@ $a->strings['No photos selected'] = 'Inga foton har valts'; $a->strings['Upload Photos'] = 'Ladda upp foton'; $a->strings['New album name: '] = 'Nytt album med namn: '; $a->strings['or existing album name: '] = 'eller befintligt album med namn: '; -<<<<<<< HEAD -$a->strings['Permissions'] = 'Åtkomst'; -======= $a->strings['Permissions'] = 'Permissions'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Edit Album'] = 'Redigera album'; $a->strings['View Photo'] = 'Visa foto'; $a->strings['Photo not available'] = 'Fotot är inte tillgängligt'; @@ -396,17 +328,10 @@ $a->strings['Edit photo'] = 'Redigera foto'; $a->strings['View Full Size'] = 'Visa fullstor'; $a->strings['Tags: '] = 'Taggar: '; $a->strings['[Remove any tag]'] = '[Remove any tag]'; -<<<<<<< HEAD -$a->strings['New album name'] = 'Nytt album med namn'; -$a->strings['Caption'] = 'Caption'; -$a->strings['Add a Tag'] = 'Lägg till tagg'; -$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping'; -======= $a->strings['New album name'] = 'New album name'; $a->strings['Caption'] = 'Caption'; $a->strings['Add a Tag'] = 'Lägg till tagg'; $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Recent Photos'] = 'Nyligen tillagda foton'; $a->strings['Upload New Photos'] = 'Ladda upp foton'; $a->strings['View Album'] = 'Titta i album'; @@ -417,11 +342,7 @@ $a->strings['Image size reduction [48] failed.'] = 'Fel när bildstorlek skulle $a->strings['Unable to process image'] = 'Det gick inte att behandla bilden'; $a->strings['Image uploaded successfully.'] = 'Bilden har laddats upp.'; $a->strings['Image size reduction [640] failed.'] = 'Fel när bildstorlek skulle minskas [640].'; -<<<<<<< HEAD -$a->strings['Profile Name is required.'] = 'Profilen måste ha ett namn.'; -======= $a->strings['Profile Name is required.'] = 'Profile Name is required.'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Profile updated.'] = 'Profilen har uppdaterats.'; $a->strings['Profile deleted.'] = 'Profilen har tagits bort.'; $a->strings['Profile-'] = 'Profil-'; @@ -430,11 +351,7 @@ $a->strings['Profile unavailable to clone.'] = 'Det gick inte att klona profilen $a->strings['This is your public profile.
It may be visible to anybody using the internet.'] = 'Det här är din offentliga profil.
Den kan vara synlig för vem som helst på internet.'; $a->strings['Age: '] = 'Ålder: '; $a->strings['Profile Image'] = 'Profilbild'; -<<<<<<< HEAD -$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-URL'; -======= $a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-url'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Please enter the required information.'] = 'Fyll i alla obligatoriska fält.'; $a->strings['Please use a shorter name.'] = 'Välj ett kortare namn.'; $a->strings['Name too short.'] = 'Namnet är för kort.'; @@ -464,11 +381,7 @@ $a->strings['Choose a profile nickname. This must begin with a text character. Y $a->strings['Choose a nickname: '] = 'Välj ett användarnamn: '; $a->strings['Please login.'] = 'Logga in.'; $a->strings['Registration revoked for '] = 'Registration revoked for '; -<<<<<<< HEAD -$a->strings['Account approved.'] = 'Kontot har godkänts.'; -======= $a->strings['Account approved.'] = 'Account approved.'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Remove My Account'] = 'Ta bort mitt konto'; $a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'Detta kommer att ta bort kontot helt och hållet. Efter att det är gjort går det inte att återställa.'; $a->strings['Please enter your password for verification:'] = 'Ange lösenordet igen för jämförelse:'; @@ -485,21 +398,12 @@ $a->strings['Plugin Settings'] = 'Plugin Settings'; $a->strings['Account Settings'] = 'Kontoinställningar'; $a->strings['No Plugin settings configured'] = 'No Plugin settings configured'; $a->strings['OpenID: '] = 'OpenID: '; -<<<<<<< HEAD -$a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Valfritt\x29 Tillåt inloggning med detta OpenID på det här kontot."; -$a->strings['Profile is not published.'] = 'Profilen är inte publicerad.'; -$a->strings['Default Post Permissions'] = 'Default Post Permissions'; -$a->strings['Tag removed'] = 'Taggen har tagits bort'; -$a->strings['Remove Item Tag'] = 'Ta bort tagg'; -$a->strings['Select a tag to remove: '] = 'Välj vilken tagg som ska tas bort: '; -======= $a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Optional\x29 Allow this OpenID to login to this account."; $a->strings['Profile is not published.'] = 'Profilen är inte publicerad.'; $a->strings['Default Post Permissions'] = 'Default Post Permissions'; $a->strings['Tag removed'] = 'Taggen har tagits bort'; $a->strings['Remove Item Tag'] = 'Remove Item Tag'; $a->strings['Select a tag to remove: '] = 'Välj tagg som ska tas bort: '; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Remove'] = 'Ta bort'; $a->strings['No contacts.'] = 'Inga kontakter.'; $a->strings['Visible To:'] = 'Synlig för:'; @@ -598,11 +502,7 @@ $a->strings['Divorced'] = 'Skiljd'; $a->strings['Widowed'] = 'Widowed'; $a->strings['Uncertain'] = 'Uncertain'; $a->strings['Complicated'] = 'Komplicerat'; -<<<<<<< HEAD -$a->strings['Don\'t care'] = 'Bryr mig inte'; -======= $a->strings['Don\'t care'] = 'Don\'t care'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Ask me'] = 'Fråga mig'; $a->strings['Facebook disabled'] = 'Facebook disabled'; $a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.'; @@ -611,17 +511,10 @@ $a->strings['Install Facebook post connector'] = 'Install Facebook post connecto $a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector'; $a->strings['Facebook'] = 'Facebook'; $a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings'; -<<<<<<< HEAD -$a->strings['Post to Facebook'] = 'Lägg in på Facebook'; -$a->strings['Image: '] = 'Bild: '; -$a->strings['Select files to upload: '] = 'Välj filer att ladda upp: '; -$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Använd följande bara om javauppladdaren ovanför inte startar.'; -======= $a->strings['Post to Facebook'] = 'Post to Facebook'; $a->strings['Image: '] = 'Bild: '; $a->strings['Select files to upload: '] = 'Välj filer att ladda upp: '; $a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Use the following controls only if the Java uploader [above] fails to launch.'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Upload a file'] = 'Ladda upp fil'; $a->strings['Drop files here to upload'] = 'Dra filer som ska laddas upp hit'; $a->strings['Failed'] = 'Misslyckades'; @@ -632,48 +525,21 @@ $a->strings['File has an invalid extension, it should be one of '] = 'Otillåten $a->strings['Upload was cancelled, or server error encountered'] = 'Serverfel eller avbruten uppladdning'; $a->strings['Randplace Settings'] = 'Randplace Settings'; $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin'; -<<<<<<< HEAD -$a->strings['Post to StatusNet'] = 'Lägg in på StatusNet'; -======= $a->strings['Post to StatusNet'] = 'Post to StatusNet'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings'; $a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'; $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key'; $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret'; $a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x28remember the trailing /\x29"; $a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.'; -<<<<<<< HEAD -$a->strings['Log in with StatusNet'] = 'Logga in med StatusNet'; -$a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here'; -$a->strings['Currently connected to: '] = 'Ansluten till: '; -======= $a->strings['Log in with StatusNet'] = 'Log in with StatusNet'; $a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here'; $a->strings['Currently connected to: '] = 'Currently connected to: '; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['If enabled all your public postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your public postings will be posted to the associated StatusNet account as well.'; $a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet'; $a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration'; $a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tredimensionellt luffarschack'; $a->strings['3D Tic-Tac-Toe'] = '3D-luffarschack'; -<<<<<<< HEAD -$a->strings['New game'] = 'Ny spelomgång'; -$a->strings['New game with handicap'] = 'Ny spelomgång med handikapp'; -$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Det tredimensionella luffarschacket är precis som vanligt luffarschack förutom att det spelas i flera nivåer samtidigt. '; -$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'Här är det tre nivåer. Man vinner om man får tre i rad på vilken nivå som helst, eller uppåt, nedåt eller diagonalt på flera nivåer.'; -$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Om man spelar med handikapp så stängs mittenpositionen på mittennivån av eftersom spelare som väljer den positionen ofta får övertaget.'; -$a->strings['You go first...'] = 'Du börjar...'; -$a->strings['I\'m going first this time...'] = 'Jag börjar den här gången...'; -$a->strings['You won!'] = 'Du vann!'; -$a->strings['"Cat" game!'] = '"Cat" game!'; -$a->strings['I won!'] = 'Jag vann!'; -$a->strings['Post to Twitter'] = 'Lägg in på Twitter'; -$a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings'; -$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.'; -$a->strings['At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.'] = 'At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.'; -$a->strings['Copy the PIN from Twitter here'] = 'Ange PIN-koden från Twitter här'; -======= $a->strings['New game'] = 'New game'; $a->strings['New game with handicap'] = 'New game with handicap'; $a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '; @@ -689,7 +555,6 @@ $a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings'; $a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.'; $a->strings['At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.'] = 'At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.'; $a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['If enabled all your public postings will be posted to the associated Twitter account as well.'] = 'If enabled all your public postings will be posted to the associated Twitter account as well.'; $a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter'; $a->strings['Africa/Abidjan'] = 'Afrika/Abidjan'; @@ -1180,11 +1045,7 @@ $a->strings['Israel'] = 'Israel'; $a->strings['Jamaica'] = 'Jamaica'; $a->strings['Japan'] = 'Japan'; $a->strings['Kwajalein'] = 'Kwajalein'; -<<<<<<< HEAD -$a->strings['Libya'] = 'Libyen'; -======= $a->strings['Libya'] = 'Libya'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['MET'] = 'MET'; $a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte'; $a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur'; @@ -1234,11 +1095,7 @@ $a->strings['Pacific/Truk'] = 'Pacific/Truk'; $a->strings['Pacific/Wake'] = 'Pacific/Wake'; $a->strings['Pacific/Wallis'] = 'Pacific/Wallis'; $a->strings['Pacific/Yap'] = 'Pacific/Yap'; -<<<<<<< HEAD -$a->strings['Poland'] = 'Polen'; -======= $a->strings['Poland'] = 'Poland'; ->>>>>>> e94ae8d396b8583407b140faf211f4f92a503bc6 $a->strings['Portugal'] = 'Portugal'; $a->strings['PRC'] = 'PRC'; $a->strings['PST8PDT'] = 'PST8PDT';