From 8fea19dd38cf9c43bb6f6fa1a4f349555cbe90f8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 8 Mar 2011 10:08:50 +0100 Subject: [PATCH 01/83] fixed wrong library path --- addon/twitter/twitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index b2e5aa7ced..678da9388a 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -138,7 +138,7 @@ function twitter_settings(&$a,&$s) { * which the user can request a PIN to connect the account to a * account at Twitter. */ - require_once('addon/twitter/twitteroauth.php'); + require_once('library/twitteroauth.php'); $connection = new TwitterOAuth($ckey, $csecret); $request_token = $connection->getRequestToken(); $token = $request_token['oauth_token']; From a89bba724bb4d9a16cccb804c21b541c7cfa0152 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 13 Mar 2011 11:39:09 +0100 Subject: [PATCH 02/83] resolved some local git quirks --- addon/twitter/twitter.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index 93aca3129b..c59d1b9e5c 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -138,11 +138,7 @@ function twitter_settings(&$a,&$s) { * which the user can request a PIN to connect the account to a * account at Twitter. */ -<<<<<<< HEAD require_once('library/twitteroauth.php'); -======= - require_once('library/twitteroauth.php'); ->>>>>>> a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6 $connection = new TwitterOAuth($ckey, $csecret); $request_token = $connection->getRequestToken(); $token = $request_token['oauth_token']; From 40956faf6dad7def34151ca80fa4d447f1a1840e Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 17 Mar 2011 14:54:15 -0700 Subject: [PATCH 03/83] swedish 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'; From 93504896155d74fc42f6bf60cb61d65295f6b911 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 22 Mar 2011 08:16:40 +0100 Subject: [PATCH 04/83] Updated util/messages.po --- util/messages.po | 2549 ++++++++++++++++++++++++---------------------- 1 file changed, 1329 insertions(+), 1220 deletions(-) diff --git a/util/messages.po b/util/messages.po index 44638bd9ca..1c0c880e97 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.1.913\n" +"Project-Id-Version: 2.1.925\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-18 11:02+0100\n" +"POT-Creation-Date: 2011-03-22 08:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,266 +18,553 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../index.php:187 -msgid "Not Found" -msgstr "" - -#: ../../index.php:188 -msgid "Page not found." -msgstr "" - -#: ../../index.php:243 ../../mod/group.php:88 -msgid "Permission denied" -msgstr "" - -#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 -#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19 +#: ../../mod/network.php:6 ../../mod/profiles.php:7 ../../mod/profiles.php:227 +#: ../../mod/notifications.php:56 ../../mod/install.php:93 +#: ../../mod/message.php:8 ../../mod/message.php:116 ../../mod/manage.php:75 +#: ../../mod/dfrn_confirm.php:53 ../../mod/wall_upload.php:42 +#: ../../mod/display.php:308 ../../mod/regmod.php:16 ../../mod/photos.php:85 +#: ../../mod/photos.php:773 ../../mod/viewcontacts.php:13 +#: ../../mod/editpost.php:10 ../../mod/settings.php:14 +#: ../../mod/settings.php:19 ../../mod/settings.php:210 ../../mod/item.php:57 +#: ../../mod/item.php:668 ../../mod/profile_photo.php:19 #: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139 -#: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16 -#: ../../mod/profiles.php:7 ../../mod/profiles.php:224 -#: ../../mod/settings.php:14 ../../mod/settings.php:19 -#: ../../mod/settings.php:206 ../../mod/photos.php:85 ../../mod/photos.php:772 -#: ../../mod/display.php:303 ../../mod/invite.php:13 ../../mod/invite.php:50 -#: ../../mod/contacts.php:101 ../../mod/register.php:25 -#: ../../mod/network.php:6 ../../mod/notifications.php:56 -#: ../../mod/item.php:57 ../../mod/item.php:616 ../../mod/message.php:8 -#: ../../mod/message.php:116 ../../mod/dfrn_confirm.php:53 -#: ../../mod/viewcontacts.php:13 ../../mod/group.php:19 -#: ../../addon/facebook/facebook.php:110 +#: ../../mod/profile_photo.php:150 ../../mod/group.php:19 +#: ../../mod/invite.php:13 ../../mod/invite.php:50 ../../mod/register.php:25 +#: ../../mod/follow.php:8 ../../mod/contacts.php:106 +#: ../../addon/facebook/facebook.php:110 ../../index.php:251 msgid "Permission denied." msgstr "" -#: ../../boot.php:808 -msgid "Create a New Account" +#: ../../mod/network.php:18 +msgid "Normal View" msgstr "" -#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61 -msgid "Register" +#: ../../mod/network.php:20 +msgid "New Item View" msgstr "" -#: ../../boot.php:815 -msgid "Nickname or Email address: " +#: ../../mod/network.php:69 ../../mod/message.php:172 +#: ../../mod/profile.php:137 +msgid "Please enter a link URL:" msgstr "" -#: ../../boot.php:816 -msgid "Password: " +#: ../../mod/network.php:70 ../../mod/profile.php:138 +msgid "Please enter a YouTube link:" msgstr "" -#: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44 -msgid "Login" +#: ../../mod/network.php:71 ../../mod/profile.php:139 +msgid "Please enter a video(.ogg) link/URL:" msgstr "" -#: ../../boot.php:821 -msgid "Nickname/Email/OpenID: " +#: ../../mod/network.php:72 ../../mod/profile.php:140 +msgid "Please enter an audio(.ogg) link/URL:" msgstr "" -#: ../../boot.php:822 -msgid "Password (if not OpenID): " +#: ../../mod/network.php:73 ../../mod/profile.php:141 +msgid "Where are you right now?" msgstr "" -#: ../../boot.php:825 -msgid "Forgot your password?" +#: ../../mod/network.php:96 ../../mod/network.php:375 +#: ../../mod/display.php:158 ../../mod/photos.php:1086 +#: ../../mod/profile.php:164 ../../mod/profile.php:325 +msgid "Share" msgstr "" -#: ../../boot.php:826 -msgid "Password Reset" +#: ../../mod/network.php:97 ../../mod/message.php:186 +#: ../../mod/message.php:320 ../../mod/profile.php:165 +#: ../../mod/editpost.php:63 +msgid "Upload photo" msgstr "" -#: ../../boot.php:837 ../../include/nav.php:38 -msgid "Logout" +#: ../../mod/network.php:98 ../../mod/message.php:187 +#: ../../mod/message.php:321 ../../mod/profile.php:166 +#: ../../mod/editpost.php:64 +msgid "Insert web link" msgstr "" -#: ../../boot.php:1077 -msgid "prev" +#: ../../mod/network.php:99 ../../mod/profile.php:167 +#: ../../mod/editpost.php:65 +msgid "Insert YouTube video" msgstr "" -#: ../../boot.php:1079 -msgid "first" +#: ../../mod/network.php:100 ../../mod/profile.php:168 +#: ../../mod/editpost.php:66 +msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../boot.php:1108 -msgid "last" +#: ../../mod/network.php:101 ../../mod/profile.php:169 +#: ../../mod/editpost.php:67 +msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../boot.php:1111 -msgid "next" +#: ../../mod/network.php:102 ../../mod/profile.php:170 +#: ../../mod/editpost.php:68 +msgid "Set your location" msgstr "" -#: ../../boot.php:1831 +#: ../../mod/network.php:103 ../../mod/profile.php:171 +#: ../../mod/editpost.php:69 +msgid "Clear browser location" +msgstr "" + +#: ../../mod/network.php:104 ../../mod/network.php:376 +#: ../../mod/message.php:188 ../../mod/message.php:322 +#: ../../mod/display.php:159 ../../mod/photos.php:1087 +#: ../../mod/profile.php:172 ../../mod/profile.php:326 +#: ../../mod/editpost.php:70 +msgid "Please wait" +msgstr "" + +#: ../../mod/network.php:105 ../../mod/profile.php:173 +#: ../../mod/editpost.php:71 +msgid "Permission settings" +msgstr "" + +#: ../../mod/network.php:111 ../../mod/profile.php:180 +#: ../../mod/editpost.php:77 +msgid "CC: email addresses" +msgstr "" + +#: ../../mod/network.php:113 ../../mod/profile.php:182 +#: ../../mod/editpost.php:79 +msgid "Example: bob@example.com, mary@example.com" +msgstr "" + +#: ../../mod/network.php:156 +msgid "No such group" +msgstr "" + +#: ../../mod/network.php:167 +msgid "Group is empty" +msgstr "" + +#: ../../mod/network.php:171 +msgid "Group: " +msgstr "" + +#: ../../mod/network.php:280 ../../mod/network.php:446 +#: ../../mod/display.php:262 ../../mod/profile.php:405 +#: ../../mod/search.php:116 +msgid "View $name's profile" +msgstr "" + +#: ../../mod/network.php:295 ../../mod/search.php:131 +msgid "View in context" +msgstr "" + +#: ../../mod/network.php:329 ../../mod/display.php:149 +#: ../../mod/photos.php:962 ../../mod/profile.php:316 +msgid "Private Message" +msgstr "" + +#: ../../mod/network.php:373 ../../mod/display.php:156 +#: ../../mod/photos.php:1084 ../../mod/profile.php:323 +msgid "I like this (toggle)" +msgstr "" + +#: ../../mod/network.php:374 ../../mod/display.php:157 +#: ../../mod/photos.php:1085 ../../mod/profile.php:324 +msgid "I don't like this (toggle)" +msgstr "" + +#: ../../mod/network.php:389 ../../mod/display.php:171 +#: ../../mod/photos.php:1106 ../../mod/photos.php:1146 +#: ../../mod/photos.php:1175 ../../mod/profile.php:338 +msgid "This is you" +msgstr "" + +#: ../../mod/network.php:397 ../../mod/display.php:222 +#: ../../mod/profile.php:362 ../../mod/editpost.php:62 +msgid "Edit" +msgstr "" + +#: ../../mod/network.php:398 ../../mod/display.php:238 +#: ../../mod/photos.php:1203 ../../mod/profile.php:384 ../../mod/group.php:137 +msgid "Delete" +msgstr "" + +#: ../../mod/network.php:447 ../../mod/display.php:263 +msgid "View $owner_name's profile" +msgstr "" + +#: ../../mod/network.php:448 ../../mod/display.php:264 +msgid "to" +msgstr "" + +#: ../../mod/network.php:449 ../../mod/display.php:265 +msgid "Wall-to-Wall" +msgstr "" + +#: ../../mod/network.php:450 ../../mod/display.php:266 +msgid "via Wall-To-Wall:" +msgstr "" + +#: ../../mod/network.php:484 ../../mod/display.php:317 +#: ../../mod/profile.php:438 ../../mod/register.php:424 +msgid "" +"Shared content is covered by the Creative Commons Attribution 3.0 license." +msgstr "" + +#: ../../mod/profiles.php:21 ../../mod/profiles.php:237 +#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62 +msgid "Profile not found." +msgstr "" + +#: ../../mod/profiles.php:28 +msgid "Profile Name is required." +msgstr "" + +#: ../../mod/profiles.php:199 +msgid "Profile updated." +msgstr "" + +#: ../../mod/profiles.php:254 +msgid "Profile deleted." +msgstr "" + +#: ../../mod/profiles.php:270 ../../mod/profiles.php:301 +msgid "Profile-" +msgstr "" + +#: ../../mod/profiles.php:289 ../../mod/profiles.php:328 +msgid "New profile created." +msgstr "" + +#: ../../mod/profiles.php:307 +msgid "Profile unavailable to clone." +msgstr "" + +#: ../../mod/profiles.php:370 +msgid "" +"This is your public profile.
It may " +"be visible to anybody using the internet." +msgstr "" + +#: ../../mod/profiles.php:380 +msgid "Age: " +msgstr "" + +#: ../../mod/profiles.php:422 +msgid "Profile Image" +msgstr "" + +#: ../../mod/lostpass.php:38 #, php-format -msgid "%s likes this." +msgid "Password reset requested at %s" msgstr "" -#: ../../boot.php:1831 -#, php-format -msgid "%s doesn't like this." +#: ../../mod/lostpass.php:39 ../../mod/dfrn_confirm.php:649 +#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389 +#: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93 +#: ../../mod/item.php:475 ../../mod/item.php:498 ../../mod/register.php:311 +#: ../../mod/register.php:348 ../../mod/dfrn_request.php:545 +#: ../../include/items.php:1373 +msgid "Administrator" msgstr "" -#: ../../boot.php:1835 -#, php-format -msgid "%2$d people like this." +#: ../../mod/notifications.php:28 +msgid "Invalid request identifier." msgstr "" -#: ../../boot.php:1837 -#, php-format -msgid "%2$d people don't like this." +#: ../../mod/notifications.php:31 ../../mod/notifications.php:134 +msgid "Discard" msgstr "" -#: ../../boot.php:1843 -msgid "and" +#: ../../mod/notifications.php:41 ../../mod/notifications.php:133 +msgid "Ignore" msgstr "" -#: ../../boot.php:1846 -#, php-format -msgid ", and %d other people" +#: ../../mod/notifications.php:72 +msgid "Show Ignored Requests" msgstr "" -#: ../../boot.php:1847 -#, php-format -msgid "%s like this." +#: ../../mod/notifications.php:72 +msgid "Hide Ignored Requests" msgstr "" -#: ../../boot.php:1847 -#, php-format -msgid "%s don't like this." +#: ../../mod/notifications.php:105 +msgid "Claims to be known to you: " msgstr "" -#: ../../boot.php:2008 -msgid "No contacts" +#: ../../mod/notifications.php:105 +msgid "yes" msgstr "" -#: ../../boot.php:2016 ../../mod/contacts.php:303 -#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155 -#: ../../include/nav.php:111 -msgid "Contacts" +#: ../../mod/notifications.php:105 +msgid "no" msgstr "" -#: ../../boot.php:2032 ../../mod/viewcontacts.php:17 -msgid "View Contacts" +#: ../../mod/notifications.php:111 +msgid "Approve as: " msgstr "" -#: ../../boot.php:2049 ../../mod/search.php:17 ../../include/nav.php:67 -msgid "Search" +#: ../../mod/notifications.php:112 +msgid "Friend" msgstr "" -#: ../../boot.php:2204 ../../mod/profile.php:8 -msgid "No profile" +#: ../../mod/notifications.php:113 +msgid "Fan/Admirer" msgstr "" -#: ../../boot.php:2261 -msgid "Connect" +#: ../../mod/notifications.php:120 +msgid "Notification type: " msgstr "" -#: ../../boot.php:2271 -msgid "Location:" +#: ../../mod/notifications.php:121 +msgid "Friend/Connect Request" msgstr "" -#: ../../boot.php:2275 -msgid ", " +#: ../../mod/notifications.php:121 +msgid "New Follower" msgstr "" -#: ../../boot.php:2283 -msgid "Gender:" +#: ../../mod/notifications.php:131 +msgid "Approve" msgstr "" -#: ../../boot.php:2287 -msgid "Status:" +#: ../../mod/notifications.php:140 +msgid "No notifications." msgstr "" -#: ../../boot.php:2289 -msgid "Homepage:" +#: ../../mod/notifications.php:164 +msgid "No registrations." msgstr "" -#: ../../boot.php:2380 -msgid "Monday" +#: ../../mod/install.php:33 +msgid "Could not create/connect to database." msgstr "" -#: ../../boot.php:2380 -msgid "Tuesday" +#: ../../mod/install.php:38 +msgid "Connected to database." msgstr "" -#: ../../boot.php:2380 -msgid "Wednesday" +#: ../../mod/install.php:72 +msgid "Proceed with Installation" msgstr "" -#: ../../boot.php:2380 -msgid "Thursday" +#: ../../mod/install.php:74 +msgid "Your Friendika site database has been installed." msgstr "" -#: ../../boot.php:2380 -msgid "Friday" +#: ../../mod/install.php:75 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../boot.php:2380 -msgid "Saturday" +#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189 +msgid "Please see the file \"INSTALL.txt\"." msgstr "" -#: ../../boot.php:2380 -msgid "Sunday" +#: ../../mod/install.php:78 +msgid "Proceed to registration" msgstr "" -#: ../../boot.php:2384 -msgid "January" +#: ../../mod/install.php:84 +msgid "Database import failed." msgstr "" -#: ../../boot.php:2384 -msgid "February" +#: ../../mod/install.php:85 +msgid "" +"You may need to import the file \"database.sql\" manually using phpmyadmin " +"or mysql." msgstr "" -#: ../../boot.php:2384 -msgid "March" +#: ../../mod/install.php:98 +msgid "Welcome to Friendika." msgstr "" -#: ../../boot.php:2384 -msgid "April" +#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/photos.php:801 +#: ../../mod/photos.php:858 ../../mod/photos.php:1066 ../../mod/invite.php:64 +#: ../../addon/facebook/facebook.php:151 +#: ../../addon/randplace/randplace.php:179 ../../addon/twitter/twitter.php:156 +#: ../../addon/twitter/twitter.php:175 ../../addon/statusnet/statusnet.php:163 +#: ../../addon/statusnet/statusnet.php:189 +#: ../../addon/statusnet/statusnet.php:207 +msgid "Submit" msgstr "" -#: ../../boot.php:2384 -msgid "May" +#: ../../mod/install.php:138 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../boot.php:2384 -msgid "June" +#: ../../mod/install.php:139 +msgid "" +"This is required. Please adjust the configuration file .htconfig.php " +"accordingly." msgstr "" -#: ../../boot.php:2384 -msgid "July" +#: ../../mod/install.php:146 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../boot.php:2384 -msgid "August" +#: ../../mod/install.php:147 +msgid "This is required for message delivery to work." msgstr "" -#: ../../boot.php:2384 -msgid "September" +#: ../../mod/install.php:169 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../boot.php:2384 -msgid "October" +#: ../../mod/install.php:170 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../boot.php:2384 -msgid "November" +#: ../../mod/install.php:179 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../boot.php:2384 -msgid "December" +#: ../../mod/install.php:181 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../boot.php:2413 -msgid "Birthdays this week:" +#: ../../mod/install.php:183 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../boot.php:2414 -msgid "(Adjusted for local time)" +#: ../../mod/install.php:185 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../boot.php:2423 -msgid "[today]" +#: ../../mod/install.php:187 +msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../boot.php:2620 -msgid "link to source" +#: ../../mod/install.php:198 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." +msgstr "" + +#: ../../mod/install.php:199 +msgid "" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." +msgstr "" + +#: ../../mod/install.php:200 +msgid "" +"Please check with your site documentation or support people to see if this " +"situation can be corrected." +msgstr "" + +#: ../../mod/install.php:201 +msgid "" +"If not, you may be required to perform a manual installation. Please see the " +"file \"INSTALL.txt\" for instructions." +msgstr "" + +#: ../../mod/install.php:210 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." +msgstr "" + +#: ../../mod/install.php:225 +msgid "Errors encountered creating database tables." +msgstr "" + +#: ../../mod/message.php:18 +msgid "No recipient selected." +msgstr "" + +#: ../../mod/message.php:23 +msgid "[no subject]" +msgstr "" + +#: ../../mod/message.php:34 +msgid "Unable to locate contact information." +msgstr "" + +#: ../../mod/message.php:93 ../../mod/wall_upload.php:79 +#: ../../mod/wall_upload.php:88 ../../mod/wall_upload.php:95 +#: ../../mod/item.php:212 +msgid "Wall Photos" +msgstr "" + +#: ../../mod/message.php:102 +msgid "Message sent." +msgstr "" + +#: ../../mod/message.php:105 +msgid "Message could not be sent." +msgstr "" + +#: ../../mod/message.php:125 ../../include/nav.php:100 +msgid "Messages" +msgstr "" + +#: ../../mod/message.php:126 +msgid "Inbox" +msgstr "" + +#: ../../mod/message.php:127 +msgid "Outbox" +msgstr "" + +#: ../../mod/message.php:128 +msgid "New Message" +msgstr "" + +#: ../../mod/message.php:142 +msgid "Message deleted." +msgstr "" + +#: ../../mod/message.php:158 +msgid "Conversation removed." +msgstr "" + +#: ../../mod/message.php:178 +msgid "Send Private Message" +msgstr "" + +#: ../../mod/message.php:179 ../../mod/message.php:313 +msgid "To:" +msgstr "" + +#: ../../mod/message.php:180 ../../mod/message.php:314 +msgid "Subject:" +msgstr "" + +#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59 +msgid "Your message:" +msgstr "" + +#: ../../mod/message.php:222 +msgid "No messages." +msgstr "" + +#: ../../mod/message.php:235 +msgid "Delete conversation" +msgstr "" + +#: ../../mod/message.php:265 +msgid "Message not available." +msgstr "" + +#: ../../mod/message.php:302 +msgid "Delete message" +msgstr "" + +#: ../../mod/message.php:312 +msgid "Send Reply" +msgstr "" + +#: ../../mod/directory.php:32 +msgid "Global Directory" +msgstr "" + +#: ../../mod/directory.php:38 ../../mod/contacts.php:315 +msgid "Finding: " msgstr "" #: ../../mod/manage.php:37 @@ -299,15 +586,82 @@ msgstr "" msgid "Select an identity to manage: " msgstr "" -#: ../../mod/manage.php:106 ../../mod/photos.php:800 ../../mod/photos.php:857 -#: ../../mod/photos.php:1032 ../../mod/invite.php:64 ../../mod/install.php:109 -#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175 -#: ../../addon/statusnet/statusnet.php:163 -#: ../../addon/statusnet/statusnet.php:189 -#: ../../addon/statusnet/statusnet.php:207 -#: ../../addon/facebook/facebook.php:151 -#: ../../addon/randplace/randplace.php:179 -msgid "Submit" +#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392 +#, php-format +msgid "%s welcomes %s" +msgstr "" + +#: ../../mod/dfrn_confirm.php:114 ../../mod/contacts.php:214 +msgid "Contact not found." +msgstr "" + +#: ../../mod/dfrn_confirm.php:231 +msgid "Response from remote site was not understood." +msgstr "" + +#: ../../mod/dfrn_confirm.php:240 +msgid "Unexpected response from remote site: " +msgstr "" + +#: ../../mod/dfrn_confirm.php:248 +msgid "Confirmation completed successfully." +msgstr "" + +#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264 +#: ../../mod/dfrn_confirm.php:271 +msgid "Remote site reported: " +msgstr "" + +#: ../../mod/dfrn_confirm.php:262 +msgid "Temporary failure. Please wait and try again." +msgstr "" + +#: ../../mod/dfrn_confirm.php:269 +msgid "Introduction failed or was revoked." +msgstr "" + +#: ../../mod/dfrn_confirm.php:387 +msgid "Unable to set contact photo." +msgstr "" + +#: ../../mod/dfrn_confirm.php:426 +msgid "is now friends with" +msgstr "" + +#: ../../mod/dfrn_confirm.php:494 +#, php-format +msgid "No user record found for '%s' " +msgstr "" + +#: ../../mod/dfrn_confirm.php:504 +msgid "Our site encryption key is apparently messed up." +msgstr "" + +#: ../../mod/dfrn_confirm.php:515 +msgid "Empty site URL was provided or URL could not be decrypted by us." +msgstr "" + +#: ../../mod/dfrn_confirm.php:527 +msgid "Contact record was not found for you on our site." +msgstr "" + +#: ../../mod/dfrn_confirm.php:555 +msgid "" +"The ID provided by your system is a duplicate on our system. It should work " +"if you try again." +msgstr "" + +#: ../../mod/dfrn_confirm.php:566 +msgid "Unable to set your contact credentials on our system." +msgstr "" + +#: ../../mod/dfrn_confirm.php:619 +msgid "Unable to update your contact profile details on our system" +msgstr "" + +#: ../../mod/dfrn_confirm.php:648 +#, php-format +msgid "Connection accepted at %s" msgstr "" #: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109 @@ -315,29 +669,38 @@ msgstr "" msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118 -#: ../../mod/photos.php:570 +#: ../../mod/wall_upload.php:65 ../../mod/photos.php:571 +#: ../../mod/profile_photo.php:118 msgid "Unable to process image." msgstr "" -#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88 -#: ../../mod/wall_upload.php:95 ../../mod/item.php:184 -#: ../../mod/message.php:93 -msgid "Wall Photos" -msgstr "" - -#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230 -#: ../../mod/photos.php:588 +#: ../../mod/wall_upload.php:82 ../../mod/photos.php:589 +#: ../../mod/profile_photo.php:230 msgid "Image upload failed." msgstr "" -#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389 -#: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93 -#: ../../mod/register.php:311 ../../mod/register.php:348 -#: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39 -#: ../../mod/item.php:423 ../../mod/item.php:446 -#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350 -msgid "Administrator" +#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598 +msgid "Item not found." +msgstr "" + +#: ../../mod/display.php:305 +msgid "Item has been removed." +msgstr "" + +#: ../../mod/match.php:10 +msgid "Profile Match" +msgstr "" + +#: ../../mod/match.php:49 +msgid "No matches" +msgstr "" + +#: ../../mod/lockview.php:39 +msgid "Remote privacy information not available." +msgstr "" + +#: ../../mod/lockview.php:43 +msgid "Visible to:" msgstr "" #: ../../mod/dfrn_notify.php:179 @@ -353,133 +716,18 @@ msgstr "" msgid "%s commented on an item at %s" msgstr "" -#: ../../mod/profile.php:151 ../../mod/network.php:91 -msgid "Share" +#: ../../mod/removeme.php:42 ../../mod/removeme.php:45 +msgid "Remove My Account" msgstr "" -#: ../../mod/profile.php:152 ../../mod/network.php:92 -#: ../../mod/message.php:185 ../../mod/message.php:319 -msgid "Upload photo" -msgstr "" - -#: ../../mod/profile.php:153 ../../mod/network.php:93 -#: ../../mod/message.php:186 ../../mod/message.php:320 -msgid "Insert web link" -msgstr "" - -#: ../../mod/profile.php:154 ../../mod/network.php:94 -msgid "Insert YouTube video" -msgstr "" - -#: ../../mod/profile.php:155 ../../mod/network.php:95 -msgid "Set your location" -msgstr "" - -#: ../../mod/profile.php:156 ../../mod/network.php:96 -msgid "Clear browser location" -msgstr "" - -#: ../../mod/profile.php:157 ../../mod/profile.php:309 -#: ../../mod/photos.php:1052 ../../mod/display.php:158 -#: ../../mod/network.php:97 ../../mod/network.php:367 -#: ../../mod/message.php:187 ../../mod/message.php:321 -msgid "Please wait" -msgstr "" - -#: ../../mod/profile.php:158 ../../mod/network.php:98 -msgid "Permission settings" -msgstr "" - -#: ../../mod/profile.php:165 ../../mod/network.php:104 -msgid "CC: email addresses" -msgstr "" - -#: ../../mod/profile.php:167 ../../mod/network.php:106 -msgid "Example: bob@example.com, mary@example.com" -msgstr "" - -#: ../../mod/profile.php:300 ../../mod/photos.php:935 -#: ../../mod/display.php:149 ../../mod/network.php:321 -msgid "Private Message" -msgstr "" - -#: ../../mod/profile.php:307 ../../mod/photos.php:1050 -#: ../../mod/display.php:156 ../../mod/network.php:365 -msgid "I like this (toggle)" -msgstr "" - -#: ../../mod/profile.php:308 ../../mod/photos.php:1051 -#: ../../mod/display.php:157 ../../mod/network.php:366 -msgid "I don't like this (toggle)" -msgstr "" - -#: ../../mod/profile.php:321 ../../mod/photos.php:1071 -#: ../../mod/photos.php:1111 ../../mod/photos.php:1140 -#: ../../mod/display.php:170 ../../mod/network.php:380 -msgid "This is you" -msgstr "" - -#: ../../mod/profile.php:361 ../../mod/photos.php:1168 -#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137 -msgid "Delete" -msgstr "" - -#: ../../mod/profile.php:382 ../../mod/search.php:116 -#: ../../mod/display.php:258 ../../mod/network.php:272 -#: ../../mod/network.php:434 -msgid "View $name's profile" -msgstr "" - -#: ../../mod/profile.php:414 ../../mod/display.php:312 -#: ../../mod/register.php:422 ../../mod/network.php:471 +#: ../../mod/removeme.php:43 msgid "" -"Shared content is covered by the Creative Commons Attribution 3.0 license." +"This will completely remove your account. Once this has been done it is not " +"recoverable." msgstr "" -#: ../../mod/follow.php:167 -msgid "The profile address specified does not provide adequate information." -msgstr "" - -#: ../../mod/follow.php:173 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "" - -#: ../../mod/follow.php:224 -msgid "Unable to retrieve contact information." -msgstr "" - -#: ../../mod/follow.php:270 -msgid "following" -msgstr "" - -#: ../../mod/profile_photo.php:28 -msgid "Image uploaded but image cropping failed." -msgstr "" - -#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 -#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155 -#: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234 -#: ../../mod/photos.php:106 ../../mod/photos.php:530 ../../mod/photos.php:849 -#: ../../mod/photos.php:864 ../../mod/register.php:267 -#: ../../mod/register.php:274 ../../mod/register.php:281 -msgid "Profile Photos" -msgstr "" - -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "" - -#: ../../mod/profile_photo.php:95 -msgid "Unable to process image" -msgstr "" - -#: ../../mod/profile_photo.php:228 -msgid "Image uploaded successfully." +#: ../../mod/removeme.php:44 +msgid "Please enter your password for verification:" msgstr "" #: ../../mod/home.php:23 @@ -505,47 +753,186 @@ msgstr "" msgid "Account approved." msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:234 -#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62 -msgid "Profile not found." +#: ../../mod/apps.php:6 +msgid "Applications" msgstr "" -#: ../../mod/profiles.php:28 -msgid "Profile Name is required." +#: ../../mod/photos.php:30 +msgid "Photo Albums" msgstr "" -#: ../../mod/profiles.php:196 -msgid "Profile updated." +#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781 +#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233 +#: ../../mod/photos.php:1244 ../../include/Photo.php:225 +#: ../../include/Photo.php:232 ../../include/Photo.php:239 +#: ../../include/items.php:982 ../../include/items.php:985 +#: ../../include/items.php:988 +msgid "Contact Photos" msgstr "" -#: ../../mod/profiles.php:251 -msgid "Profile deleted." +#: ../../mod/photos.php:95 +msgid "Contact information unavailable" msgstr "" -#: ../../mod/profiles.php:267 ../../mod/profiles.php:298 -msgid "Profile-" +#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850 +#: ../../mod/photos.php:865 ../../mod/profile_photo.php:58 +#: ../../mod/profile_photo.php:65 ../../mod/profile_photo.php:72 +#: ../../mod/profile_photo.php:155 ../../mod/profile_photo.php:225 +#: ../../mod/profile_photo.php:234 ../../mod/register.php:267 +#: ../../mod/register.php:274 ../../mod/register.php:281 +msgid "Profile Photos" msgstr "" -#: ../../mod/profiles.php:286 ../../mod/profiles.php:325 -msgid "New profile created." +#: ../../mod/photos.php:116 +msgid "Album not found." msgstr "" -#: ../../mod/profiles.php:304 -msgid "Profile unavailable to clone." +#: ../../mod/photos.php:134 ../../mod/photos.php:859 +msgid "Delete Album" msgstr "" -#: ../../mod/profiles.php:367 -msgid "" -"This is your public profile.
It may " -"be visible to anybody using the internet." +#: ../../mod/photos.php:197 ../../mod/photos.php:1067 +msgid "Delete Photo" msgstr "" -#: ../../mod/profiles.php:377 -msgid "Age: " +#: ../../mod/photos.php:469 +msgid "was tagged in a" msgstr "" -#: ../../mod/profiles.php:418 -msgid "Profile Image" +#: ../../mod/photos.php:469 ../../mod/like.php:110 +msgid "photo" +msgstr "" + +#: ../../mod/photos.php:469 +msgid "by" +msgstr "" + +#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306 +msgid "Image exceeds size limit of " +msgstr "" + +#: ../../mod/photos.php:661 +msgid "No photos selected" +msgstr "" + +#: ../../mod/photos.php:808 +msgid "Upload Photos" +msgstr "" + +#: ../../mod/photos.php:811 ../../mod/photos.php:854 +msgid "New album name: " +msgstr "" + +#: ../../mod/photos.php:812 +msgid "or existing album name: " +msgstr "" + +#: ../../mod/photos.php:814 ../../mod/photos.php:1062 +msgid "Permissions" +msgstr "" + +#: ../../mod/photos.php:869 +msgid "Edit Album" +msgstr "" + +#: ../../mod/photos.php:879 ../../mod/photos.php:1263 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:909 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:956 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:958 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:969 +msgid "<< Prev" +msgstr "" + +#: ../../mod/photos.php:973 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:977 +msgid "Next >>" +msgstr "" + +#: ../../mod/photos.php:1036 +msgid "Tags: " +msgstr "" + +#: ../../mod/photos.php:1046 +msgid "[Remove any tag]" +msgstr "" + +#: ../../mod/photos.php:1055 +msgid "New album name" +msgstr "" + +#: ../../mod/photos.php:1058 +msgid "Caption" +msgstr "" + +#: ../../mod/photos.php:1060 +msgid "Add a Tag" +msgstr "" + +#: ../../mod/photos.php:1064 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: ../../mod/photos.php:1249 +msgid "Recent Photos" +msgstr "" + +#: ../../mod/photos.php:1253 +msgid "Upload New Photos" +msgstr "" + +#: ../../mod/photos.php:1269 +msgid "View Album" +msgstr "" + +#: ../../mod/profile.php:8 ../../boot.php:2210 +msgid "No profile" +msgstr "" + +#: ../../mod/profile.php:102 +msgid "Status" +msgstr "" + +#: ../../mod/profile.php:103 +msgid "Profile" +msgstr "" + +#: ../../mod/profile.php:104 +msgid "Photos" +msgstr "" + +#: ../../mod/viewcontacts.php:17 ../../boot.php:2038 +msgid "View Contacts" +msgstr "" + +#: ../../mod/viewcontacts.php:32 +msgid "No contacts." +msgstr "" + +#: ../../mod/viewcontacts.php:44 ../../mod/contacts.php:376 +msgid "Visit $username's profile" +msgstr "" + +#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 +msgid "Item not found" +msgstr "" + +#: ../../mod/editpost.php:32 +msgid "Edit post" msgstr "" #: ../../mod/settings.php:37 @@ -564,205 +951,174 @@ msgstr "" msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:95 +#: ../../mod/settings.php:97 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:97 +#: ../../mod/settings.php:99 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:103 +#: ../../mod/settings.php:105 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:105 +#: ../../mod/settings.php:107 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:161 +#: ../../mod/settings.php:165 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:211 +#: ../../mod/settings.php:215 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:212 +#: ../../mod/settings.php:216 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:218 +#: ../../mod/settings.php:222 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:263 +#: ../../mod/settings.php:269 msgid "OpenID: " msgstr "" -#: ../../mod/settings.php:263 +#: ../../mod/settings.php:269 msgid " (Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:295 +#: ../../mod/settings.php:301 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:352 +#: ../../mod/settings.php:358 msgid "Default Post Permissions" msgstr "" -#: ../../mod/search.php:131 ../../mod/network.php:287 -msgid "View in context" +#: ../../mod/item.php:37 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/photos.php:30 -msgid "Photo Albums" +#: ../../mod/item.php:126 +msgid "Empty post discarded." msgstr "" -#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:780 -#: ../../mod/photos.php:849 ../../mod/photos.php:864 ../../mod/photos.php:1198 -#: ../../mod/photos.php:1209 ../../include/Photo.php:225 -#: ../../include/Photo.php:232 ../../include/Photo.php:239 -#: ../../include/items.php:959 ../../include/items.php:962 -#: ../../include/items.php:965 -msgid "Contact Photos" +#: ../../mod/item.php:474 +#, php-format +msgid "%s commented on your item at %s" msgstr "" -#: ../../mod/photos.php:95 -msgid "Contact information unavailable" +#: ../../mod/item.php:497 +#, php-format +msgid "%s posted on your profile wall at %s" msgstr "" -#: ../../mod/photos.php:116 -msgid "Album not found." +#: ../../mod/item.php:523 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/photos.php:134 ../../mod/photos.php:858 -msgid "Delete Album" +#: ../../mod/item.php:541 +#, php-format +msgid "" +"This message was sent to you by %s, a member of the Friendika social network." msgstr "" -#: ../../mod/photos.php:197 ../../mod/photos.php:1033 -msgid "Delete Photo" +#: ../../mod/item.php:543 +msgid "You may visit them online at" msgstr "" -#: ../../mod/photos.php:468 -msgid "was tagged in a" +#: ../../mod/item.php:545 +msgid "" +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." msgstr "" -#: ../../mod/photos.php:468 ../../mod/like.php:110 -msgid "photo" +#: ../../mod/item.php:547 +#, php-format +msgid "%s posted an update." msgstr "" -#: ../../mod/photos.php:468 -msgid "by" +#: ../../mod/search.php:17 ../../include/nav.php:67 ../../boot.php:2055 +msgid "Search" msgstr "" -#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306 -msgid "Image exceeds size limit of " +#: ../../mod/search.php:54 +msgid "No results." msgstr "" -#: ../../mod/photos.php:660 -msgid "No photos selected" +#: ../../mod/profile_photo.php:28 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/photos.php:807 -msgid "Upload Photos" +#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 +#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237 +#, php-format +msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/photos.php:810 ../../mod/photos.php:853 -msgid "New album name: " +#: ../../mod/profile_photo.php:95 +msgid "Unable to process image" msgstr "" -#: ../../mod/photos.php:811 -msgid "or existing album name: " +#: ../../mod/profile_photo.php:228 +msgid "Image uploaded successfully." msgstr "" -#: ../../mod/photos.php:813 ../../mod/photos.php:1028 -msgid "Permissions" +#: ../../mod/group.php:27 +msgid "Group created." msgstr "" -#: ../../mod/photos.php:868 -msgid "Edit Album" +#: ../../mod/group.php:33 +msgid "Could not create group." msgstr "" -#: ../../mod/photos.php:878 ../../mod/photos.php:1228 -msgid "View Photo" +#: ../../mod/group.php:43 ../../mod/group.php:123 +msgid "Group not found." msgstr "" -#: ../../mod/photos.php:908 -msgid "Photo not available" +#: ../../mod/group.php:56 +msgid "Group name changed." msgstr "" -#: ../../mod/photos.php:929 -msgid "Edit photo" +#: ../../mod/group.php:79 +msgid "Membership list updated." msgstr "" -#: ../../mod/photos.php:931 -msgid "Use as profile photo" +#: ../../mod/group.php:88 ../../index.php:250 +msgid "Permission denied" msgstr "" -#: ../../mod/photos.php:944 -msgid "View Full Size" +#: ../../mod/group.php:107 +msgid "Group removed." msgstr "" -#: ../../mod/photos.php:1002 -msgid "Tags: " +#: ../../mod/group.php:109 +msgid "Unable to remove group." msgstr "" -#: ../../mod/photos.php:1012 -msgid "[Remove any tag]" +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41 +msgid "Cancel" msgstr "" -#: ../../mod/photos.php:1021 -msgid "New album name" +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../mod/photos.php:1024 -msgid "Caption" +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../mod/photos.php:1026 -msgid "Add a Tag" +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " msgstr "" -#: ../../mod/photos.php:1030 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: ../../mod/photos.php:1214 -msgid "Recent Photos" -msgstr "" - -#: ../../mod/photos.php:1218 -msgid "Upload New Photos" -msgstr "" - -#: ../../mod/photos.php:1234 -msgid "View Album" -msgstr "" - -#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546 -msgid "Item not found." -msgstr "" - -#: ../../mod/display.php:259 ../../mod/network.php:435 -msgid "View $owner_name's profile" -msgstr "" - -#: ../../mod/display.php:260 ../../mod/network.php:436 -msgid "to" -msgstr "" - -#: ../../mod/display.php:261 ../../mod/network.php:437 -msgid "Wall-to-Wall" -msgstr "" - -#: ../../mod/display.php:262 ../../mod/network.php:438 -msgid "via Wall-To-Wall:" -msgstr "" - -#: ../../mod/display.php:300 -msgid "Item has been removed." +#: ../../mod/tagrm.php:93 +msgid "Remove" msgstr "" #: ../../mod/invite.php:28 @@ -795,10 +1151,6 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316 -msgid "Your message:" -msgstr "" - #: ../../mod/invite.php:60 #, php-format msgid "Please join my social network on %s" @@ -813,178 +1165,6 @@ msgid "" "Once you have registered, please connect with me via my profile page at:" msgstr "" -#: ../../mod/contacts.php:12 -msgid "Invite Friends" -msgstr "" - -#: ../../mod/contacts.php:16 -msgid "Connect/Follow" -msgstr "" - -#: ../../mod/contacts.php:17 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../mod/contacts.php:18 -msgid "Follow" -msgstr "" - -#: ../../mod/contacts.php:38 ../../mod/contacts.php:119 -msgid "Could not access contact record." -msgstr "" - -#: ../../mod/contacts.php:52 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/contacts.php:83 -msgid "Contact updated." -msgstr "" - -#: ../../mod/contacts.php:85 ../../mod/dfrn_request.php:402 -msgid "Failed to update contact record." -msgstr "" - -#: ../../mod/contacts.php:141 -msgid "Contact has been blocked" -msgstr "" - -#: ../../mod/contacts.php:141 -msgid "Contact has been unblocked" -msgstr "" - -#: ../../mod/contacts.php:155 -msgid "Contact has been ignored" -msgstr "" - -#: ../../mod/contacts.php:155 -msgid "Contact has been unignored" -msgstr "" - -#: ../../mod/contacts.php:176 -msgid "stopped following" -msgstr "" - -#: ../../mod/contacts.php:195 -msgid "Contact has been removed." -msgstr "" - -#: ../../mod/contacts.php:209 ../../mod/dfrn_confirm.php:114 -msgid "Contact not found." -msgstr "" - -#: ../../mod/contacts.php:223 ../../mod/contacts.php:344 -msgid "Mutual Friendship" -msgstr "" - -#: ../../mod/contacts.php:227 ../../mod/contacts.php:348 -msgid "is a fan of yours" -msgstr "" - -#: ../../mod/contacts.php:232 ../../mod/contacts.php:352 -msgid "you are a fan of" -msgstr "" - -#: ../../mod/contacts.php:248 -msgid "Never" -msgstr "" - -#: ../../mod/contacts.php:252 -msgid "(Update was successful)" -msgstr "" - -#: ../../mod/contacts.php:252 -msgid "(Update was not successful)" -msgstr "" - -#: ../../mod/contacts.php:255 -msgid "Contact Editor" -msgstr "" - -#: ../../mod/contacts.php:256 -msgid "Visit $name's profile" -msgstr "" - -#: ../../mod/contacts.php:257 -msgid "Block/Unblock contact" -msgstr "" - -#: ../../mod/contacts.php:258 -msgid "Ignore contact" -msgstr "" - -#: ../../mod/contacts.php:259 -msgid "Delete contact" -msgstr "" - -#: ../../mod/contacts.php:261 -msgid "Last updated: " -msgstr "" - -#: ../../mod/contacts.php:262 -msgid "Update public posts: " -msgstr "" - -#: ../../mod/contacts.php:264 -msgid "Update now" -msgstr "" - -#: ../../mod/contacts.php:267 -msgid "Unblock this contact" -msgstr "" - -#: ../../mod/contacts.php:267 -msgid "Block this contact" -msgstr "" - -#: ../../mod/contacts.php:268 -msgid "Unignore this contact" -msgstr "" - -#: ../../mod/contacts.php:268 -msgid "Ignore this contact" -msgstr "" - -#: ../../mod/contacts.php:271 -msgid "Currently blocked" -msgstr "" - -#: ../../mod/contacts.php:272 -msgid "Currently ignored" -msgstr "" - -#: ../../mod/contacts.php:305 -msgid "Show Blocked Connections" -msgstr "" - -#: ../../mod/contacts.php:305 -msgid "Hide Blocked Connections" -msgstr "" - -#: ../../mod/contacts.php:307 ../../mod/directory.php:38 -msgid "Finding: " -msgstr "" - -#: ../../mod/contacts.php:308 -msgid "Find" -msgstr "" - -#: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44 -msgid "Visit $username's profile" -msgstr "" - -#: ../../mod/contacts.php:369 -msgid "Edit contact" -msgstr "" - -#: ../../mod/lockview.php:39 -msgid "Remote privacy information not available." -msgstr "" - -#: ../../mod/lockview.php:43 -msgid "Visible to:" -msgstr "" - #: ../../mod/register.php:47 msgid "Invalid OpenID url" msgstr "" @@ -1077,257 +1257,84 @@ msgstr "" msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:404 -msgid "" -"Members of this network prefer to communicate with real people who use their " -"real names." -msgstr "" - -#: ../../mod/register.php:413 +#: ../../mod/register.php:415 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618 +#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618 msgid "Yes" msgstr "" -#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619 +#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619 msgid "No" msgstr "" -#: ../../mod/register.php:429 +#: ../../mod/register.php:431 msgid "Registration" msgstr "" -#: ../../mod/register.php:437 +#: ../../mod/register.php:439 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:438 +#: ../../mod/register.php:440 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:439 +#: ../../mod/register.php:441 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/register.php:440 +#: ../../mod/register.php:442 msgid "Choose a nickname: " msgstr "" -#: ../../mod/install.php:30 -msgid "Could not create/connect to database." +#: ../../mod/register.php:445 ../../include/nav.php:61 ../../boot.php:809 +msgid "Register" msgstr "" -#: ../../mod/install.php:35 -msgid "Connected to database." +#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105 +#: ../../include/auth.php:130 ../../include/auth.php:183 +msgid "Login failed." msgstr "" -#: ../../mod/install.php:66 -msgid "Database import succeeded." +#: ../../mod/openid.php:73 ../../include/auth.php:194 +msgid "Welcome back " msgstr "" -#: ../../mod/install.php:67 +#: ../../mod/like.php:110 +msgid "status" +msgstr "" + +#: ../../mod/like.php:127 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../mod/like.php:129 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../mod/follow.php:173 +msgid "The profile address specified does not provide adequate information." +msgstr "" + +#: ../../mod/follow.php:179 msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." msgstr "" -#: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175 -msgid "Please see the file \"INSTALL.txt\"." +#: ../../mod/follow.php:230 +msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/install.php:73 -msgid "Database import failed." -msgstr "" - -#: ../../mod/install.php:74 -msgid "" -"You may need to import the file \"database.sql\" manually using phpmyadmin " -"or mysql." -msgstr "" - -#: ../../mod/install.php:84 -msgid "Welcome to Friendika." -msgstr "" - -#: ../../mod/install.php:124 -msgid "Could not find a command line version of PHP in the web server PATH." -msgstr "" - -#: ../../mod/install.php:125 -msgid "" -"This is required. Please adjust the configuration file .htconfig.php " -"accordingly." -msgstr "" - -#: ../../mod/install.php:132 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." -msgstr "" - -#: ../../mod/install.php:133 -msgid "This is required for message delivery to work." -msgstr "" - -#: ../../mod/install.php:155 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "" - -#: ../../mod/install.php:156 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." -msgstr "" - -#: ../../mod/install.php:165 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "" - -#: ../../mod/install.php:167 -msgid "Error: libCURL PHP module required but not installed." -msgstr "" - -#: ../../mod/install.php:169 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "" - -#: ../../mod/install.php:171 -msgid "Error: openssl PHP module required but not installed." -msgstr "" - -#: ../../mod/install.php:173 -msgid "Error: mysqli PHP module required but not installed." -msgstr "" - -#: ../../mod/install.php:184 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\" " -"in the top folder of your web server and it is unable to do so." -msgstr "" - -#: ../../mod/install.php:185 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." -msgstr "" - -#: ../../mod/install.php:186 -msgid "" -"Please check with your site documentation or support people to see if this " -"situation can be corrected." -msgstr "" - -#: ../../mod/install.php:187 -msgid "" -"If not, you may be required to perform a manual installation. Please see the " -"file \"INSTALL.txt\" for instructions." -msgstr "" - -#: ../../mod/install.php:196 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." -msgstr "" - -#: ../../mod/install.php:211 -msgid "Errors encountered creating database tables." -msgstr "" - -#: ../../mod/network.php:18 -msgid "Normal View" -msgstr "" - -#: ../../mod/network.php:20 -msgid "New Item View" -msgstr "" - -#: ../../mod/network.php:149 -msgid "No such group" -msgstr "" - -#: ../../mod/network.php:160 -msgid "Group is empty" -msgstr "" - -#: ../../mod/network.php:164 -msgid "Group: " -msgstr "" - -#: ../../mod/notifications.php:28 -msgid "Invalid request identifier." -msgstr "" - -#: ../../mod/notifications.php:31 ../../mod/notifications.php:134 -msgid "Discard" -msgstr "" - -#: ../../mod/notifications.php:41 ../../mod/notifications.php:133 -msgid "Ignore" -msgstr "" - -#: ../../mod/notifications.php:72 -msgid "Show Ignored Requests" -msgstr "" - -#: ../../mod/notifications.php:72 -msgid "Hide Ignored Requests" -msgstr "" - -#: ../../mod/notifications.php:105 -msgid "Claims to be known to you: " -msgstr "" - -#: ../../mod/notifications.php:105 -msgid "yes" -msgstr "" - -#: ../../mod/notifications.php:105 -msgid "no" -msgstr "" - -#: ../../mod/notifications.php:111 -msgid "Approve as: " -msgstr "" - -#: ../../mod/notifications.php:112 -msgid "Friend" -msgstr "" - -#: ../../mod/notifications.php:113 -msgid "Fan/Admirer" -msgstr "" - -#: ../../mod/notifications.php:120 -msgid "Notification type: " -msgstr "" - -#: ../../mod/notifications.php:121 -msgid "Friend/Connect Request" -msgstr "" - -#: ../../mod/notifications.php:121 -msgid "New Follower" -msgstr "" - -#: ../../mod/notifications.php:131 -msgid "Approve" -msgstr "" - -#: ../../mod/notifications.php:140 -msgid "No notifications." -msgstr "" - -#: ../../mod/notifications.php:164 -msgid "No registrations." +#: ../../mod/follow.php:276 +msgid "following" msgstr "" #: ../../mod/dfrn_request.php:92 @@ -1403,6 +1410,10 @@ msgstr "" msgid "Disallowed profile URL." msgstr "" +#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:90 +msgid "Failed to update contact record." +msgstr "" + #: ../../mod/dfrn_request.php:423 msgid "Your introduction has been sent." msgstr "" @@ -1417,7 +1428,7 @@ msgid "" "strong> profile." msgstr "" -#: ../../mod/dfrn_request.php:536 ../../include/items.php:1341 +#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364 msgid "[Name Withheld]" msgstr "" @@ -1471,300 +1482,218 @@ msgstr "" msgid "Submit Request" msgstr "" -#: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41 -msgid "Cancel" +#: ../../mod/contacts.php:12 +msgid "Invite Friends" msgstr "" -#: ../../mod/like.php:110 -msgid "status" +#: ../../mod/contacts.php:15 +msgid "Find People With Shared Interests" msgstr "" -#: ../../mod/like.php:127 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../mod/contacts.php:19 +msgid "Connect/Follow" msgstr "" -#: ../../mod/like.php:129 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../mod/contacts.php:20 +msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../mod/lostpass.php:38 -#, php-format -msgid "Password reset requested at %s" +#: ../../mod/contacts.php:21 +msgid "Follow" msgstr "" -#: ../../mod/removeme.php:42 ../../mod/removeme.php:45 -msgid "Remove My Account" +#: ../../mod/contacts.php:43 ../../mod/contacts.php:124 +msgid "Could not access contact record." msgstr "" -#: ../../mod/removeme.php:43 -msgid "" -"This will completely remove your account. Once this has been done it is not " -"recoverable." +#: ../../mod/contacts.php:57 +msgid "Could not locate selected profile." msgstr "" -#: ../../mod/removeme.php:44 -msgid "Please enter your password for verification:" +#: ../../mod/contacts.php:88 +msgid "Contact updated." msgstr "" -#: ../../mod/apps.php:6 -msgid "Applications" +#: ../../mod/contacts.php:146 +msgid "Contact has been blocked" msgstr "" -#: ../../mod/directory.php:32 -msgid "Global Directory" +#: ../../mod/contacts.php:146 +msgid "Contact has been unblocked" msgstr "" -#: ../../mod/item.php:37 -msgid "Unable to locate original post." +#: ../../mod/contacts.php:160 +msgid "Contact has been ignored" msgstr "" -#: ../../mod/item.php:98 -msgid "Empty post discarded." +#: ../../mod/contacts.php:160 +msgid "Contact has been unignored" msgstr "" -#: ../../mod/item.php:422 -#, php-format -msgid "%s commented on your item at %s" +#: ../../mod/contacts.php:181 +msgid "stopped following" msgstr "" -#: ../../mod/item.php:445 -#, php-format -msgid "%s posted on your profile wall at %s" +#: ../../mod/contacts.php:200 +msgid "Contact has been removed." msgstr "" -#: ../../mod/item.php:471 -msgid "System error. Post not saved." +#: ../../mod/contacts.php:228 ../../mod/contacts.php:352 +msgid "Mutual Friendship" msgstr "" -#: ../../mod/item.php:489 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendika social network." +#: ../../mod/contacts.php:232 ../../mod/contacts.php:356 +msgid "is a fan of yours" msgstr "" -#: ../../mod/item.php:491 -msgid "You may visit them online at" +#: ../../mod/contacts.php:237 ../../mod/contacts.php:360 +msgid "you are a fan of" msgstr "" -#: ../../mod/item.php:493 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." +#: ../../mod/contacts.php:252 +msgid "Privacy Unavailable" msgstr "" -#: ../../mod/item.php:495 -#, php-format -msgid "%s posted an update." +#: ../../mod/contacts.php:253 +msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../mod/contacts.php:256 +msgid "Never" msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../mod/contacts.php:260 +msgid "(Update was successful)" msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../mod/contacts.php:260 +msgid "(Update was not successful)" msgstr "" -#: ../../mod/tagrm.php:93 -msgid "Remove" +#: ../../mod/contacts.php:263 +msgid "Contact Editor" msgstr "" -#: ../../mod/message.php:18 -msgid "No recipient selected." +#: ../../mod/contacts.php:264 +msgid "Visit $name's profile" msgstr "" -#: ../../mod/message.php:23 -msgid "[no subject]" +#: ../../mod/contacts.php:265 +msgid "Block/Unblock contact" msgstr "" -#: ../../mod/message.php:34 -msgid "Unable to locate contact information." +#: ../../mod/contacts.php:266 +msgid "Ignore contact" msgstr "" -#: ../../mod/message.php:102 -msgid "Message sent." +#: ../../mod/contacts.php:267 +msgid "Delete contact" msgstr "" -#: ../../mod/message.php:105 -msgid "Message could not be sent." +#: ../../mod/contacts.php:269 +msgid "Last updated: " msgstr "" -#: ../../mod/message.php:125 ../../include/nav.php:100 -msgid "Messages" +#: ../../mod/contacts.php:270 +msgid "Update public posts: " msgstr "" -#: ../../mod/message.php:126 -msgid "Inbox" +#: ../../mod/contacts.php:272 +msgid "Update now" msgstr "" -#: ../../mod/message.php:127 -msgid "Outbox" +#: ../../mod/contacts.php:275 +msgid "Unblock this contact" msgstr "" -#: ../../mod/message.php:128 -msgid "New Message" +#: ../../mod/contacts.php:275 +msgid "Block this contact" msgstr "" -#: ../../mod/message.php:142 -msgid "Message deleted." +#: ../../mod/contacts.php:276 +msgid "Unignore this contact" msgstr "" -#: ../../mod/message.php:158 -msgid "Conversation removed." +#: ../../mod/contacts.php:276 +msgid "Ignore this contact" msgstr "" -#: ../../mod/message.php:177 -msgid "Send Private Message" +#: ../../mod/contacts.php:279 +msgid "Currently blocked" msgstr "" -#: ../../mod/message.php:178 ../../mod/message.php:312 -msgid "To:" +#: ../../mod/contacts.php:280 +msgid "Currently ignored" msgstr "" -#: ../../mod/message.php:179 ../../mod/message.php:313 -msgid "Subject:" +#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140 +#: ../../include/acl_selectors.php:155 ../../include/nav.php:111 +#: ../../boot.php:2022 +msgid "Contacts" msgstr "" -#: ../../mod/message.php:221 -msgid "No messages." +#: ../../mod/contacts.php:313 +msgid "Show Blocked Connections" msgstr "" -#: ../../mod/message.php:234 -msgid "Delete conversation" +#: ../../mod/contacts.php:313 +msgid "Hide Blocked Connections" msgstr "" -#: ../../mod/message.php:264 -msgid "Message not available." +#: ../../mod/contacts.php:316 +msgid "Find" msgstr "" -#: ../../mod/message.php:301 -msgid "Delete message" +#: ../../mod/contacts.php:377 +msgid "Edit contact" msgstr "" -#: ../../mod/message.php:311 -msgid "Send Reply" +#: ../../addon/facebook/facebook.php:116 +msgid "Facebook disabled" msgstr "" -#: ../../mod/dfrn_confirm.php:231 -msgid "Response from remote site was not understood." +#: ../../addon/facebook/facebook.php:124 +msgid "Facebook API key is missing." msgstr "" -#: ../../mod/dfrn_confirm.php:240 -msgid "Unexpected response from remote site: " +#: ../../addon/facebook/facebook.php:131 +msgid "Facebook Connect" msgstr "" -#: ../../mod/dfrn_confirm.php:248 -msgid "Confirmation completed successfully." +#: ../../addon/facebook/facebook.php:137 +msgid "Install Facebook post connector" msgstr "" -#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264 -#: ../../mod/dfrn_confirm.php:271 -msgid "Remote site reported: " +#: ../../addon/facebook/facebook.php:144 +msgid "Remove Facebook post connector" msgstr "" -#: ../../mod/dfrn_confirm.php:262 -msgid "Temporary failure. Please wait and try again." +#: ../../addon/facebook/facebook.php:150 +msgid "Post to Facebook by default" msgstr "" -#: ../../mod/dfrn_confirm.php:269 -msgid "Introduction failed or was revoked." +#: ../../addon/facebook/facebook.php:174 +msgid "Facebook" msgstr "" -#: ../../mod/dfrn_confirm.php:387 -msgid "Unable to set contact photo." +#: ../../addon/facebook/facebook.php:175 +msgid "Facebook Connector Settings" msgstr "" -#: ../../mod/dfrn_confirm.php:426 -msgid "is now friends with" +#: ../../addon/facebook/facebook.php:189 +msgid "Post to Facebook" msgstr "" -#: ../../mod/dfrn_confirm.php:494 -#, php-format -msgid "No user record found for '%s' " +#: ../../addon/facebook/facebook.php:230 +msgid "Image: " msgstr "" -#: ../../mod/dfrn_confirm.php:504 -msgid "Our site encryption key is apparently messed up." +#: ../../addon/randplace/randplace.php:171 +msgid "Randplace Settings" msgstr "" -#: ../../mod/dfrn_confirm.php:515 -msgid "Empty site URL was provided or URL could not be decrypted by us." -msgstr "" - -#: ../../mod/dfrn_confirm.php:527 -msgid "Contact record was not found for you on our site." -msgstr "" - -#: ../../mod/dfrn_confirm.php:555 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "" - -#: ../../mod/dfrn_confirm.php:566 -msgid "Unable to set your contact credentials on our system." -msgstr "" - -#: ../../mod/dfrn_confirm.php:619 -msgid "Unable to update your contact profile details on our system" -msgstr "" - -#: ../../mod/dfrn_confirm.php:648 -#, php-format -msgid "Connection accepted at %s" -msgstr "" - -#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105 -#: ../../include/auth.php:130 ../../include/auth.php:183 -msgid "Login failed." -msgstr "" - -#: ../../mod/openid.php:73 ../../include/auth.php:194 -msgid "Welcome back " -msgstr "" - -#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392 -#, php-format -msgid "%s welcomes %s" -msgstr "" - -#: ../../mod/viewcontacts.php:32 -msgid "No contacts." -msgstr "" - -#: ../../mod/group.php:27 -msgid "Group created." -msgstr "" - -#: ../../mod/group.php:33 -msgid "Could not create group." -msgstr "" - -#: ../../mod/group.php:43 ../../mod/group.php:123 -msgid "Group not found." -msgstr "" - -#: ../../mod/group.php:56 -msgid "Group name changed." -msgstr "" - -#: ../../mod/group.php:79 -msgid "Membership list updated." -msgstr "" - -#: ../../mod/group.php:107 -msgid "Group removed." -msgstr "" - -#: ../../mod/group.php:109 -msgid "Unable to remove group." +#: ../../addon/randplace/randplace.php:173 +msgid "Enable Randplace Plugin" msgstr "" #: ../../addon/twitter/twitter.php:64 @@ -1816,6 +1745,101 @@ msgstr "" msgid "Clear OAuth configuration" msgstr "" +#: ../../addon/tictac/tictac.php:14 +msgid "Three Dimensional Tic-Tac-Toe" +msgstr "" + +#: ../../addon/tictac/tictac.php:47 +msgid "3D Tic-Tac-Toe" +msgstr "" + +#: ../../addon/tictac/tictac.php:52 +msgid "New game" +msgstr "" + +#: ../../addon/tictac/tictac.php:53 +msgid "New game with handicap" +msgstr "" + +#: ../../addon/tictac/tictac.php:54 +msgid "" +"Three dimensional tic-tac-toe is just like the traditional game except that " +"it is played on multiple levels simultaneously. " +msgstr "" + +#: ../../addon/tictac/tictac.php:55 +msgid "" +"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." +msgstr "" + +#: ../../addon/tictac/tictac.php:57 +msgid "" +"The handicap game disables the center position on the middle level because " +"the player claiming this square often has an unfair advantage." +msgstr "" + +#: ../../addon/tictac/tictac.php:176 +msgid "You go first..." +msgstr "" + +#: ../../addon/tictac/tictac.php:181 +msgid "I'm going first this time..." +msgstr "" + +#: ../../addon/tictac/tictac.php:187 +msgid "You won!" +msgstr "" + +#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218 +msgid "\"Cat\" game!" +msgstr "" + +#: ../../addon/tictac/tictac.php:216 +msgid "I won!" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:39 +msgid "Upload a file" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:40 +msgid "Drop files here to upload" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:42 +msgid "Failed" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:288 +msgid "No files were uploaded." +msgstr "" + +#: ../../addon/js_upload/js_upload.php:294 +msgid "Uploaded file is empty" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:299 +msgid "Uploaded file is too large" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:317 +msgid "File has an invalid extension, it should be one of " +msgstr "" + +#: ../../addon/js_upload/js_upload.php:328 +msgid "Upload was cancelled, or server error encountered" +msgstr "" + +#: ../../addon/java_upload/java_upload.php:33 +msgid "Select files to upload: " +msgstr "" + +#: ../../addon/java_upload/java_upload.php:35 +msgid "" +"Use the following controls only if the Java uploader [above] fails to launch." +msgstr "" + #: ../../addon/statusnet/statusnet.php:78 msgid "Post to StatusNet" msgstr "" @@ -1871,195 +1895,28 @@ msgstr "" msgid "Send public postings to StatusNet" msgstr "" -#: ../../addon/tictac/tictac.php:14 -msgid "Three Dimensional Tic-Tac-Toe" +#: ../../index.php:194 +msgid "Not Found" msgstr "" -#: ../../addon/tictac/tictac.php:47 -msgid "3D Tic-Tac-Toe" +#: ../../index.php:195 +msgid "Page not found." msgstr "" -#: ../../addon/tictac/tictac.php:52 -msgid "New game" +#: ../../include/acl_selectors.php:132 +msgid "Visible To:" msgstr "" -#: ../../addon/tictac/tictac.php:53 -msgid "New game with handicap" +#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151 +msgid "Groups" msgstr "" -#: ../../addon/tictac/tictac.php:54 -msgid "" -"Three dimensional tic-tac-toe is just like the traditional game except that " -"it is played on multiple levels simultaneously. " +#: ../../include/acl_selectors.php:147 +msgid "Except For:" msgstr "" -#: ../../addon/tictac/tictac.php:55 -msgid "" -"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." -msgstr "" - -#: ../../addon/tictac/tictac.php:57 -msgid "" -"The handicap game disables the center position on the middle level because " -"the player claiming this square often has an unfair advantage." -msgstr "" - -#: ../../addon/tictac/tictac.php:176 -msgid "You go first..." -msgstr "" - -#: ../../addon/tictac/tictac.php:181 -msgid "I'm going first this time..." -msgstr "" - -#: ../../addon/tictac/tictac.php:187 -msgid "You won!" -msgstr "" - -#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218 -msgid "\"Cat\" game!" -msgstr "" - -#: ../../addon/tictac/tictac.php:216 -msgid "I won!" -msgstr "" - -#: ../../addon/java_upload/java_upload.php:33 -msgid "Select files to upload: " -msgstr "" - -#: ../../addon/java_upload/java_upload.php:35 -msgid "" -"Use the following controls only if the Java uploader [above] fails to launch." -msgstr "" - -#: ../../addon/facebook/facebook.php:116 -msgid "Facebook disabled" -msgstr "" - -#: ../../addon/facebook/facebook.php:124 -msgid "Facebook API key is missing." -msgstr "" - -#: ../../addon/facebook/facebook.php:131 -msgid "Facebook Connect" -msgstr "" - -#: ../../addon/facebook/facebook.php:137 -msgid "Install Facebook post connector" -msgstr "" - -#: ../../addon/facebook/facebook.php:144 -msgid "Remove Facebook post connector" -msgstr "" - -#: ../../addon/facebook/facebook.php:150 -msgid "Post to Facebook by default" -msgstr "" - -#: ../../addon/facebook/facebook.php:174 -msgid "Facebook" -msgstr "" - -#: ../../addon/facebook/facebook.php:175 -msgid "Facebook Connector Settings" -msgstr "" - -#: ../../addon/facebook/facebook.php:189 -msgid "Post to Facebook" -msgstr "" - -#: ../../addon/facebook/facebook.php:230 -msgid "Image: " -msgstr "" - -#: ../../addon/randplace/randplace.php:171 -msgid "Randplace Settings" -msgstr "" - -#: ../../addon/randplace/randplace.php:173 -msgid "Enable Randplace Plugin" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:39 -msgid "Upload a file" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:40 -msgid "Drop files here to upload" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:42 -msgid "Failed" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:288 -msgid "No files were uploaded." -msgstr "" - -#: ../../addon/js_upload/js_upload.php:294 -msgid "Uploaded file is empty" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:299 -msgid "Uploaded file is too large" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:317 -msgid "File has an invalid extension, it should be one of " -msgstr "" - -#: ../../addon/js_upload/js_upload.php:328 -msgid "Upload was cancelled, or server error encountered" -msgstr "" - -#: ../../include/contact_selectors.php:32 -msgid "Unknown | Not categorised" -msgstr "" - -#: ../../include/contact_selectors.php:33 -msgid "Block immediately" -msgstr "" - -#: ../../include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" -msgstr "" - -#: ../../include/contact_selectors.php:35 -msgid "Known to me, but no opinion" -msgstr "" - -#: ../../include/contact_selectors.php:36 -msgid "OK, probably harmless" -msgstr "" - -#: ../../include/contact_selectors.php:37 -msgid "Reputable, has my trust" -msgstr "" - -#: ../../include/contact_selectors.php:55 -msgid "Frequently" -msgstr "" - -#: ../../include/contact_selectors.php:56 -msgid "Hourly" -msgstr "" - -#: ../../include/contact_selectors.php:57 -msgid "Twice daily" -msgstr "" - -#: ../../include/contact_selectors.php:58 -msgid "Daily" -msgstr "" - -#: ../../include/contact_selectors.php:59 -msgid "Weekly" -msgstr "" - -#: ../../include/contact_selectors.php:60 -msgid "Monthly" +#: ../../include/auth.php:27 +msgid "Logged out." msgstr "" #: ../../include/profile_selectors.php:6 @@ -2274,20 +2131,112 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/acl_selectors.php:132 -msgid "Visible To:" +#: ../../include/contact_selectors.php:32 +msgid "Unknown | Not categorised" msgstr "" -#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151 -msgid "Groups" +#: ../../include/contact_selectors.php:33 +msgid "Block immediately" msgstr "" -#: ../../include/acl_selectors.php:147 -msgid "Except For:" +#: ../../include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" msgstr "" -#: ../../include/auth.php:27 -msgid "Logged out." +#: ../../include/contact_selectors.php:35 +msgid "Known to me, but no opinion" +msgstr "" + +#: ../../include/contact_selectors.php:36 +msgid "OK, probably harmless" +msgstr "" + +#: ../../include/contact_selectors.php:37 +msgid "Reputable, has my trust" +msgstr "" + +#: ../../include/contact_selectors.php:55 +msgid "Frequently" +msgstr "" + +#: ../../include/contact_selectors.php:56 +msgid "Hourly" +msgstr "" + +#: ../../include/contact_selectors.php:57 +msgid "Twice daily" +msgstr "" + +#: ../../include/contact_selectors.php:58 +msgid "Daily" +msgstr "" + +#: ../../include/contact_selectors.php:59 +msgid "Weekly" +msgstr "" + +#: ../../include/contact_selectors.php:60 +msgid "Monthly" +msgstr "" + +#: ../../include/nav.php:38 ../../boot.php:837 +msgid "Logout" +msgstr "" + +#: ../../include/nav.php:44 ../../boot.php:817 ../../boot.php:823 +msgid "Login" +msgstr "" + +#: ../../include/nav.php:56 ../../include/nav.php:91 +msgid "Home" +msgstr "" + +#: ../../include/nav.php:64 +msgid "Apps" +msgstr "" + +#: ../../include/nav.php:77 +msgid "Directory" +msgstr "" + +#: ../../include/nav.php:87 +msgid "Network" +msgstr "" + +#: ../../include/nav.php:96 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:104 +msgid "Manage" +msgstr "" + +#: ../../include/nav.php:107 +msgid "Settings" +msgstr "" + +#: ../../include/nav.php:109 +msgid "Profiles" +msgstr "" + +#: ../../include/oembed.php:57 +msgid "Embedding disabled" +msgstr "" + +#: ../../include/items.php:1027 +msgid "Birthday:" +msgstr "" + +#: ../../include/items.php:1371 +msgid "You have a new follower at " +msgstr "" + +#: ../../include/group.php:130 +msgid "Create a new group" +msgstr "" + +#: ../../include/group.php:131 +msgid "Everybody" msgstr "" #: ../../include/datetime.php:44 ../../include/datetime.php:46 @@ -2358,54 +2307,214 @@ msgstr "" msgid " ago" msgstr "" -#: ../../include/nav.php:56 ../../include/nav.php:91 -msgid "Home" +#: ../../include/dba.php:31 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/nav.php:64 -msgid "Apps" +#: ../../boot.php:808 +msgid "Create a New Account" msgstr "" -#: ../../include/nav.php:77 -msgid "Directory" +#: ../../boot.php:815 +msgid "Nickname or Email address: " msgstr "" -#: ../../include/nav.php:87 -msgid "Network" +#: ../../boot.php:816 +msgid "Password: " msgstr "" -#: ../../include/nav.php:96 -msgid "Notifications" +#: ../../boot.php:821 +msgid "Nickname/Email/OpenID: " msgstr "" -#: ../../include/nav.php:104 -msgid "Manage" +#: ../../boot.php:822 +msgid "Password (if not OpenID): " msgstr "" -#: ../../include/nav.php:107 -msgid "Settings" +#: ../../boot.php:825 +msgid "Forgot your password?" msgstr "" -#: ../../include/nav.php:109 -msgid "Profiles" +#: ../../boot.php:826 +msgid "Password Reset" msgstr "" -#: ../../include/items.php:1004 -msgid "Birthday:" +#: ../../boot.php:1077 +msgid "prev" msgstr "" -#: ../../include/items.php:1348 -msgid "You have a new follower at " +#: ../../boot.php:1079 +msgid "first" msgstr "" -#: ../../include/group.php:130 -msgid "Create a new group" +#: ../../boot.php:1108 +msgid "last" msgstr "" -#: ../../include/group.php:131 -msgid "Everybody" +#: ../../boot.php:1111 +msgid "next" msgstr "" -#: ../../include/oembed.php:57 -msgid "Embedding disabled" +#: ../../boot.php:1837 +#, php-format +msgid "%s likes this." +msgstr "" + +#: ../../boot.php:1837 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../boot.php:1841 +#, php-format +msgid "%2$d people like this." +msgstr "" + +#: ../../boot.php:1843 +#, php-format +msgid "%2$d people don't like this." +msgstr "" + +#: ../../boot.php:1849 +msgid "and" +msgstr "" + +#: ../../boot.php:1852 +#, php-format +msgid ", and %d other people" +msgstr "" + +#: ../../boot.php:1853 +#, php-format +msgid "%s like this." +msgstr "" + +#: ../../boot.php:1853 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: ../../boot.php:2014 +msgid "No contacts" +msgstr "" + +#: ../../boot.php:2267 +msgid "Connect" +msgstr "" + +#: ../../boot.php:2277 +msgid "Location:" +msgstr "" + +#: ../../boot.php:2281 +msgid ", " +msgstr "" + +#: ../../boot.php:2289 +msgid "Gender:" +msgstr "" + +#: ../../boot.php:2293 +msgid "Status:" +msgstr "" + +#: ../../boot.php:2295 +msgid "Homepage:" +msgstr "" + +#: ../../boot.php:2386 +msgid "Monday" +msgstr "" + +#: ../../boot.php:2386 +msgid "Tuesday" +msgstr "" + +#: ../../boot.php:2386 +msgid "Wednesday" +msgstr "" + +#: ../../boot.php:2386 +msgid "Thursday" +msgstr "" + +#: ../../boot.php:2386 +msgid "Friday" +msgstr "" + +#: ../../boot.php:2386 +msgid "Saturday" +msgstr "" + +#: ../../boot.php:2386 +msgid "Sunday" +msgstr "" + +#: ../../boot.php:2390 +msgid "January" +msgstr "" + +#: ../../boot.php:2390 +msgid "February" +msgstr "" + +#: ../../boot.php:2390 +msgid "March" +msgstr "" + +#: ../../boot.php:2390 +msgid "April" +msgstr "" + +#: ../../boot.php:2390 +msgid "May" +msgstr "" + +#: ../../boot.php:2390 +msgid "June" +msgstr "" + +#: ../../boot.php:2390 +msgid "July" +msgstr "" + +#: ../../boot.php:2390 +msgid "August" +msgstr "" + +#: ../../boot.php:2390 +msgid "September" +msgstr "" + +#: ../../boot.php:2390 +msgid "October" +msgstr "" + +#: ../../boot.php:2390 +msgid "November" +msgstr "" + +#: ../../boot.php:2390 +msgid "December" +msgstr "" + +#: ../../boot.php:2424 +msgid "Birthday Reminders" +msgstr "" + +#: ../../boot.php:2425 +msgid "Birthdays this week:" +msgstr "" + +#: ../../boot.php:2426 +msgid "(Adjusted for local time)" +msgstr "" + +#: ../../boot.php:2437 +msgid "[today]" +msgstr "" + +#: ../../boot.php:2634 +msgid "link to source" msgstr "" From c4b292a4f103eb049c13dbe3c62f0438c18de816 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 22 Mar 2011 03:07:46 -0700 Subject: [PATCH 05/83] account/profile/contacts export --- mod/settings.php | 5 ++++ mod/uexport.php | 48 +++++++++++++++++++++++++++++++ view/de/settings.tpl | 2 ++ view/en/settings.tpl | 2 ++ view/fr/settings.tpl | 2 ++ view/it/settings.tpl | 1 + view/sv/settings.tpl | 2 ++ view/theme/duepuntozero/style.css | 5 ++-- view/theme/loozah/style.css | 8 +++--- 9 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 mod/uexport.php diff --git a/mod/settings.php b/mod/settings.php index 6a2733d7c9..b20f4d11b8 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -5,6 +5,7 @@ function settings_init(&$a) { if(local_user()) { profile_load($a,$a->user['nickname']); } + } @@ -341,9 +342,13 @@ function settings_content(&$a) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + $uexport = ''; + + $o .= replace_macros($stpl,array( '$baseurl' => $a->get_baseurl(), '$oidhtml' => $oidhtml, + '$uexport' => $uexport, '$uid' => local_user(), '$username' => $username, '$openid' => $openid, diff --git a/mod/uexport.php b/mod/uexport.php new file mode 100644 index 0000000000..423c3a82fa --- /dev/null +++ b/mod/uexport.php @@ -0,0 +1,48 @@ + $v) + $user[$k] = $v; + + } + $contact = array(); + $r = q("SELECT * FROM `contact` WHERE `uid` = %d ", + local_user() + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $contact[][$k] = $v; + + } + + $profile = array(); + $r = q("SELECT * FROM `profile` WHERE `uid` = %d ", + local_user() + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $profile[][$k] = $v; + } + + + + $output = array('user' => $user, 'contact' => $contact, 'profile' => $profile); + + header("Content-type: text/json"); + echo str_replace('\\/','/',json_encode($output)); + + killme(); + +} \ No newline at end of file diff --git a/view/de/settings.tpl b/view/de/settings.tpl index 5f700ff8bd..170939991e 100644 --- a/view/de/settings.tpl +++ b/view/de/settings.tpl @@ -2,6 +2,8 @@ +$uexport + $nickname_block diff --git a/view/en/settings.tpl b/view/en/settings.tpl index 45060e1c47..134fffaf92 100644 --- a/view/en/settings.tpl +++ b/view/en/settings.tpl @@ -2,6 +2,8 @@ +$uexport + $nickname_block diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl index e0334842a2..9846219ed7 100644 --- a/view/fr/settings.tpl +++ b/view/fr/settings.tpl @@ -2,6 +2,8 @@ +$uexport + $nickname_block diff --git a/view/it/settings.tpl b/view/it/settings.tpl index d1e25da81c..6679e28fe3 100644 --- a/view/it/settings.tpl +++ b/view/it/settings.tpl @@ -2,6 +2,7 @@ +$uexport $nickname_block diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl index d5b8d5b3f1..2601f48513 100644 --- a/view/sv/settings.tpl +++ b/view/sv/settings.tpl @@ -2,6 +2,8 @@ +$uexport + $nickname_block diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index eda3cbf275..758ab9699d 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -372,6 +372,7 @@ input#dfrn-url { } #settings-nick-wrapper { + margin-top: 20px; margin-bottom: 30px; } @@ -2044,8 +2045,8 @@ a.mail-list-link { } -#plugin-settings-link, #account-settings-link { - margin-bottom: 25px; +#plugin-settings-link, #account-settings-link, #uexport-link { + margin-bottom: 10px; } /* end from defautlt */ diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 4a092c6d29..4d2ca6d636 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -505,7 +505,7 @@ input#dfrn-url { } #settings-nick-wrapper { - margin-bottom: 30px; + margin-bottom: 15px; } #settings-expire-end { @@ -608,7 +608,7 @@ input#dfrn-url { } #settings-nick { - margin-bottom: 50px; + margin-bottom: 30px; } #cropimage-wrapper, #cropimage-preview-wrapper { @@ -2079,8 +2079,8 @@ a.mail-list-link { } -#plugin-settings-link, #account-settings-link { - margin-bottom: 25px; +#plugin-settings-link, #account-settings-link, #uexport-link { + margin-bottom: 10px; } From 83a36cbd13a7c59b30164424579592a457cec7f5 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 22 Mar 2011 03:20:41 -0700 Subject: [PATCH 06/83] export posts also --- mod/uexport.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mod/uexport.php b/mod/uexport.php index 423c3a82fa..d8141534a4 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -36,9 +36,19 @@ function uexport_init(&$a) { $profile[][$k] = $v; } + $item = array(); + $r = q("SELECT * FROM `item` WHERE `uid` = %d ", + local_user() + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $item[][$k] = $v; + } - $output = array('user' => $user, 'contact' => $contact, 'profile' => $profile); + + $output = array('user' => $user, 'contact' => $contact, 'profile' => $profile, 'item' => $item ); header("Content-type: text/json"); echo str_replace('\\/','/',json_encode($output)); From f20464112f274d720649c2f92480cc235df4db19 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 22 Mar 2011 03:25:43 -0700 Subject: [PATCH 07/83] remove items from export - too much memory consumed, will have to stream items,photos --- mod/uexport.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/mod/uexport.php b/mod/uexport.php index d8141534a4..d8f9315932 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -36,19 +36,7 @@ function uexport_init(&$a) { $profile[][$k] = $v; } - $item = array(); - $r = q("SELECT * FROM `item` WHERE `uid` = %d ", - local_user() - ); - if(count($r)) { - foreach($r as $rr) - foreach($rr as $k => $v) - $item[][$k] = $v; - } - - - - $output = array('user' => $user, 'contact' => $contact, 'profile' => $profile, 'item' => $item ); + $output = array('user' => $user, 'contact' => $contact, 'profile' => $profile ); header("Content-type: text/json"); echo str_replace('\\/','/',json_encode($output)); From 9672d227974b0893d8e3b3bbe2c2afc7b50f0a4f Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 07:26:00 -0700 Subject: [PATCH 08/83] Edited view/sv/profile_listing_header.tpl via GitHub --- view/sv/profile_listing_header.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/sv/profile_listing_header.tpl b/view/sv/profile_listing_header.tpl index d4b139a698..476fc55f9b 100644 --- a/view/sv/profile_listing_header.tpl +++ b/view/sv/profile_listing_header.tpl @@ -1,8 +1,8 @@ -

Profiles

+

Profiler

-Change profile photo +Byt profilbild

From 29972b400521f64e46107fef906de609c507b400 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 07:27:07 -0700 Subject: [PATCH 09/83] Edited view/sv/profile_entry_default.tpl via GitHub --- view/sv/profile_entry_default.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/sv/profile_entry_default.tpl b/view/sv/profile_entry_default.tpl index 6511999184..87ad33e163 100644 --- a/view/sv/profile_entry_default.tpl +++ b/view/sv/profile_entry_default.tpl @@ -1,7 +1,6 @@ -
-Profile Image +Profilbild
From c3db186bd92b4a07017e87ea7dc6e335a46b8102 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 07:42:30 -0700 Subject: [PATCH 10/83] Edited view/sv/cropbody.tpl via GitHub --- view/sv/cropbody.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl index 39395af8e1..ddc8047340 100644 --- a/view/sv/cropbody.tpl +++ b/view/sv/cropbody.tpl @@ -1,6 +1,6 @@ -

Crop Image

+

Beskär bild

-Please adjust the image cropping for optimum viewing. +Välj hur bilden ska beskäras för att se så bra ut som möjligt.

@@ -51,7 +51,7 @@ Please adjust the image cropping for optimum viewing.
- +
From 60c9c444dc825544ac24be2d6602284c6cce0f78 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 07:45:05 -0700 Subject: [PATCH 11/83] Edited view/sv/directory_header.tpl via GitHub --- view/sv/directory_header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/sv/directory_header.tpl b/view/sv/directory_header.tpl index 03eed62b3c..2b11168b52 100644 --- a/view/sv/directory_header.tpl +++ b/view/sv/directory_header.tpl @@ -1,4 +1,4 @@ -

Site Directory

+

Katalog för denna sajt

$globaldir @@ -7,7 +7,7 @@ $finding
- +
From a5e1a4b1dcb2271d3cf786adf8c3cad04a96865f Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 07:48:22 -0700 Subject: [PATCH 12/83] Edited view/sv/group_new.tpl via GitHub --- view/sv/group_new.tpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/view/sv/group_new.tpl b/view/sv/group_new.tpl index a1efa77175..a1865b246b 100644 --- a/view/sv/group_new.tpl +++ b/view/sv/group_new.tpl @@ -1,21 +1,20 @@ -

-Create a group of contacts/friends. +Skapa en grupp med kontakter/vänner i.

- +
- +
From a5bca7ea4ec0e95e219c73bb7f6fa25a253bacb1 Mon Sep 17 00:00:00 2001 From: erik Date: Sun, 13 Mar 2011 20:36:14 +0100 Subject: [PATCH 13/83] commit001 --- view/sv/contact_edit.tpl | 2 +- view/sv/strings.php | 98 ++++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl index 40a7510735..1c5a1a3fb5 100644 --- a/view/sv/contact_edit.tpl +++ b/view/sv/contact_edit.tpl @@ -69,7 +69,7 @@ $rating

-Var vänlig spendera tid på att fylla i något här om du känner att det kan vara till någon hjälp för andra. +Var vänlig ägna en liten stund åt att fylla i något som du känner kan vara till hjälp för andra.

diff --git a/view/sv/strings.php b/view/sv/strings.php index 6685130bb9..2fe95bc969 100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php @@ -60,7 +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]'; -$a->strings['link to source'] = 'link to source'; +$a->strings['link to source'] = 'länk till källa'; $a->strings['No recipient selected.'] = 'Ingen mottagare vald.'; $a->strings['[no subject]'] = '[no subject]'; $a->strings['Unable to locate contact information.'] = 'Hittar inga kontaktuppgifter.'; @@ -94,12 +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.'; -$a->strings['Contact has been '] = 'Kontakt '; +$a->strings['Contact has been '] = 'Kontakten '; $a->strings['blocked'] = 'spärrad'; $a->strings['unblocked'] = 'inte längre spärrad'; $a->strings['ignored'] = 'ignoreras'; $a->strings['unignored'] = 'ignoreras inte längre'; -$a->strings['stopped following'] = 'stopped following'; +$a->strings['stopped following'] = 'följer inte längre'; $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'; @@ -142,40 +142,40 @@ $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.'; -$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.'; +$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['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'; -$a->strings[' commented on an item at '] = ' skrev en kommentar på '; -$a->strings[" commented on an item at "] = " skrev en kommentar på "; +$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."] = "This introduction has already been accepted."; +$a->strings["This introduction has already been accepted."] = "Den här förfrågan har redan accepterats."; $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'; -$a->strings[" was "] = " was "; -$a->strings["s were "] = "s were "; +$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.'] = 'Unrecoverable protocol error.'; +$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.'] = ' has received too many connection requests today.'; -$a->strings['Spam protection measures have been invoked.'] = 'Spam protection measures have been invoked.'; +$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['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.'; -$a->strings['Disallowed profile URL.'] = 'Disallowed profile URL.'; +$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."] = "Please login to confirm introduction."; +$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'] = 'Friend/Connection Request'; +$a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrågan'; $a->strings['Please answer the following:'] = 'Besvara följande, tack:'; $a->strings['Does $name know you?'] = 'Känner $name dig?'; $a->strings['Yes'] = 'Ja'; @@ -272,16 +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 "; -$a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages'; +$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: '] = 'Select an identity to manage: '; +$a->strings['Select an identity to manage: '] = 'Välj vilken identitet du vill ändra: '; $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'; -$a->strings['Permission settings'] = 'Permission settings'; +$a->strings['Permission settings'] = 'Åtkomstinställningar'; $a->strings['No such group'] = 'Gruppen finns inte'; $a->strings['Group is empty'] = 'Gruppen är tom'; $a->strings['Group: '] = 'Grupp: '; @@ -291,10 +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'; -$a->strings['Claims to be known to you: '] = 'Claims to be known to you: '; +$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: '] = 'Approve as: '; +$a->strings['Approve as: '] = 'Godkänn som: '; $a->strings['Friend'] = 'Vän'; $a->strings['Fan/Admirer'] = 'Fan/Beundrare'; $a->strings['Notification type: '] = 'Notification type: '; @@ -311,7 +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'; -$a->strings['was tagged in a'] = 'was tagged in a'; +$a->strings['was tagged in a'] = 'har taggats i'; $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.'; @@ -320,7 +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: '; -$a->strings['Permissions'] = 'Permissions'; +$a->strings['Permissions'] = 'Åtkomst'; $a->strings['Edit Album'] = 'Redigera album'; $a->strings['View Photo'] = 'Visa foto'; $a->strings['Photo not available'] = 'Fotot är inte tillgängligt'; @@ -328,10 +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]'; -$a->strings['New album name'] = 'New album name'; +$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'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'; +$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping'; $a->strings['Recent Photos'] = 'Nyligen tillagda foton'; $a->strings['Upload New Photos'] = 'Ladda upp foton'; $a->strings['View Album'] = 'Titta i album'; @@ -342,7 +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].'; -$a->strings['Profile Name is required.'] = 'Profile Name is required.'; +$a->strings['Profile Name is required.'] = 'Profilen måste ha ett namn.'; $a->strings['Profile updated.'] = 'Profilen har uppdaterats.'; $a->strings['Profile deleted.'] = 'Profilen har tagits bort.'; $a->strings['Profile-'] = 'Profil-'; @@ -351,7 +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'; -$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-url'; +$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-URL'; $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.'; @@ -381,7 +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 '; -$a->strings['Account approved.'] = 'Account approved.'; +$a->strings['Account approved.'] = 'Kontot har godkänts.'; $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:'; @@ -398,12 +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: '; -$a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Optional\x29 Allow this OpenID to login to this account."; +$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'] = 'Remove Item Tag'; -$a->strings['Select a tag to remove: '] = 'Välj tagg som ska tas 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['Remove'] = 'Ta bort'; $a->strings['No contacts.'] = 'Inga kontakter.'; $a->strings['Visible To:'] = 'Synlig för:'; @@ -502,7 +502,7 @@ $a->strings['Divorced'] = 'Skiljd'; $a->strings['Widowed'] = 'Widowed'; $a->strings['Uncertain'] = 'Uncertain'; $a->strings['Complicated'] = 'Komplicerat'; -$a->strings['Don\'t care'] = 'Don\'t care'; +$a->strings['Don\'t care'] = 'Bryr mig inte'; $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.'; @@ -511,10 +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'; -$a->strings['Post to Facebook'] = 'Post to Facebook'; +$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.'] = 'Use the following controls only if the Java uploader [above] fails to launch.'; +$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['Upload a file'] = 'Ladda upp fil'; $a->strings['Drop files here to upload'] = 'Dra filer som ska laddas upp hit'; $a->strings['Failed'] = 'Misslyckades'; @@ -525,36 +525,36 @@ $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'; -$a->strings['Post to StatusNet'] = 'Post to StatusNet'; +$a->strings['Post to StatusNet'] = 'Lägg in på StatusNet'; $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.'; -$a->strings['Log in with StatusNet'] = 'Log in with StatusNet'; +$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: '] = 'Currently connected to: '; +$a->strings['Currently connected to: '] = 'Ansluten till: '; $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'; -$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. '; -$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.'] = '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.'; -$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'; -$a->strings['You go first...'] = 'You go first...'; -$a->strings['I\'m going first this time...'] = 'I\'m going first this time...'; -$a->strings['You won!'] = 'You won!'; +$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!'] = 'I won!'; -$a->strings['Post to Twitter'] = 'Post to Twitter'; +$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'] = 'Copy the PIN from Twitter here'; +$a->strings['Copy the PIN from Twitter here'] = 'Ange PIN-koden från Twitter här'; $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'; @@ -1045,7 +1045,7 @@ $a->strings['Israel'] = 'Israel'; $a->strings['Jamaica'] = 'Jamaica'; $a->strings['Japan'] = 'Japan'; $a->strings['Kwajalein'] = 'Kwajalein'; -$a->strings['Libya'] = 'Libya'; +$a->strings['Libya'] = 'Libyen'; $a->strings['MET'] = 'MET'; $a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte'; $a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur'; @@ -1095,7 +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'; -$a->strings['Poland'] = 'Poland'; +$a->strings['Poland'] = 'Polen'; $a->strings['Portugal'] = 'Portugal'; $a->strings['PRC'] = 'PRC'; $a->strings['PST8PDT'] = 'PST8PDT'; From 2102ca2fc0ab1c55a0564ac907d5a26e39ba0d5a Mon Sep 17 00:00:00 2001 From: erik Date: Thu, 17 Mar 2011 22:13:00 +0100 Subject: [PATCH 14/83] commit001 --- view/sv/profile_tabs.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/sv/profile_tabs.tpl b/view/sv/profile_tabs.tpl index 9c6c54a1c5..3048d534f1 100644 --- a/view/sv/profile_tabs.tpl +++ b/view/sv/profile_tabs.tpl @@ -1,7 +1,7 @@ \ No newline at end of file From 26f0b3773826854d3b18694f2e81245c445702e3 Mon Sep 17 00:00:00 2001 From: erik Date: Sun, 20 Mar 2011 10:54:40 +0100 Subject: [PATCH 15/83] commit001 --- view/sv/strings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/sv/strings.php b/view/sv/strings.php index 2fe95bc969..3518151e18 100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php @@ -369,8 +369,8 @@ $a->strings['Failed to send email message. Here is the message that failed.'] = $a->strings['Your registration can not be processed.'] = 'Det går inte att behandla registreringen.'; $a->strings['Registration request at '] = 'Registration request at '; $a->strings['Your registration is pending approval by the site owner.'] = 'Din registrering inväntar godkännande av webbplatsens ägare.'; -$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; -$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Om du inte känner till OpenID kan du lämna det fältet tomt och fylla i resten.'; +$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Om du vill kan du fylla i detta formulär via OpenID genom att ange ditt OpenID och klicka på 'Registrera'."; +$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Om du inte vet vad OpenID är kan du lämna det fältet tomt och fylla i resten.'; $a->strings["Your OpenID \x28optional\x29: "] = "Ditt OpenID \x28krävs ej\x29: "; $a->strings['Members of this network prefer to communicate with real people who use their real names.'] = 'Medlemmarna i det här nätverket föredrar att kommunicera med riktiga människor som använder sina riktiga namn.'; $a->strings['Include your profile in member directory?'] = 'Inkludera din profil i medlemskatalogen?'; From 37811e691b6b51a2385d03842b106078ad6b5ef7 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:26:49 -0700 Subject: [PATCH 16/83] Edited view/sv/cmnt_received_eml.tpl via GitHub --- view/sv/cmnt_received_eml.tpl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl index 60a5711ea6..a90f3d0ddd 100644 --- a/view/sv/cmnt_received_eml.tpl +++ b/view/sv/cmnt_received_eml.tpl @@ -1,18 +1,14 @@ $username, - - '$from' har kommenterat något som du följer. +'$from' har kommenterat något som du följer. ----- $body ----- Logga in på $siteurl för att se hela konversationen: - $display -Tack, - $sitename admin - +Hälsningar, +$sitename admin - From 7c3f3f92c997503bea66f3242b513384a2ddcc82 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:28:44 -0700 Subject: [PATCH 17/83] Edited view/sv/contact_edit.tpl via GitHub --- view/sv/contact_edit.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl index 1c5a1a3fb5..569bce0518 100644 --- a/view/sv/contact_edit.tpl +++ b/view/sv/contact_edit.tpl @@ -46,7 +46,7 @@ $ignored
- +

Profilvisning

@@ -56,7 +56,7 @@ $ignored $profile_select
- +
@@ -76,6 +76,6 @@ Var vänlig ägna en liten stund åt att fylla i något som du
$groups - +
From 4a14e51e25c58d5a81b68798f2340c6196dec8ea Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:29:53 -0700 Subject: [PATCH 18/83] Edited view/sv/cropbody.tpl via GitHub --- view/sv/cropbody.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl index ddc8047340..f523ee3b5e 100644 --- a/view/sv/cropbody.tpl +++ b/view/sv/cropbody.tpl @@ -54,4 +54,4 @@ Välj hur bilden ska beskäras för att se så bra ut som m&oum
- + \ No newline at end of file From 6c41e6af61b142b1836297b7ca42b290358183cd Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:32:07 -0700 Subject: [PATCH 19/83] Edited view/sv/dfrn_req_confirm.tpl via GitHub --- view/sv/dfrn_req_confirm.tpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/view/sv/dfrn_req_confirm.tpl b/view/sv/dfrn_req_confirm.tpl index f053f22af2..f86b2ea863 100644 --- a/view/sv/dfrn_req_confirm.tpl +++ b/view/sv/dfrn_req_confirm.tpl @@ -1,8 +1,7 @@ -

-Welcome home $username. +Välkommen hem $username.
-Please confirm your introduction to $dfrn_url. +Bekräfta your introduction to $dfrn_url.

@@ -12,6 +11,6 @@ Please confirm your introduction to $dfrn_url. $aes_allow
- +
\ No newline at end of file From 8de46dbc0db93fbdbe588906bba5abf5d6356a6b Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:33:24 -0700 Subject: [PATCH 20/83] Edited view/sv/directory_header.tpl via GitHub --- view/sv/directory_header.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/sv/directory_header.tpl b/view/sv/directory_header.tpl index 2b11168b52..abbd861205 100644 --- a/view/sv/directory_header.tpl +++ b/view/sv/directory_header.tpl @@ -1,4 +1,4 @@ -

Katalog för denna sajt

+

Katalog för denna sajt (ej global)

$globaldir @@ -11,4 +11,3 @@ $finding
- From 771acb9cf761b648b061e7cd8363177c724f048e Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:36:15 -0700 Subject: [PATCH 21/83] Edited view/sv/follow_notify_eml.tpl via GitHub --- view/sv/follow_notify_eml.tpl | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl index ae758c9a8f..15ea737630 100644 --- a/view/sv/follow_notify_eml.tpl +++ b/view/sv/follow_notify_eml.tpl @@ -1,14 +1,12 @@ -Dear $myname, +$myname, -You have a new follower at $sitename - '$requestor'. +'$requestor' på $sitename har ansökt om att följa dig här på Friendika. -You may visit their profile at $url. - -Please login to your site to approve or ignore/cancel the request. +Här kan du kolla dennes profil: $url +Logga in för att godkänna eller avslå förfrågan. $siteurl -Regards, - - $sitename administrator \ No newline at end of file +Hälsningar, +$sitename admin From 6b1348c5f2d56ebec50807d7548021f93251acf7 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:38:31 -0700 Subject: [PATCH 22/83] Edited view/sv/cmnt_received_eml.tpl via GitHub --- view/sv/cmnt_received_eml.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl index a90f3d0ddd..d87c7a1d14 100644 --- a/view/sv/cmnt_received_eml.tpl +++ b/view/sv/cmnt_received_eml.tpl @@ -1,5 +1,6 @@ $username, + '$from' har kommenterat något som du följer. ----- @@ -7,8 +8,10 @@ $body ----- Logga in på $siteurl för att se hela konversationen: + $display Hälsningar, $sitename admin + From 8747c12c80f6896c267e09cc671d97431fcb08b1 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:41:01 -0700 Subject: [PATCH 23/83] Edited view/sv/contact_edit.tpl via GitHub --- view/sv/contact_edit.tpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl index 569bce0518..f7a0d9af1f 100644 --- a/view/sv/contact_edit.tpl +++ b/view/sv/contact_edit.tpl @@ -1,4 +1,3 @@ -

$header

$name
@@ -28,7 +27,7 @@
-
$lastupdtext$last_update +
$lastupdtext$last_update
$updpub
$poll_interval @@ -76,6 +75,6 @@ Var vänlig ägna en liten stund åt att fylla i något som du
$groups - + -
+ \ No newline at end of file From 4eb8270fbe9ddcbd5d1688fae8bd49eba232e185 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:42:02 -0700 Subject: [PATCH 24/83] Edited view/sv/cropbody.tpl via GitHub --- view/sv/cropbody.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl index f523ee3b5e..a91a7eafcf 100644 --- a/view/sv/cropbody.tpl +++ b/view/sv/cropbody.tpl @@ -1,6 +1,6 @@ -

Beskär bild

+

Beskär bilden

-Välj hur bilden ska beskäras för att se så bra ut som möjligt. +Välj hur du vill att bilden ska beskäras.

From bc49c08dc768b7ec003569c8381c97198c0afebf Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:43:45 -0700 Subject: [PATCH 25/83] Edited view/sv/dfrn_req_confirm.tpl via GitHub --- view/sv/dfrn_req_confirm.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/sv/dfrn_req_confirm.tpl b/view/sv/dfrn_req_confirm.tpl index f86b2ea863..7f8c977ce3 100644 --- a/view/sv/dfrn_req_confirm.tpl +++ b/view/sv/dfrn_req_confirm.tpl @@ -1,7 +1,7 @@

-Välkommen hem $username. +Välkommen hem, $username.
-Bekräfta your introduction to $dfrn_url. +Här kan du bekräfta kontaktförfrågan till $dfrn_url.

From 232ed2bdc5387307cd8693c228b1bcd94a10fae9 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:45:16 -0700 Subject: [PATCH 26/83] Edited view/sv/directory_header.tpl via GitHub --- view/sv/directory_header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/sv/directory_header.tpl b/view/sv/directory_header.tpl index abbd861205..0623a21b0d 100644 --- a/view/sv/directory_header.tpl +++ b/view/sv/directory_header.tpl @@ -1,4 +1,4 @@ -

Katalog för denna sajt (ej global)

+

Medlemskatalog för denna webbplats (ej global)

$globaldir From 9b7df09e7aed1f943b99d011683496a1f57752b9 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:46:49 -0700 Subject: [PATCH 27/83] Edited view/sv/follow_notify_eml.tpl via GitHub --- view/sv/follow_notify_eml.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl index 15ea737630..fee08bdcaf 100644 --- a/view/sv/follow_notify_eml.tpl +++ b/view/sv/follow_notify_eml.tpl @@ -1,11 +1,11 @@ - $myname, -'$requestor' på $sitename har ansökt om att följa dig här på Friendika. +'$requestor' på $sitename vill följa dina uppdateringar här på Friendika. -Här kan du kolla dennes profil: $url +Besök dennes profil på $url. Logga in för att godkänna eller avslå förfrågan. + $siteurl Hälsningar, From 189abd2edf3ee12602b017f270f1c50cfbd0dc1d Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:48:52 -0700 Subject: [PATCH 28/83] Edited view/sv/friend_complete_eml.tpl via GitHub --- view/sv/friend_complete_eml.tpl | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl index ab12fcb6b7..2b8b0238e8 100644 --- a/view/sv/friend_complete_eml.tpl +++ b/view/sv/friend_complete_eml.tpl @@ -1,22 +1,17 @@ +$username, -Dear $username, +Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. - Great news... '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. +Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden +utan begränsningar. -You are now mutual friends and may exchange status updates, photos, and email -without restriction. - -Please visit your 'Contacts' page at $sitename if you wish to make -any changes to this relationship. +Gå in på din sida 'Kontakter' på $sitename om du vill göra några +ändringar när det gäller denna kontakt. $siteurl -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$fn']. +[Du kan exempelvis skapa en separat profil med information som inte +är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn']. -Sincerely, - - $sitename Administrator - - +Hälsningar, +$sitename admin From fff72ffe2791abd27a4e04f2e153ee6a941b28ec Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:50:36 -0700 Subject: [PATCH 29/83] Edited view/sv/group_edit.tpl via GitHub --- view/sv/group_edit.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/sv/group_edit.tpl b/view/sv/group_edit.tpl index e6c7afb490..12e650597c 100644 --- a/view/sv/group_edit.tpl +++ b/view/sv/group_edit.tpl @@ -1,22 +1,22 @@ -

Group Editor

+

Gruppredigering

- +
- + $selector
$drop
- +
From f8faa73fb8e08d6ca9990a309658b17c48f4ef41 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:51:30 -0700 Subject: [PATCH 30/83] Edited view/sv/group_new.tpl via GitHub --- view/sv/group_new.tpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/sv/group_new.tpl b/view/sv/group_new.tpl index a1865b246b..cda937ede2 100644 --- a/view/sv/group_new.tpl +++ b/view/sv/group_new.tpl @@ -5,7 +5,7 @@

-Skapa en grupp med kontakter/vänner i. +Skapa en grupp med kontakter/vänner.

@@ -18,5 +18,3 @@ Skapa en grupp med kontakter/vänner i.
- - \ No newline at end of file From d99d46631eee61266fa7caaf21652316c5cf55b3 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:52:45 -0700 Subject: [PATCH 31/83] Edited view/sv/head.tpl via GitHub --- view/sv/head.tpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/sv/head.tpl b/view/sv/head.tpl index 8f97a11e50..828fcb13da 100644 --- a/view/sv/head.tpl +++ b/view/sv/head.tpl @@ -11,7 +11,7 @@ - - From 2f982c9332b96633c0db6efaf7fc0de246b8283c Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:54:20 -0700 Subject: [PATCH 32/83] Edited view/sv/insecure_net.tpl via GitHub --- view/sv/insecure_net.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/sv/insecure_net.tpl b/view/sv/insecure_net.tpl index 5628639ccf..b354ed12d6 100644 --- a/view/sv/insecure_net.tpl +++ b/view/sv/insecure_net.tpl @@ -1,6 +1,6 @@

-The social network that $name belongs to is an open network with limited or non-existent privacy controls. -Please use appropriate discretion. +Det sociala nätverk som $name tillhör är öppet och saknar nästan helt möjlighet att begränsa insynen. +Kom alltså ihåg att vara lite diskret.

-
\ No newline at end of file +
From 06b76e47d949e9a27e3635aa7c7da311eaf9379e Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:55:11 -0700 Subject: [PATCH 33/83] Edited view/sv/install_db.tpl via GitHub --- view/sv/install_db.tpl | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/view/sv/install_db.tpl b/view/sv/install_db.tpl index c413689c25..fb66ef29b6 100644 --- a/view/sv/install_db.tpl +++ b/view/sv/install_db.tpl @@ -1,33 +1,32 @@ - -

Friendika Social Network

+

Det sociala nätverket Friendika

Installation

-In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. +För att kunna installera Friendika måste du ange hur man ansluter till din databas. Kontakta ditt webbhotell eller webbplatsadministratör om du har frågor om dessa inställningar. Databasen du specar nedan måste finnas. Skapa databasen innan du fortsätter, om det inte redan är gjort.

- +
- +
- +
- +
-Please select a default timezone for your website +Ange vilken tidszon som ska vara förvald på din webbplats
$tzselect @@ -37,4 +36,3 @@ $tzselect
- From ea1a69c84f47e85535f3b4a385e17e49eb87af95 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:56:22 -0700 Subject: [PATCH 34/83] Edited view/sv/intro_complete_eml.tpl via GitHub --- view/sv/intro_complete_eml.tpl | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl index a60745ec55..1f24af25f6 100644 --- a/view/sv/intro_complete_eml.tpl +++ b/view/sv/intro_complete_eml.tpl @@ -1,22 +1,19 @@ +$username, -Dear $username, +'$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. - '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. +'$fn' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar +i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion +mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts +per automatik. - '$fn' has chosen to accept you a "fan", which restricts -some forms of communication - such as private messaging and some profile -interactions. If this is a celebrity or community page, these settings were -applied automatically. +'$fn' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer +tillåtande kommunikationsform i framtiden. - '$fn' may choose to extend this into a two-way or more permissive -relationship in the future. - - You will start receiving public status updates from '$fn', -which will appear on your 'Network' page at +Du kommer hädanefter att få statusuppdateringar från '$fn', +vilka kommer att synas på din Nätverk-sida på $siteurl -Sincerely, - - $sitename Administrator +Hälsningar, +$sitename admin From 02975027da7440643ebe7b9d59400e894376d544 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:57:00 -0700 Subject: [PATCH 35/83] Edited view/sv/intros-top.tpl via GitHub --- view/sv/intros-top.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/sv/intros-top.tpl b/view/sv/intros-top.tpl index d8b7394a4a..0aa01c5da4 100644 --- a/view/sv/intros-top.tpl +++ b/view/sv/intros-top.tpl @@ -1,7 +1,6 @@ -

Pending Friend/Connect Notifications

+

Väntande förfrågningar om vänskap/kontakt

- From f88b5f75addbd775051c60ea26cdcac01f977f55 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:58:03 -0700 Subject: [PATCH 36/83] Edited view/sv/jot-header.tpl via GitHub --- view/sv/jot-header.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/view/sv/jot-header.tpl b/view/sv/jot-header.tpl index fe818410e5..0296d0eb6f 100644 --- a/view/sv/jot-header.tpl +++ b/view/sv/jot-header.tpl @@ -139,4 +139,3 @@ tinyMCE.init({ $geotag - From d578c45ef8130a474403d8f8f0ffaa832d60192d Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:58:50 -0700 Subject: [PATCH 37/83] Edited view/sv/lostpass.tpl via GitHub --- view/sv/lostpass.tpl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/view/sv/lostpass.tpl b/view/sv/lostpass.tpl index a7040c1493..9294fb2613 100644 --- a/view/sv/lostpass.tpl +++ b/view/sv/lostpass.tpl @@ -1,18 +1,17 @@ -

Forgot your Password?

+

Har du glömt lösenordet?

-Enter your email address and submit to have your password reset. Then check your email for further instructions. +Skriv in och skicka din e-postadress för att återställa lösenordet. Kolla sedan din e-post för vidare instruktioner.

- +
- +
- From 0f61fa8de19c2dcc089b39618ab2b2e198955b10 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 10:59:40 -0700 Subject: [PATCH 38/83] Edited view/sv/lostpass_eml.tpl via GitHub --- view/sv/lostpass_eml.tpl | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl index c350236a43..df338fa699 100644 --- a/view/sv/lostpass_eml.tpl +++ b/view/sv/lostpass_eml.tpl @@ -1,32 +1,29 @@ +$username, -Dear $username, - A request was recently received at $sitename to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. +En begäran om återställning av lösenord på $sitename har mottagits. +Gå till adressen nedan för att bekräfta denna begäran. Du kan också +klistra in länken i adressfältet i din webbläsare. -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. +Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. +Då kan du ignorera det här meddelandet. -Your password will not be changed unless we can verify that you -issued this request. +Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du +initierat detta. -Follow this link to verify your identity: +Med den här länken kan du bekräfta din identitet: $reset_link -You will then receive a follow-up message containing the new password. +Sedan kommer du att få ett meddelande med ett nytt lösenord. -You may change that password from your account settings page after logging in. +Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. -The login details are as follows: +Detaljerna ser ut så här: -Site Location: $siteurl -Login Name: $email +Webbplats: $siteurl +Inloggningsnamn: $email +Hälsningar, +$sitename admin - - -Sincerely, - $sitename Administrator - - + \ No newline at end of file From 091cecec021309e4f7815cb4efa8c3307f9bc6e7 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:01:09 -0700 Subject: [PATCH 39/83] Edited view/sv/mail_received_html_body_eml.tpl via GitHub --- view/sv/mail_received_html_body_eml.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl index 6b7eb88735..a9a34c23af 100644 --- a/view/sv/mail_received_html_body_eml.tpl +++ b/view/sv/mail_received_html_body_eml.tpl @@ -1,7 +1,7 @@ - Friendika Message + Meddelande på Friendika @@ -9,16 +9,16 @@ Friendika - $from sent you a new private message at $siteName. + $from har skickat ett personligt meddelande till dig på $siteName. $from $title $htmlversion - Please login at $siteurl to read and reply to your private messages. - Thank You, - $siteName Administrator + Logga in på $siteurl för att läsa och svara på personliga meddelanden. + Hälsningar, + $siteName admin From 90826f8a7d451dd76823813cfe557a3113bb4ad3 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:02:24 -0700 Subject: [PATCH 40/83] Edited view/sv/mail_received_text_body_eml.tpl via GitHub --- view/sv/mail_received_text_body_eml.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/sv/mail_received_text_body_eml.tpl b/view/sv/mail_received_text_body_eml.tpl index 0238673043..ac2857b587 100644 --- a/view/sv/mail_received_text_body_eml.tpl +++ b/view/sv/mail_received_text_body_eml.tpl @@ -1,10 +1,10 @@ -$from sent you a new private message at $siteName. +$from har skickat ett personligt meddelande till dig på $siteName. $title $textversion -Please login at $siteurl to read and reply to your private messages. +Logga in på $siteurl för att läsa och svara på personliga meddelanden. -Thank you, -$siteName administrator +Hälsningar, +$siteName admin From 82bf55666f92adcc2fda30f19de22b94173c667b Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:03:30 -0700 Subject: [PATCH 41/83] Edited view/sv/msg-header.tpl via GitHub --- view/sv/msg-header.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/view/sv/msg-header.tpl b/view/sv/msg-header.tpl index 174e6c985f..2189b7fedb 100644 --- a/view/sv/msg-header.tpl +++ b/view/sv/msg-header.tpl @@ -101,4 +101,3 @@ tinyMCE.init({ } - From 196ba3c51a8ff362ea96a01df4227990d51c49bc Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:04:26 -0700 Subject: [PATCH 42/83] Edited view/sv/pagetypes.tpl via GitHub --- view/sv/pagetypes.tpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/view/sv/pagetypes.tpl b/view/sv/pagetypes.tpl index 2036614abd..2d576f5ac0 100644 --- a/view/sv/pagetypes.tpl +++ b/view/sv/pagetypes.tpl @@ -1,25 +1,25 @@
- + - This account is a normal personal profile + Detta konto är en normal personlig profil
- Automatically approve all connection/friend requests as read-only fans + Godkänn automatiskt alla kontaktförfrågningar som fans med läsrättigheter
- + - Automatically approve all connection/friend requests as read-write fans + Godkänn automatiskt alla kontaktförfrågningar som fans med läs- och skrivrättigheter
- + - Automatically approve all connection/friend requests as friends + Godkänn automatiskt alla kontaktförfrågningar som vänner
-
+
\ No newline at end of file From 15ef0e601eb4fba4fa50732868fb16ad972faf15 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:05:36 -0700 Subject: [PATCH 43/83] Edited view/sv/passchanged_eml.tpl via GitHub --- view/sv/passchanged_eml.tpl | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl index 9692159e18..590462468b 100644 --- a/view/sv/passchanged_eml.tpl +++ b/view/sv/passchanged_eml.tpl @@ -1,20 +1,18 @@ -Dear $username, - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). +$username, + +Lösenordet har ändrats enligt din begäran. Behåll den här +informationen om den skulle behövas i framtiden. (eller ändra lösenord +på en gång till något som du kommer ihåg). -Your login details are as follows: +Här är dina inloggningsuppgifter: -Site Location: $siteurl -Login Name: $email -Password: $new_password +Webbplats: $siteurl +Användarnamn: $email +Lösenord: $new_password -You may change that password from your account settings page after logging in. +När du loggat in kan du byta lösenord bland inställningarna. - -Sincerely, - $sitename Administrator - - +Hälsningar, +$sitename admin From c7b671aa2dcc3d7570a00818b48d821ff3fbf06a Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:07:18 -0700 Subject: [PATCH 44/83] Edited view/sv/profile.php via GitHub --- view/sv/profile.php | 143 ++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 72 deletions(-) diff --git a/view/sv/profile.php b/view/sv/profile.php index fa7372668c..6c551e1851 100644 --- a/view/sv/profile.php +++ b/view/sv/profile.php @@ -1,72 +1,71 @@ - - - - <?php if(x($page,'title')) echo $page['title']; ?> - - - -
- - -
- - -
-
- -
- - - + + + + <?php if(x($page,'title')) echo $page['title']; ?> + + + +
+ + +
+ + +
+
+ +
+ + From 2e6f718f0d063f56962216da506b4d4a7f99c2a3 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:53:34 -0700 Subject: [PATCH 45/83] Edited view/sv/profile_advanced.php via GitHub --- view/sv/profile_advanced.php | 38 +++++++++++++++++------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/view/sv/profile_advanced.php b/view/sv/profile_advanced.php index 6d2ecba4d6..0891d7ff1a 100644 --- a/view/sv/profile_advanced.php +++ b/view/sv/profile_advanced.php @@ -12,7 +12,7 @@ EOT; if($a->profile['name']) { $o .= <<< EOT
-
Full Name:
+
Fullständigt namn:
{$a->profile['name']}
@@ -22,7 +22,7 @@ EOT; if($a->profile['gender']) { $o .= <<< EOT
-
Gender:
+
Kön:
{$a->profile['gender']}
@@ -32,7 +32,7 @@ EOT; if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { $o .= <<< EOT
-
Birthday:
+
Födelsedag:
EOT; // If no year, add an arbitrary one so just we can parse the month and day. @@ -50,7 +50,7 @@ $o .= '
'; if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { $o .= <<< EOT
-
Age:
+
Ålder:
$age
@@ -60,7 +60,7 @@ EOT; if($a->profile['marital']) { $o .= <<< EOT
-
Status:
+
Civilstatus:
{$a->profile['marital']}
EOT; @@ -75,7 +75,7 @@ EOT; if($a->profile['sexual']) { $o .= <<< EOT
-
Sexual Preference:
+
Sexuell läggning:
{$a->profile['sexual']}
@@ -86,7 +86,7 @@ if($a->profile['homepage']) { $homepage = linkify($a->profile['homepage']); $o .= <<< EOT
-
Homepage:
+
Hemsida URL:
$homepage
@@ -96,7 +96,7 @@ EOT; if($a->profile['politic']) { $o .= <<< EOT
-
Political Views:
+
Politisk åskådning:
{$a->profile['politic']}
@@ -115,7 +115,7 @@ EOT; if($txt = prepare_text($a->profile['about'])) { $o .= <<< EOT
-
About:
+
Om:

$txt
@@ -126,7 +126,7 @@ EOT; if($txt = prepare_text($a->profile['interest'])) { $o .= <<< EOT
-
Hobbies/Interests:
+
Hobbys/Intressen:

$txt
@@ -137,7 +137,7 @@ EOT; if($txt = prepare_text($a->profile['contact'])) { $o .= <<< EOT
-
Contact information and Social Networks:
+
Kontaktuppgifter och sociala nätverk:

$txt
@@ -148,7 +148,7 @@ EOT; if($txt = prepare_text($a->profile['music'])) { $o .= <<< EOT
-
Musical interests:
+
Musik:

$txt
@@ -159,7 +159,7 @@ EOT; if($txt = prepare_text($a->profile['book'])) { $o .= <<< EOT
-
Books, literature:
+
Böcker, litteratur:

$txt
@@ -170,7 +170,7 @@ EOT; if($txt = prepare_text($a->profile['tv'])) { $o .= <<< EOT
-
Television:
+
TV:

$txt
@@ -181,7 +181,7 @@ EOT; if($txt = prepare_text($a->profile['film'])) { $o .= <<< EOT
-
Film/dance/culture/entertainment:
+
Film/dans/kultur/underhållning:

$txt
@@ -192,7 +192,7 @@ EOT; if($txt = prepare_text($a->profile['romance'])) { $o .= <<< EOT
-
Love/romance:
+
Kärlek/romantik:

$txt
@@ -203,7 +203,7 @@ EOT; if($txt = prepare_text($a->profile['work'])) { $o .= <<< EOT
-
Work/employment:
+
Arbete:

$txt
@@ -214,12 +214,10 @@ EOT; if($txt = prepare_text($a->profile['education'])) { $o .= <<< EOT
-
School/education:
+
Skola/utbildning:

$txt
EOT; } - - From 6f2b63378716dce986d379feb8707794e3dd87f9 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:54:48 -0700 Subject: [PATCH 46/83] Edited view/sv/profile_edit.tpl via GitHub --- view/sv/profile_edit.tpl | 76 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl index b0d4850d0d..818e0e2df1 100644 --- a/view/sv/profile_edit.tpl +++ b/view/sv/profile_edit.tpl @@ -1,11 +1,11 @@ -

Edit Profile Details

+

Ändra i profil

@@ -18,32 +18,32 @@ $default
- +
*
- +
- +
- + $gender
- +
$dob $age
@@ -53,32 +53,32 @@ $dob $age $hide_friends
- +
- +
- +
- +
- + @@ -96,20 +96,20 @@ $hide_friends
- +
- + $marital
- +
- + $sexual
@@ -117,13 +117,13 @@ $sexual
- +
- +
@@ -135,20 +135,20 @@ $sexual
- - -
(Used for searching public profiles, never shown to others)
+ + +
(Används vid profilsökning, visas inte för andra)
- +

-Tell us about yourself... +Beskriv dig själv...

@@ -160,7 +160,7 @@ Tell us about yourself...

-Hobbies/Interests +Hobbys/Intressen

@@ -172,7 +172,7 @@ Hobbies/Interests

-Contact information and Social Networks +Kontaktuppgifter och sociala nätverk

@@ -183,14 +183,14 @@ Contact information and Social Networks
- +

-Musical interests +Musik

@@ -201,7 +201,7 @@ Musical interests

-Books, literature +Böcker, litteratur

@@ -214,7 +214,7 @@ Books, literature

-Television +TV

@@ -227,7 +227,7 @@ Television

-Film/dance/culture/entertainment +Film/dans/kultur/underhållning

@@ -238,14 +238,14 @@ Film/dance/culture/entertainment
- +

-Love/romance +Kärlek/romantik

@@ -258,7 +258,7 @@ Love/romance

-Work/employment +Arbete

@@ -271,7 +271,7 @@ Work/employment

-School/education +Skola/utbildning

@@ -283,7 +283,7 @@ School/education
- +
From 143b9ef1d5c59d56f7fd9b8b101364d9bf7c3fd3 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:58:04 -0700 Subject: [PATCH 47/83] Edited view/sv/profile_entry_default.tpl via GitHub --- view/sv/profile_entry_default.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/sv/profile_entry_default.tpl b/view/sv/profile_entry_default.tpl index 87ad33e163..dff6b53f7b 100644 --- a/view/sv/profile_entry_default.tpl +++ b/view/sv/profile_entry_default.tpl @@ -1,3 +1,4 @@ +
Profilbild From 0cbe80aeeab4929848acb4ece4d5d10d78cf7be1 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:59:03 -0700 Subject: [PATCH 48/83] Edited view/sv/profile_listing_header.tpl via GitHub --- view/sv/profile_listing_header.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/sv/profile_listing_header.tpl b/view/sv/profile_listing_header.tpl index 476fc55f9b..ce81dd279a 100644 --- a/view/sv/profile_listing_header.tpl +++ b/view/sv/profile_listing_header.tpl @@ -3,6 +3,5 @@ Byt profilbild

- From 5ead1a85993a19fa2edf4e908536f6f9a84783f1 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 11:59:50 -0700 Subject: [PATCH 49/83] Edited view/sv/profile_photo.tpl via GitHub --- view/sv/profile_photo.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/sv/profile_photo.tpl b/view/sv/profile_photo.tpl index 30e51210a8..b849a270d1 100644 --- a/view/sv/profile_photo.tpl +++ b/view/sv/profile_photo.tpl @@ -1,18 +1,18 @@ -

Upload Profile Photo

+

Ladda upp profilbild

- +
- +
\ No newline at end of file From 59a7ff83317d707a9342d983cb4960121c0f17cf Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:00:49 -0700 Subject: [PATCH 50/83] Edited view/sv/profile_tabs.tpl via GitHub --- view/sv/profile_tabs.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/sv/profile_tabs.tpl b/view/sv/profile_tabs.tpl index 3048d534f1..b5d55302b0 100644 --- a/view/sv/profile_tabs.tpl +++ b/view/sv/profile_tabs.tpl @@ -4,4 +4,4 @@ Profil Foton
-
\ No newline at end of file +
From 2856664eeb44bfb2b1190965562b55740dc22113 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:01:47 -0700 Subject: [PATCH 51/83] Edited view/sv/profile-hide-friends.tpl via GitHub --- view/sv/profile-hide-friends.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/sv/profile-hide-friends.tpl b/view/sv/profile-hide-friends.tpl index 54ade00fec..367c4317f4 100644 --- a/view/sv/profile-hide-friends.tpl +++ b/view/sv/profile-hide-friends.tpl @@ -1,16 +1,16 @@

-Hide my contact/friend list from viewers of this profile? +Dölj kontaktlista/vänlista för de som ser denna profil?

- +
- +
-
+
\ No newline at end of file From 5dae05f2755e01a812166054ec0678334103a9c3 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:03:00 -0700 Subject: [PATCH 52/83] Edited view/sv/profile-in-directory.tpl via GitHub --- view/sv/profile-in-directory.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/sv/profile-in-directory.tpl b/view/sv/profile-in-directory.tpl index 98af3e59a9..982fe990ed 100644 --- a/view/sv/profile-in-directory.tpl +++ b/view/sv/profile-in-directory.tpl @@ -1,16 +1,16 @@

-Publish your default profile in site directory? +Publicera din huvudsakliga profil (default) i webbplatsens medlemskatalog?

- +
- +
-
+
\ No newline at end of file From a7601bc1a6c43221c9d01361e39da52066682c2e Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:04:06 -0700 Subject: [PATCH 53/83] Edited view/sv/profile-in-netdir.tpl via GitHub --- view/sv/profile-in-netdir.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/sv/profile-in-netdir.tpl b/view/sv/profile-in-netdir.tpl index be111aa67f..430173511c 100644 --- a/view/sv/profile-in-netdir.tpl +++ b/view/sv/profile-in-netdir.tpl @@ -1,16 +1,16 @@

-Publish your default profile in global social directory? +Publicera din huvudsakliga profil (default) i den globala medlemskatalogen?

- +
- +
-
+
\ No newline at end of file From aa0915a2adb8ade9d9e264ba94ec8f6f00b06788 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:07:38 -0700 Subject: [PATCH 54/83] Edited view/sv/pwdreset.tpl via GitHub --- view/sv/pwdreset.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/view/sv/pwdreset.tpl b/view/sv/pwdreset.tpl index dd609f0610..2c2d9e7e6e 100644 --- a/view/sv/pwdreset.tpl +++ b/view/sv/pwdreset.tpl @@ -1,16 +1,16 @@ -

Password Reset

+

Återställning av lösenord

-Your password has been reset as requested. +Ditt lösenord har återställts enligt önskemål.

-Your new password is +Ditt nya lösenord är

$newpass

-Save or copy your new password - and then click here to login. +Håll koll på det nya lösenordet och klicka sedan här för att logga in.

-Your password may be changed from the 'Settings' page after successful login. \ No newline at end of file +Lösenordet kan ändras på sidan Inställningar efter att du loggat in. \ No newline at end of file From b2089c559c2bc51b42e267ca53c2ba0a45cd1223 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:08:25 -0700 Subject: [PATCH 55/83] Edited view/sv/register_open_eml.tpl via GitHub --- view/sv/register_open_eml.tpl | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl index 8a00f21e97..0c7cb24964 100644 --- a/view/sv/register_open_eml.tpl +++ b/view/sv/register_open_eml.tpl @@ -1,21 +1,17 @@ +$username, +Tack för att du registrerat dig på $sitename. Kontot har skapats. +Här är dina inloggningsuppgifter: -Dear $username, - Thank you for registering at $sitename. Your account has been created. -The login details are as follows: +Webbplats: $siteurl +Användarnamn: $email +Lösenord: $password +Lösenordet kan ändras på sidan Inställningar efter att du loggat in. -Site Location: $siteurl -Login Name: $email -Password: $password +Ägna en liten stund åt att gå igenom alla kontoinställningar där. -You may change your password from your account "Settings" page after logging -in. +Tack, och välkommen till $sitename. -Please take a few moments to review the other account settings on that page. +Hälsningar, +$sitename admin -Thank you and welcome to $sitename. - -Sincerely, - $sitename Administrator - - From 61ba37b1ed2820c4be0254906a77f4fe99d2b59c Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:11:15 -0700 Subject: [PATCH 56/83] Edited view/sv/register_verify_eml.tpl via GitHub --- view/sv/register_verify_eml.tpl | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl index 60c38d8000..f3e4ca9ffd 100644 --- a/view/sv/register_verify_eml.tpl +++ b/view/sv/register_verify_eml.tpl @@ -1,26 +1,18 @@ -A new user registration request was received at $sitename which requires -your approval. +En registreringsförfrågan som kräver svar har mottagits +på $sitename -The login details are as follows: +Här är inloggningsuppgifterna: -Full Name: $username -Site Location: $siteurl -Login Name: $email - - -To approve this request please visit the following link: +Fullständigt namn: $username +Webbplats: $siteurl +Användarnamn: $email +Gå till denna adress om du vill godkänna: $siteurl/regmod/allow/$hash - -To deny the request and remove the account, please visit: - - +Gå till denna adress om du vill avslå förfrågan och ta bort kontot: $siteurl/regmod/deny/$hash - -Thank you. - From 8c245a5d2f4e6882211ac17561f86537a7089c73 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:12:23 -0700 Subject: [PATCH 57/83] Edited view/sv/registrations-top.tpl via GitHub --- view/sv/registrations-top.tpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/sv/registrations-top.tpl b/view/sv/registrations-top.tpl index d8faf3439e..24e13abca4 100644 --- a/view/sv/registrations-top.tpl +++ b/view/sv/registrations-top.tpl @@ -1,3 +1 @@ -

User registrations waiting for confirm

- - +

Registreringar från användare som inväntar godkännande

From 250d467f33b293ff40e8fc13b2c16a011b41a04a Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:13:15 -0700 Subject: [PATCH 58/83] Edited view/sv/registrations.tpl via GitHub --- view/sv/registrations.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/sv/registrations.tpl b/view/sv/registrations.tpl index c8646043ed..869fa1a905 100644 --- a/view/sv/registrations.tpl +++ b/view/sv/registrations.tpl @@ -1 +1 @@ -
  • $fullname ($email) : Approve - Deny
  • +
  • $fullname ($email) : Godkänn - Avslå
  • From fe7e6ad0644f7d7a3f1c3674cc69534277a46aa8 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:14:59 -0700 Subject: [PATCH 59/83] Edited view/sv/request_notify_eml.tpl via GitHub --- view/sv/request_notify_eml.tpl | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl index 9eef7a61eb..893bce17c8 100644 --- a/view/sv/request_notify_eml.tpl +++ b/view/sv/request_notify_eml.tpl @@ -1,17 +1,13 @@ +$myname, -Dear $myname, +Du har just fått en kontaktförfrågan på $sitename från '$requestor' -You have just received a connection request at $sitename +Profilen finns på $url. -from '$requestor'. - -You may visit their profile at $url. - -Please login to your site to view the complete introduction -and approve or ignore/cancel the request. +Logga in för att se hela förfrågan och godkänna eller +avslå den. $siteurl -Regards, - - $sitename administrator \ No newline at end of file +Hälsningar, +$sitename admin From b57b89516f947779f644b2de4bb455a31dbdaf45 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:17:25 -0700 Subject: [PATCH 60/83] Edited view/sv/settings.tpl via GitHub --- view/sv/settings.tpl | 60 +++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl index 97d67cbf61..9ffe14b910 100644 --- a/view/sv/settings.tpl +++ b/view/sv/settings.tpl @@ -1,6 +1,6 @@ -

    Account Settings

    +

    Kontoinställningar

    - + $nickname_block @@ -8,16 +8,16 @@ $nickname_block
    -

    Basic Settings

    +

    Grundläggande inställningar

    - +
    - +
    @@ -25,19 +25,19 @@ $nickname_block
    - + $zoneselect
    - +
    - +
    @@ -46,25 +46,25 @@ $zoneselect
    - + $theme
    - +
    -

    Security and Privacy Settings

    +

    Säkerhets- och sekretessinställningar

    - + -
    (to prevent spam abuse)
    +
    (spamskydd)
    @@ -90,53 +90,53 @@ $profile_in_net_dir
    - +
    -

    Notification Settings

    +

    Inställningar för aviseringar

    -
    Send a notification email when:
    - +
    Skicka avisering via e-post när:
    +
    - +
    - +
    - +
    - +
    - +
    -

    Password Settings

    +

    Lösenordsinställningar

    -Leave password fields blank unless changing +Lämna fältet tomt om du inte vill byta lösenord

    - +
    - +
    @@ -148,16 +148,14 @@ Leave password fields blank unless changing
    - +
    -

    Advanced Page Settings

    +

    Avancerade inställningar

    $pagetype
    - +
    - - From 42a5eb5d9ba1657cac4014aa223cde08275fd604 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:18:09 -0700 Subject: [PATCH 61/83] Edited view/sv/settings_nick_set.tpl via GitHub --- view/sv/settings_nick_set.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/sv/settings_nick_set.tpl b/view/sv/settings_nick_set.tpl index a36b3b9a20..34cb36e49b 100644 --- a/view/sv/settings_nick_set.tpl +++ b/view/sv/settings_nick_set.tpl @@ -1,7 +1,6 @@ -

    -Your profile address is '$nickname@$basepath' +Din profiladress är '$nickname@$basepath'

    $subdir From 0353b36f5d9c7f41bf006b63db5e97c173fa8ca7 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:19:04 -0700 Subject: [PATCH 62/83] Edited view/sv/settings_nick_subdir.tpl via GitHub --- view/sv/settings_nick_subdir.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/sv/settings_nick_subdir.tpl b/view/sv/settings_nick_subdir.tpl index 303c24df71..2702708ab9 100644 --- a/view/sv/settings_nick_subdir.tpl +++ b/view/sv/settings_nick_subdir.tpl @@ -1,6 +1,6 @@

    -It appears that your website is located in a subdirectory of the
    -$hostname website, so this setting may not work reliably.
    +Det verkar som att din webbsida finns i en undermapp på webbplatsen
    +$hostname, så eventuellt kommer inte denna inställning att fungera tillförlitligt.

    -

    If you have any issues, you may have better results using the profile
    address '$baseurl/profile/$nickname'. +

    Om problem uppstår är det möjligt att problemen kan lösas genom att använda
    profiladressen '$baseurl/profile/$nickname' istället.

    \ No newline at end of file From 93b1f3217034f697e25a763cd87967b95d72c13c Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:21:15 -0700 Subject: [PATCH 63/83] Edited view/sv/settings_nick_unset.tpl via GitHub --- view/sv/settings_nick_unset.tpl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/view/sv/settings_nick_unset.tpl b/view/sv/settings_nick_unset.tpl index 903768b594..5e115ff68e 100644 --- a/view/sv/settings_nick_unset.tpl +++ b/view/sv/settings_nick_unset.tpl @@ -1,14 +1,12 @@ -

    -Your profile URL is currently '$baseurl/profile/$uid'. -Setting a nickname will allow a friendly profile URL such as +Din profiladress är för närvarande'$baseurl/profile/$uid'. +Genom att ange ett smeknamn/nick kan din adress bli enklare, så här: 'nickname@$basepath'.
    -Once set, it can never be changed. The nickname must start with a letter; and only letters, numbers, dashes, and underscores are allowed. +När smeknamn/nick har angetts kan det inte ändras. Det måste inledas med en bokstav, och bara bokstäver, siffror, bindestreck och understrykningstecken får användas.

    - +
    - From eb02adb163126fabe5d3ef9f3851ca106cdd0eeb Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 12:22:25 -0700 Subject: [PATCH 64/83] Edited view/sv/wall_received_eml.tpl via GitHub --- view/sv/wall_received_eml.tpl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/view/sv/wall_received_eml.tpl b/view/sv/wall_received_eml.tpl index c296de7851..fc450a06df 100644 --- a/view/sv/wall_received_eml.tpl +++ b/view/sv/wall_received_eml.tpl @@ -1,18 +1,16 @@ +$username, -Dear $username, - - '$from' posted something to your profile wall. +'$from' har skrivit på din profilsida. ----- $body ----- -Please login at $siteurl to view or delete the item: +Logga in på $siteurl för att kolla eller ta bort: $display -Thank you, - $sitename administrator +Hälsningar, +$sitename admin - From af12c696cbcd6d38db7421aa3a1c02fbb9f90912 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Mar 2011 14:12:33 -0700 Subject: [PATCH 65/83] Edited view/sv/strings.php via GitHub --- view/sv/strings.php | 175 ++++++++++++++++++++++++++++++-------------- 1 file changed, 119 insertions(+), 56 deletions(-) diff --git a/view/sv/strings.php b/view/sv/strings.php index 3518151e18..ed65033621 100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php @@ -1,32 +1,35 @@ strings['Not Found'] = 'Hittades inte'; + +function string_plural_select($n){ + return ($n != 1); +} + +$a->strings['Not Found'] = 'Hittar inte'; $a->strings['Page not found.' ] = 'Sidan hittades inte.' ; $a->strings['Permission denied'] = 'Åtkomst nekad'; $a->strings['Permission denied.'] = 'Åtkomst nekad.'; -$a->strings['Create a New Account'] = 'Skapa nytt konto'; +$a->strings['Create a New Account'] = 'Skapa ett nytt konto'; $a->strings['Register'] = 'Registrera'; $a->strings['Nickname or Email address: '] = 'Användarnamn eller e-postadress: '; $a->strings['Password: '] = 'Lösenord: '; $a->strings['Login'] = 'Logga in'; -$a->strings['Nickname/Email/OpenID: '] = 'Användarnamn/E-post/OpenID: '; +$a->strings['Nickname/Email/OpenID: '] = 'Användarnamn/e-post/OpenID: '; $a->strings["Password \x28if not OpenID\x29: "] = "Lösenord \x28om inget OpenID\x29: "; -$a->strings['Forgot your password?'] = 'Glömt lösenordet?'; -$a->strings['Password Reset'] = 'Återställ lösenord'; +$a->strings['Forgot your password?'] = 'Har du glömt lösenordet?'; +$a->strings['Password Reset'] = 'Återställ lösenordet'; $a->strings['Logout'] = 'Logga ut'; $a->strings['prev'] = 'föreg'; $a->strings['first'] = 'första'; $a->strings['last'] = 'sista'; $a->strings['next'] = 'nästa'; -$a->strings[' likes this.'] = ' gillar detta.'; -$a->strings[' doesn\'t like this.'] = ' ogillar detta.'; -$a->strings['people'] = 'personer'; -$a->strings['like this.'] = 'gilla detta.'; -$a->strings['don\'t like this.'] = 'ogilla detta.'; +$a->strings['%s likes this.'] = '%s gillar det här.'; +$a->strings['%s doesn\'t like this.'] = '%s ogillar det här.'; +$a->strings['%2$d people like this.'] = '%2$d personer gillar det här.'; +$a->strings['%2$d people don\'t like this.'] = '%2$d personer ogillar det här.'; $a->strings['and'] = 'och'; -$a->strings[', and '] = ', och '; -$a->strings[' other people'] = ' personer till'; -$a->strings[' like this.'] = ' gillar detta.'; -$a->strings[' don\'t like this.'] = ' ogillar detta.'; +$a->strings[', and %d other people'] = ', och ytterligare %d personer'; +$a->strings['%s like this.'] = '%s gillar det här.'; +$a->strings['%s don\'t like this.'] = '%s ogillar det här.'; $a->strings['No contacts'] = 'Inga kontakter'; $a->strings['Contacts'] = 'Kontakter'; $a->strings['View Contacts'] = 'Visa kontakter'; @@ -57,6 +60,7 @@ $a->strings['September'] = 'september'; $a->strings['October'] = 'oktober'; $a->strings['November'] = 'november'; $a->strings['December'] = 'december'; +$a->strings['Birthday Reminders'] = 'Födelsedagspåminnelser'; $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]'; @@ -97,14 +101,18 @@ $a->strings['Failed to update contact record.'] = 'Failed to update contact reco $a->strings['Contact has been '] = 'Kontakten '; $a->strings['blocked'] = 'spärrad'; $a->strings['unblocked'] = 'inte längre spärrad'; -$a->strings['ignored'] = 'ignoreras'; -$a->strings['unignored'] = 'ignoreras inte längre'; +$a->strings['Contact has been blocked'] = 'Kontakten har spärrats'; +$a->strings['Contact has been unblocked'] = 'Kontakten är inte längre spärrad'; +$a->strings['Contact has been ignored'] = 'Kontakten ignoreras'; +$a->strings['Contact has been unignored'] = 'Kontakten ignoreras inte längre'; $a->strings['stopped following'] = 'följer inte längre'; $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'; $a->strings['is a fan of yours'] = 'är ett fan till dig'; $a->strings['you are a fan of'] = 'du är fan till'; +$a->strings['Privacy Unavailable'] = 'Privacy Unavailable'; +$a->strings['Private communications are not available for this contact.'] = 'Det går inte att utbyta personliga meddelanden med den här kontakten.'; $a->strings['Never'] = 'Aldrig'; $a->strings["\x28Update was successful\x29"] = "\x28Uppdateringen lyckades\x29"; $a->strings["\x28Update was not successful\x29"] = "\x28Uppdateringen lyckades inte\x29"; @@ -124,8 +132,8 @@ $a->strings['Currently blocked'] = 'Spärrad'; $a->strings['Currently ignored'] = 'Ignoreras'; $a->strings['Show Blocked Connections'] = 'Visa spärrade kontakter'; $a->strings['Hide Blocked Connections'] = 'Dölj spärrade kontakter'; -$a->strings['Finding: '] = 'Finding: '; -$a->strings['Find'] = 'Find'; +$a->strings['Finding: '] = 'Hittar: '; +$a->strings['Find'] = 'Sök'; $a->strings['Visit '] = 'Besök '; $a->strings['\'s profile'] = 's profil'; $a->strings['Edit contact'] = 'Ändra kontakt'; @@ -145,16 +153,19 @@ $a->strings['Contact record was not found for you on our site.'] = 'Contact reco $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['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["Connection accepted at %s"] = "Anslutningen accepterades %s"; +$a->strings["Connection accepted at "] = "Anslutningen accepterades "; $a->strings['Administrator'] = 'Administratör'; $a->strings['noreply'] = 'noreply'; +$a->strings["%s commented on an item at %s"] = "%s har kommenterat något %s"; $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['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['Warning: profile location has no profile photo.'] = 'Varning: I den profilen finns ingen profilbild.'; +$a->strings["Introduction complete."] = "Presentationen är klar."; $a->strings[' required parameter'] = ' obligatoriskt fält'; $a->strings[" was "] = " var "; $a->strings["s were "] = " var "; @@ -162,6 +173,7 @@ $a->strings["not found at the given location."] = "finns inte på platsen som an $a->strings["Introduction complete."] = "Presentationen klar."; $a->strings['Unrecoverable protocol error.'] = 'Irreparabelt protokollfel.'; $a->strings['Profile unavailable.'] = 'Profilen är inte tillgänglig.'; +$a->strings['%s has received too many connection requests today.'] = '%s har tagit emot för många förfrågningar idag.'; $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['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.'; @@ -175,6 +187,7 @@ $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["Introduction received at "] = "Presentationen ankom "; $a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrågan'; $a->strings['Please answer the following:'] = 'Besvara följande, tack:'; $a->strings['Does $name know you?'] = 'Känner $name dig?'; @@ -189,12 +202,19 @@ $a->strings["Public \x28insecure\x29 network"] = "Offentligt \x28osäkert\x29 n $a->strings['Your profile address:'] = 'Din profiladress:'; $a->strings['Submit Request'] = 'Skicka begäran'; $a->strings['Cancel'] = 'Avbryt'; -$a->strings['Global Directory'] = 'Global katalog'; +$a->strings["%d required parameter was not found at the given location"] = array( + 0 => "%d required parameter was not found at the given location", + 1 => "%d required parameters were not found at the given location", +); +$a->strings['Global Directory'] = 'Global medlemskatalog'; $a->strings['Item not found.'] = 'Hittades inte.'; $a->strings['Private Message'] = 'Personligt meddelande'; $a->strings["I like this \x28toggle\x29"] = "Jag gillar detta \x28toggle\x29"; $a->strings["I don't like this \x28toggle\x29"] = "Jag ogillar detta \x28toggle\x29"; +$a->strings['Share'] = 'Dela med dig'; +$a->strings['Please wait'] = 'Vänta'; $a->strings['This is you'] = 'Det här är du'; +$a->strings['Edit'] = 'Ändra'; $a->strings['Delete'] = 'Ta bort'; $a->strings['View $name\'s profile'] = 'Visa $name s profil'; $a->strings['View $owner_name\'s profile'] = 'Visa $owner_name s profil'; @@ -203,6 +223,16 @@ $a->strings['Wall-to-Wall'] = 'Logg-till-logg'; $a->strings['via Wall-To-Wall:'] = 'via Logg-till-logg:'; $a->strings['Item has been removed.'] = 'Har tagits bort.'; $a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Innehållet omfattas av licensen Creative Commons Attribution 3.0.'; +$a->strings['Item not found'] = 'Hittades inte'; +$a->strings['Edit post'] = 'Ändra inlägg'; +$a->strings['Upload photo'] = 'Ladda upp foto'; +$a->strings['Insert web link'] = 'Infoga länk'; +$a->strings['Insert YouTube video'] = 'Infoga video från YouTube'; +$a->strings['Insert Vorbis [.ogg] video'] = 'Lägg in video i format Vorbis [.ogg]'; +$a->strings['Insert Vorbis [.ogg] audio'] = 'Lägg in ljud i format Vorbis [.ogg]'; +$a->strings['Set your location'] = 'Ange plats'; +$a->strings['Clear browser location'] = 'Clear browser location'; +$a->strings['Permission settings'] = 'Inställning av rättigheter'; $a->strings['CC: email addresses'] = 'CC: e-postadresser'; $a->strings['Example: bob@example.com, mary@example.com'] = 'Exempel: adam@exempel.com, bertil@exempel.com'; $a->strings['The profile address specified does not provide adequate information.'] = 'Angiven profiladress ger inte tillräcklig information.'; @@ -216,6 +246,7 @@ $a->strings['Group name changed.'] = 'Gruppens namn har ändrats.'; $a->strings['Membership list updated.'] = 'Medlemslistan har uppdaterats.'; $a->strings['Group removed.'] = 'Gruppen har tagits bort.'; $a->strings['Unable to remove group.'] = 'Gruppen kunde inte tas bort.'; +$a->strings["Welcome to %s"] = "Välkommen till %s"; $a->strings["Welcome to "] = "Välkommen till "; $a->strings['Could not create/connect to database.'] = 'Det gick inte att skapa eller ansluta till databasen.'; $a->strings['Connected to database.'] = 'Ansluten till databasen.'; @@ -225,7 +256,7 @@ $a->strings['Please see the file "INSTALL.txt".'] = 'Se filen "INSTALL.txt".'; $a->strings['Database import failed.'] = 'Det gick inte att importera databasen.'; $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Du kanske måste importera filen "database.sql" manuellt med phpmyadmin eller mysql.'; $a->strings['Welcome to Friendika.'] = 'Välkommen till Friendika.'; -$a->strings['Submit'] = 'Skicka'; +$a->strings['Submit'] = 'Spara'; $a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.'; $a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.'; $a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; @@ -243,7 +274,8 @@ $a->strings['Please check with your site documentation or support people to see $a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'; $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'; $a->strings['Errors encountered creating database tables.'] = 'Fel vid skapandet av databastabeller.'; -$a->strings[' : '] = ' : '; +$a->strings['%s : Not a valid email address.'] = '%s : Ogiltig e-postadress.'; +$a->strings['%s : Message delivery failed.'] = '%s : Meddelandet kom inte fram.'; $a->strings['Not a valid email address.'] = 'Ogiltig e-postadress.'; $a->strings['Please join my network on '] = 'Gå med i mitt nätverk på '; $a->strings['Message delivery failed.'] = 'Meddelandet kom inte fram.'; @@ -251,46 +283,72 @@ $a->strings[' messages sent.'] = ' meddelanden har skickats.'; $a->strings['Send invitations'] = 'Send invitations'; $a->strings['Enter email addresses, one per line:'] = 'Ange e-postadresser, en per rad:'; $a->strings['Please join my social network on '] = 'Gå med i mitt sociala nätverk på '; +$a->strings['Your message:'] = 'Ditt meddelande:'; $a->strings['To accept this invitation, please visit:'] = 'Gå hit för att tacka ja till inbjudan:'; $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:'; +$a->strings["%d message sent."] = array( + 0 => "%d meddelande skickat.", + 1 => "%d meddelanden skickade.", +); $a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; -$a->strings['Empty post discarded.'] = 'Empty post discarded.'; -$a->strings[" commented on your item at "] = " commented on your item at "; -$a->strings[" posted on your profile wall at "] = " posted on your profile wall at "; -$a->strings['System error. Post not saved.'] = 'Systemfel. Inlägget sparades inte.'; -$a->strings['This message was sent to you by '] = 'Du har fått det här meddelandet av '; -$a->strings[', a member of the Friendika social network.'] = ', medlem i det sociala nätverket Friendika.'; +$a->strings['Empty post discarded.'] = 'Tomt inlägg. Inte sparat.'; +$a->strings['Wall Photos'] = 'Loggfoton'; +$a->strings["%s commented on your item at %s"] = "%s har kommenterat något %s"; +$a->strings["Administrator"] = "Administratör"; +$a->strings["%s posted on your profile wall at %s"] = "%s har gjort ett inlägg på din logg %s"; +$a->strings['System error. Post not saved.'] = 'Något gick fel. Inlägget sparades inte.'; $a->strings['You may visit them online at'] = 'Besök online på'; $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Kontakta avsändaren genom att svara på det här meddelandet om du inte vill ha sådana här meddelanden.'; -$a->strings['posted an update.'] = 'gjorde en uppdatering.'; +$a->strings['%s posted an update.'] = '%s har uppdaterat något.'; $a->strings['photo'] = 'foto'; $a->strings['status'] = 'status'; -$a->strings['likes'] = 'gillar'; -$a->strings['doesn\'t like'] = 'ogillar'; -$a->strings['\'s'] = 's'; +$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s gillar %2$s\'s %3$s'; +$a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s ogillar %2$s\'s %3$s'; $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.'; $a->strings['Visible to:'] = 'Synlig för:'; -$a->strings['Password reset requested at '] = 'Lösenordsåterställning begärd kl '; +$a->strings["Welcome back %s"] = "Välkommen tillbaka, %s"; +$a->strings['Password reset requested at '] = 'Lösenordsåterställning begärd '; $a->strings["Welcome back "] = "Välkommen tillbaka "; -$a->strings['Manage Identities and/or Pages'] = 'Ändra identitet eller sidor'; +$a->strings['Manage Identities and/or Pages'] = 'Ändra identiteter 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['No recipient selected.'] = 'Ingen mottagare har valts.'; +$a->strings['[no subject]'] = '[no subject]'; +$a->strings['Unable to locate contact information.'] = 'Det gick inte att hitta kontaktuppgifterna.'; +$a->strings['Message sent.'] = 'Meddelandet har skickats.'; +$a->strings['Message could not be sent.'] = 'Det gick inte att skicka meddelandet.'; +$a->strings['Messages'] = 'Meddelanden'; +$a->strings['Inbox'] = 'Inkorg'; +$a->strings['Outbox'] = 'Utkorg'; +$a->strings['New Message'] = 'Nytt meddelande'; +$a->strings['Message deleted.'] = 'Meddelandet togs bort.'; +$a->strings['Conversation removed.'] = 'Konversationen togs bort.'; +$a->strings['Please enter a link URL:'] = 'Ange en länk (URL):'; +$a->strings['Send Private Message'] = 'Skicka ett personligt meddelande'; +$a->strings['To:'] = 'Till:'; +$a->strings['Subject:'] = 'Ämne:'; +$a->strings['No messages.'] = 'Inga meddelanden.'; +$a->strings['Delete conversation'] = 'Ta bort konversation'; +$a->strings['Message not available.'] = 'Meddelandet är inte tillgängligt.'; +$a->strings['Delete message'] = 'Ta bort meddelande'; +$a->strings['Send Reply'] = 'Skicka svar'; $a->strings['Normal View'] = 'Normal vy'; $a->strings['New Item View'] = 'New Item View'; -$a->strings['Share'] = 'Dela'; +$a->strings['Share'] = 'Dela med dig'; $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'; -$a->strings['Permission settings'] = 'Åtkomstinställningar'; +$a->strings['Please enter a YouTube link:'] = 'Ange en YouTube-länk:'; +$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:"; +$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:"; +$a->strings['Where are you right now?'] = 'Var är du just nu?'; $a->strings['No such group'] = 'Gruppen finns inte'; $a->strings['Group is empty'] = 'Gruppen är tom'; $a->strings['Group: '] = 'Grupp: '; -$a->strings['View in context'] = 'Se i sitt sammanhang'; +$a->strings['View in context'] = 'Visa i sitt sammanhang'; $a->strings['Invalid request identifier.'] = 'Invalid request identifier.'; $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'; +$a->strings['Show Ignored Requests'] = 'Visa förfrågningar du ignorerat'; +$a->strings['Hide Ignored Requests'] = 'Dölj förfrågningar du ignorerat'; $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'; @@ -304,6 +362,7 @@ $a->strings['Approve'] = 'Godkänn'; $a->strings['No notifications.'] = 'Inga aviseringar.'; $a->strings['No registrations.'] = 'Inga registreringar.'; $a->strings['Login failed.'] = 'Inloggningen misslyckades.'; +$a->strings["Welcome back "] = "Välkommen tillbaka, "; $a->strings['Photo Albums'] = 'Fotoalbum'; $a->strings['Contact Photos'] = 'Contact Photos'; $a->strings['Contact information unavailable'] = 'Kontaktinformationen är inte tillgänglig'; @@ -324,8 +383,10 @@ $a->strings['Permissions'] = 'Åtkomst'; $a->strings['Edit Album'] = 'Redigera album'; $a->strings['View Photo'] = 'Visa foto'; $a->strings['Photo not available'] = 'Fotot är inte tillgängligt'; -$a->strings['Edit photo'] = 'Redigera foto'; +$a->strings['Edit photo'] = 'Ändra foto'; +$a->strings['<< Prev'] = '<< Föreg'; $a->strings['View Full Size'] = 'Visa fullstor'; +$a->strings['Next >>'] = 'Nästa >>'; $a->strings['Tags: '] = 'Taggar: '; $a->strings['[Remove any tag]'] = '[Remove any tag]'; $a->strings['New album name'] = 'Nytt album med namn'; @@ -362,8 +423,8 @@ $a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and mu $a->strings['Nickname is already registered. Please choose another.'] = 'Användarnamnet är upptaget. Välj ett annat.'; $a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'SERIOUS ERROR: Generation of security keys failed.'; $a->strings['An error occurred during registration. Please try again.'] = 'Något gick fel vid registreringen. Försök igen.'; -$a->strings['An error occurred creating your default profile. Please try again.'] = 'An error occurred creating your default profile. Please try again.'; -$a->strings['Registration details for '] = 'Registration details for '; +$a->strings['An error occurred creating your default profile. Please try again.'] = 'Det blev fel när din huvudsakliga profil (default) skulle skapas. Prova igen.'; +$a->strings['Registration details for '] = 'Detaljer i registreringen av '; $a->strings['Registration successful. Please check your email for further instructions.'] = 'Registrering klar. Kolla din e-post för vidare instruktioner.'; $a->strings['Failed to send email message. Here is the message that failed.'] = 'Det gick inte att skicka e-brevet. Här är meddelandet som inte kunde skickas.'; $a->strings['Your registration can not be processed.'] = 'Det går inte att behandla registreringen.'; @@ -394,7 +455,7 @@ $a->strings[' Name too short.'] = ' Namnet är för kort.'; $a->strings[' Not valid email.'] = ' Ogiltig e-postadress.'; $a->strings[' Cannot change to that email.'] = ' Ändring till den e-postadressen görs inte.'; $a->strings['Settings updated.'] = 'Inställningarna har uppdaterats.'; -$a->strings['Plugin Settings'] = 'Plugin Settings'; +$a->strings['Plugin Settings'] = 'Inställningar för insticksprogram \x28plugins\x29'; $a->strings['Account Settings'] = 'Kontoinställningar'; $a->strings['No Plugin settings configured'] = 'No Plugin settings configured'; $a->strings['OpenID: '] = 'OpenID: '; @@ -439,12 +500,13 @@ $a->strings['minutes'] = 'minuter'; $a->strings['second'] = 'sekund'; $a->strings['seconds'] = 'sekunder'; $a->strings[' ago'] = ' sedan'; +$a->strings['Cannot locate DNS info for database server \'%s\''] = 'Cannot locate DNS info for database server \'%s\''; $a->strings['Create a new group'] = 'Skapa ny grupp'; $a->strings['Everybody'] = 'Alla'; $a->strings['Birthday:'] = 'Födelsedatum:'; $a->strings['Home'] = 'Hem'; $a->strings['Apps'] = 'Apps'; -$a->strings['Directory'] = 'Katalog'; +$a->strings['Directory'] = 'Medlemskatalog'; $a->strings['Network'] = 'Nätverk'; $a->strings['Notifications'] = 'Aviseringar'; $a->strings['Manage'] = 'Hantera'; @@ -464,9 +526,9 @@ $a->strings['Hermaphrodite'] = 'Hermafrodit'; $a->strings['Neuter'] = 'Neuter'; $a->strings['Non-specific'] = 'Non-specific'; $a->strings['Other'] = 'Annat'; -$a->strings['Undecided'] = 'Undecided'; -$a->strings['Males'] = 'Males'; -$a->strings['Females'] = 'Females'; +$a->strings['Undecided'] = 'Obestämt'; +$a->strings['Males'] = 'Män'; +$a->strings['Females'] = 'Kvinnor'; $a->strings['Gay'] = 'Bög'; $a->strings['Lesbian'] = 'Lesbisk'; $a->strings['No Preference'] = 'No Preference'; @@ -477,7 +539,7 @@ $a->strings['Virgin'] = 'Oskuld'; $a->strings['Deviant'] = 'Avvikande'; $a->strings['Fetish'] = 'Fetish'; $a->strings['Oodles'] = 'Oodles'; -$a->strings['Nonsexual'] = 'Nonsexual'; +$a->strings['Nonsexual'] = 'Asexuell'; $a->strings['Single'] = 'Singel'; $a->strings['Lonely'] = 'Ensam'; $a->strings['Available'] = 'Tillgänglig'; @@ -492,15 +554,15 @@ $a->strings['Engaged'] = 'Förlovad'; $a->strings['Married'] = 'Gift'; $a->strings['Partners'] = 'I partnerskap'; $a->strings['Cohabiting'] = 'Cohabiting'; -$a->strings['Happy'] = 'Glad'; +$a->strings['Happy'] = 'Nöjd'; $a->strings['Not Looking'] = 'Letar inte'; $a->strings['Swinger'] = 'Swinger'; $a->strings['Betrayed'] = 'Bedragen'; $a->strings['Separated'] = 'Separerat'; -$a->strings['Unstable'] = 'Unstable'; +$a->strings['Unstable'] = 'Instabilt'; $a->strings['Divorced'] = 'Skiljd'; -$a->strings['Widowed'] = 'Widowed'; -$a->strings['Uncertain'] = 'Uncertain'; +$a->strings['Widowed'] = 'Änka/änkling'; +$a->strings['Uncertain'] = 'Oklart'; $a->strings['Complicated'] = 'Komplicerat'; $a->strings['Don\'t care'] = 'Bryr mig inte'; $a->strings['Ask me'] = 'Fråga mig'; @@ -509,6 +571,7 @@ $a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.'; $a->strings['Facebook Connect'] = 'Facebook Connect'; $a->strings['Install Facebook post connector'] = 'Install Facebook post connector'; $a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector'; +$a->strings['Post to Facebook by default'] = 'Lägg alltid in på Facebook'; $a->strings['Facebook'] = 'Facebook'; $a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings'; $a->strings['Post to Facebook'] = 'Lägg in på Facebook'; @@ -1121,4 +1184,4 @@ $a->strings['US/Samoa'] = 'USA/Samoa'; $a->strings['UTC'] = 'UTC'; $a->strings['W-SU'] = 'W-SU'; $a->strings['WET'] = 'WET'; -$a->strings['Zulu'] = 'Zulu'; +$a->strings['Zulu'] = 'Zulu'; \ No newline at end of file From 8f31935b7da523ba03b51459d7596fc5e6eb2854 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 22 Mar 2011 16:19:00 -0700 Subject: [PATCH 66/83] items back in personal data download, chunked this time --- boot.php | 2 +- mod/uexport.php | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 50b4fd8878..9bac155b9a 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.925' ); +define ( 'FRIENDIKA_VERSION', '2.1.926' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1044 ); diff --git a/mod/uexport.php b/mod/uexport.php index d8f9315932..fdd7fcec64 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -17,7 +17,7 @@ function uexport_init(&$a) { } $contact = array(); $r = q("SELECT * FROM `contact` WHERE `uid` = %d ", - local_user() + intval(local_user()) ); if(count($r)) { foreach($r as $rr) @@ -28,7 +28,7 @@ function uexport_init(&$a) { $profile = array(); $r = q("SELECT * FROM `profile` WHERE `uid` = %d ", - local_user() + intval(local_user()) ); if(count($r)) { foreach($r as $rr) @@ -41,6 +41,32 @@ function uexport_init(&$a) { header("Content-type: text/json"); echo str_replace('\\/','/',json_encode($output)); + $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ", + intval(local_user()) + ); + if(count($r)) + $total = $r[0]['total']; + + // chunk the output to avoid exhausting memory + + for($x = 0; $x < $total; $x += 500) { + $item = array(); + $r = q("SELECT * FROM `item` WHERE `uid` = %d LIMIT %d, %d", + intval(local_user()), + intval($x), + intval(500) + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $item[][$k] = $v; + } + + $output = array('item' => $item); + echo str_replace('\\/','/',json_encode($output)); + } + + killme(); } \ No newline at end of file From e0202d82a1e33dc2c2ed5b8fcec46440cc905d3f Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 22 Mar 2011 16:34:12 -0700 Subject: [PATCH 67/83] add fulltext index on keywords, missed some directory localisations --- boot.php | 2 +- database.sql | 4 +++- mod/directory.php | 6 +++--- update.php | 8 ++++++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index 9bac155b9a..3bec6c48f5 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); define ( 'FRIENDIKA_VERSION', '2.1.926' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); -define ( 'DB_UPDATE_VERSION', 1044 ); +define ( 'DB_UPDATE_VERSION', 1045 ); define ( 'EOL', "
    \r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 0a718c8c22..114f0d3d94 100644 --- a/database.sql +++ b/database.sql @@ -315,7 +315,9 @@ CREATE TABLE IF NOT EXISTS `profile` ( `thumb` char(255) NOT NULL, `publish` tinyint(1) NOT NULL DEFAULT '0', `net-publish` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + FULLTEXT KEY `pub_keywords` (`pub_keywords`), + FULLTEXT KEY `prv_keywords` (`prv_keywords`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/mod/directory.php b/mod/directory.php index 825e2a375f..72c30fb317 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -86,10 +86,10 @@ function directory_content(&$a) { } if(strlen($rr['dob'])) { if(($years = age($rr['dob'],$rr['timezone'],'')) != 0) - $details .= "
    Age: $years" ; + $details .= '
    ' . t('Age: ') . $years ; } if(strlen($rr['gender'])) - $details .= '
    Gender: ' . $rr['gender']; + $details .= '
    ' . t('Gender: ') . $rr['gender']; $entry = replace_macros($tpl,array( '$id' => $rr['id'], @@ -115,7 +115,7 @@ function directory_content(&$a) { } else - notice("No entries (some entries may be hidden)."); + notice( t("No entries \x28some entries may be hidden\x29.") . EOL); return $o; } \ No newline at end of file diff --git a/update.php b/update.php index 9f94cd511b..3672b2bfee 100644 --- a/update.php +++ b/update.php @@ -410,3 +410,11 @@ function update_1042() { function update_1043() { q("ALTER TABLE `user` ADD `blockwall` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocked` "); } + +function update_1044() { + q("ALTER TABLE `profile` ADD FULLTEXT ( `pub_keywords` ) "); + q("ALTER TABLE `profile` ADD FULLTEXT ( `prv_keywords` ) "); +} + + + \ No newline at end of file From 85e227151bc7d02a625ecf8f61d4567e8b455f67 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 22 Mar 2011 16:52:14 -0700 Subject: [PATCH 68/83] use correct mime type for json --- mod/uexport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/uexport.php b/mod/uexport.php index fdd7fcec64..96f062c41c 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -38,7 +38,7 @@ function uexport_init(&$a) { $output = array('user' => $user, 'contact' => $contact, 'profile' => $profile ); - header("Content-type: text/json"); + header("Content-type: application/json"); echo str_replace('\\/','/',json_encode($output)); $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ", From f0b791fe9a4a37f87811ae1a6c45b9cb6778bf3e Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 23 Mar 2011 05:30:44 -0700 Subject: [PATCH 69/83] upd8 readme --- README | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/README b/README index 36bd017923..4ec6441c7d 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ - ********* - Friendika - ********* + ************* + * Friendika * + ************* Distributed Social Network @@ -79,11 +79,6 @@ only able to see the side of you that you wish to present. If you send a private message to your aunt Mary, we will encrypt it with military grade encryption. - Other distributed social network projects talk about privacy and offering -a feature-rich social networking alternative, but all they can deliver is -vapour and vague promises. Things like "Private mail will be in the next -release". - Friendika delivers. We've got an incredibly rich social communications interface you can make use of *right now*. @@ -94,6 +89,13 @@ But we're creating something completely different. Something better. + Start with richer communications. Adorn your text, colour it. We've got a +text counter in case you're sending across to one of the primitive social +networks, but we don't think you should have to squeeze your communications +into some arbitrary limit. Free yourself from thinking how to squeeze your +message into 140 or 420 characters, or sending messages in some strange +short-hand code. Edit your text after you send it. It's OK. + A single instance of Friendika can easily support hundreds of (and up to several thousand) people using commodity hosting hardware. You could even run Friendika on an old PC in your closet or garage. Each of these people are able From 620d7bd7701160560a038c7eff0e3f481047014d Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 23 Mar 2011 05:33:41 -0700 Subject: [PATCH 70/83] upd8 readme --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 4ec6441c7d..4845503935 100644 --- a/README +++ b/README @@ -89,12 +89,12 @@ But we're creating something completely different. Something better. - Start with richer communications. Adorn your text, colour it. We've got a + Start with richer communications. Adorn your text, colour it. We've got a text counter in case you're sending across to one of the primitive social networks, but we don't think you should have to squeeze your communications into some arbitrary limit. Free yourself from thinking how to squeeze your message into 140 or 420 characters, or sending messages in some strange -short-hand code. Edit your text after you send it. It's OK. +short-hand code. Even edit your text after you send it. It's OK. A single instance of Friendika can easily support hundreds of (and up to several thousand) people using commodity hosting hardware. You could even run From 4a1426934968384d10a38f335a1c0c49b058dc2d Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 23 Mar 2011 13:58:46 +0100 Subject: [PATCH 71/83] Added plural string for contact block --- boot.php | 4 +- util/messages.po | 363 +++++++++++++++++++++++++------------------- util/strings.php | 63 +++++--- view/it/messages.po | 15 +- view/it/strings.php | 4 + 5 files changed, 264 insertions(+), 185 deletions(-) diff --git a/boot.php b/boot.php index 3636288b28..211cbb0082 100644 --- a/boot.php +++ b/boot.php @@ -2013,7 +2013,7 @@ function contact_block() { intval($shown) ); if(count($r)) { - $o .= '

    ' . $total . ' ' . t('Contacts') . '

    '; + $o .= '

    ' . sprintf(tt('%d Contact','%d Contacts', $total),$total) . '

    '; foreach($r as $rr) { $redirect_url = $a->get_baseurl() . '/redir/' . $rr['id']; if(local_user() && ($rr['uid'] == local_user()) @@ -2659,4 +2659,4 @@ function extract_item_authors($arr,$uid) { } } return array(); -}} \ No newline at end of file +}} diff --git a/util/messages.po b/util/messages.po index 44638bd9ca..e083c2a4c6 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.1.913\n" +"Project-Id-Version: 2.1.921\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-18 11:02+0100\n" +"POT-Creation-Date: 2011-03-23 13:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,32 +18,32 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../index.php:187 +#: ../../index.php:194 msgid "Not Found" msgstr "" -#: ../../index.php:188 +#: ../../index.php:195 msgid "Page not found." msgstr "" -#: ../../index.php:243 ../../mod/group.php:88 +#: ../../index.php:250 ../../mod/group.php:88 msgid "Permission denied" msgstr "" -#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 +#: ../../index.php:251 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 #: ../../mod/follow.php:8 ../../mod/profile_photo.php:19 #: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139 #: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16 -#: ../../mod/profiles.php:7 ../../mod/profiles.php:224 +#: ../../mod/profiles.php:7 ../../mod/profiles.php:227 #: ../../mod/settings.php:14 ../../mod/settings.php:19 -#: ../../mod/settings.php:206 ../../mod/photos.php:85 ../../mod/photos.php:772 -#: ../../mod/display.php:303 ../../mod/invite.php:13 ../../mod/invite.php:50 -#: ../../mod/contacts.php:101 ../../mod/register.php:25 -#: ../../mod/network.php:6 ../../mod/notifications.php:56 -#: ../../mod/item.php:57 ../../mod/item.php:616 ../../mod/message.php:8 -#: ../../mod/message.php:116 ../../mod/dfrn_confirm.php:53 -#: ../../mod/viewcontacts.php:13 ../../mod/group.php:19 -#: ../../addon/facebook/facebook.php:110 +#: ../../mod/settings.php:208 ../../mod/photos.php:85 ../../mod/photos.php:773 +#: ../../mod/display.php:308 ../../mod/editpost.php:10 ../../mod/invite.php:13 +#: ../../mod/invite.php:50 ../../mod/contacts.php:101 +#: ../../mod/register.php:25 ../../mod/network.php:6 +#: ../../mod/notifications.php:56 ../../mod/item.php:57 ../../mod/item.php:668 +#: ../../mod/message.php:8 ../../mod/message.php:116 +#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13 +#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110 msgid "Permission denied." msgstr "" @@ -51,7 +51,7 @@ msgstr "" msgid "Create a New Account" msgstr "" -#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61 +#: ../../boot.php:809 ../../mod/register.php:445 ../../include/nav.php:61 msgid "Register" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "%s doesn't like this." msgstr "" -#: ../../boot.php:1835 +#: ../../boot.php:1835 ../../test.php:8 #, php-format msgid "%2$d people like this." msgstr "" @@ -146,11 +146,12 @@ msgstr "" msgid "No contacts" msgstr "" -#: ../../boot.php:2016 ../../mod/contacts.php:303 -#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155 -#: ../../include/nav.php:111 -msgid "Contacts" -msgstr "" +#: ../../boot.php:2016 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "" +msgstr[1] "" #: ../../boot.php:2032 ../../mod/viewcontacts.php:17 msgid "View Contacts" @@ -264,19 +265,23 @@ msgstr "" msgid "December" msgstr "" -#: ../../boot.php:2413 +#: ../../boot.php:2418 +msgid "Birthday Reminders" +msgstr "" + +#: ../../boot.php:2419 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:2414 +#: ../../boot.php:2420 msgid "(Adjusted for local time)" msgstr "" -#: ../../boot.php:2423 +#: ../../boot.php:2431 msgid "[today]" msgstr "" -#: ../../boot.php:2620 +#: ../../boot.php:2628 msgid "link to source" msgstr "" @@ -299,8 +304,8 @@ msgstr "" msgid "Select an identity to manage: " msgstr "" -#: ../../mod/manage.php:106 ../../mod/photos.php:800 ../../mod/photos.php:857 -#: ../../mod/photos.php:1032 ../../mod/invite.php:64 ../../mod/install.php:109 +#: ../../mod/manage.php:106 ../../mod/photos.php:801 ../../mod/photos.php:858 +#: ../../mod/photos.php:1066 ../../mod/invite.php:64 ../../mod/install.php:109 #: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175 #: ../../addon/statusnet/statusnet.php:163 #: ../../addon/statusnet/statusnet.php:189 @@ -316,18 +321,18 @@ msgid "Image exceeds size limit of %d" msgstr "" #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118 -#: ../../mod/photos.php:570 +#: ../../mod/photos.php:571 msgid "Unable to process image." msgstr "" #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88 -#: ../../mod/wall_upload.php:95 ../../mod/item.php:184 +#: ../../mod/wall_upload.php:95 ../../mod/item.php:212 #: ../../mod/message.php:93 msgid "Wall Photos" msgstr "" #: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230 -#: ../../mod/photos.php:588 +#: ../../mod/photos.php:589 msgid "Image upload failed." msgstr "" @@ -335,8 +340,8 @@ msgstr "" #: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93 #: ../../mod/register.php:311 ../../mod/register.php:348 #: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39 -#: ../../mod/item.php:423 ../../mod/item.php:446 -#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350 +#: ../../mod/item.php:475 ../../mod/item.php:498 +#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1373 msgid "Administrator" msgstr "" @@ -353,85 +358,111 @@ msgstr "" msgid "%s commented on an item at %s" msgstr "" -#: ../../mod/profile.php:151 ../../mod/network.php:91 +#: ../../mod/profile.php:156 ../../mod/profile.php:317 +#: ../../mod/photos.php:1086 ../../mod/display.php:158 +#: ../../mod/network.php:91 ../../mod/network.php:370 msgid "Share" msgstr "" -#: ../../mod/profile.php:152 ../../mod/network.php:92 -#: ../../mod/message.php:185 ../../mod/message.php:319 +#: ../../mod/profile.php:157 ../../mod/editpost.php:63 +#: ../../mod/network.php:92 ../../mod/message.php:185 +#: ../../mod/message.php:319 msgid "Upload photo" msgstr "" -#: ../../mod/profile.php:153 ../../mod/network.php:93 -#: ../../mod/message.php:186 ../../mod/message.php:320 +#: ../../mod/profile.php:158 ../../mod/editpost.php:64 +#: ../../mod/network.php:93 ../../mod/message.php:186 +#: ../../mod/message.php:320 msgid "Insert web link" msgstr "" -#: ../../mod/profile.php:154 ../../mod/network.php:94 +#: ../../mod/profile.php:159 ../../mod/editpost.php:65 +#: ../../mod/network.php:94 msgid "Insert YouTube video" msgstr "" -#: ../../mod/profile.php:155 ../../mod/network.php:95 +#: ../../mod/profile.php:160 ../../mod/editpost.php:66 +#: ../../mod/network.php:95 +msgid "Insert Vorbis [.ogg] video" +msgstr "" + +#: ../../mod/profile.php:161 ../../mod/editpost.php:67 +#: ../../mod/network.php:96 +msgid "Insert Vorbis [.ogg] audio" +msgstr "" + +#: ../../mod/profile.php:162 ../../mod/editpost.php:68 +#: ../../mod/network.php:97 msgid "Set your location" msgstr "" -#: ../../mod/profile.php:156 ../../mod/network.php:96 +#: ../../mod/profile.php:163 ../../mod/editpost.php:69 +#: ../../mod/network.php:98 msgid "Clear browser location" msgstr "" -#: ../../mod/profile.php:157 ../../mod/profile.php:309 -#: ../../mod/photos.php:1052 ../../mod/display.php:158 -#: ../../mod/network.php:97 ../../mod/network.php:367 -#: ../../mod/message.php:187 ../../mod/message.php:321 +#: ../../mod/profile.php:164 ../../mod/profile.php:318 +#: ../../mod/photos.php:1087 ../../mod/display.php:159 +#: ../../mod/editpost.php:70 ../../mod/network.php:99 +#: ../../mod/network.php:371 ../../mod/message.php:187 +#: ../../mod/message.php:321 msgid "Please wait" msgstr "" -#: ../../mod/profile.php:158 ../../mod/network.php:98 +#: ../../mod/profile.php:165 ../../mod/editpost.php:71 +#: ../../mod/network.php:100 msgid "Permission settings" msgstr "" -#: ../../mod/profile.php:165 ../../mod/network.php:104 +#: ../../mod/profile.php:172 ../../mod/editpost.php:77 +#: ../../mod/network.php:106 msgid "CC: email addresses" msgstr "" -#: ../../mod/profile.php:167 ../../mod/network.php:106 +#: ../../mod/profile.php:174 ../../mod/editpost.php:79 +#: ../../mod/network.php:108 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/profile.php:300 ../../mod/photos.php:935 -#: ../../mod/display.php:149 ../../mod/network.php:321 +#: ../../mod/profile.php:308 ../../mod/photos.php:962 +#: ../../mod/display.php:149 ../../mod/network.php:324 msgid "Private Message" msgstr "" -#: ../../mod/profile.php:307 ../../mod/photos.php:1050 -#: ../../mod/display.php:156 ../../mod/network.php:365 +#: ../../mod/profile.php:315 ../../mod/photos.php:1084 +#: ../../mod/display.php:156 ../../mod/network.php:368 msgid "I like this (toggle)" msgstr "" -#: ../../mod/profile.php:308 ../../mod/photos.php:1051 -#: ../../mod/display.php:157 ../../mod/network.php:366 +#: ../../mod/profile.php:316 ../../mod/photos.php:1085 +#: ../../mod/display.php:157 ../../mod/network.php:369 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/profile.php:321 ../../mod/photos.php:1071 -#: ../../mod/photos.php:1111 ../../mod/photos.php:1140 -#: ../../mod/display.php:170 ../../mod/network.php:380 +#: ../../mod/profile.php:330 ../../mod/photos.php:1106 +#: ../../mod/photos.php:1146 ../../mod/photos.php:1175 +#: ../../mod/display.php:171 ../../mod/network.php:384 msgid "This is you" msgstr "" -#: ../../mod/profile.php:361 ../../mod/photos.php:1168 -#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137 +#: ../../mod/profile.php:354 ../../mod/display.php:222 +#: ../../mod/editpost.php:62 ../../mod/network.php:392 +msgid "Edit" +msgstr "" + +#: ../../mod/profile.php:376 ../../mod/photos.php:1203 +#: ../../mod/display.php:238 ../../mod/network.php:393 ../../mod/group.php:137 msgid "Delete" msgstr "" -#: ../../mod/profile.php:382 ../../mod/search.php:116 -#: ../../mod/display.php:258 ../../mod/network.php:272 -#: ../../mod/network.php:434 +#: ../../mod/profile.php:397 ../../mod/search.php:116 +#: ../../mod/display.php:262 ../../mod/network.php:275 +#: ../../mod/network.php:441 msgid "View $name's profile" msgstr "" -#: ../../mod/profile.php:414 ../../mod/display.php:312 -#: ../../mod/register.php:422 ../../mod/network.php:471 +#: ../../mod/profile.php:430 ../../mod/display.php:317 +#: ../../mod/register.php:424 ../../mod/network.php:479 msgid "" "Shared content is covered by the Creative Commons Attribution 3.0 license." @@ -462,8 +493,8 @@ msgstr "" #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 #: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155 #: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234 -#: ../../mod/photos.php:106 ../../mod/photos.php:530 ../../mod/photos.php:849 -#: ../../mod/photos.php:864 ../../mod/register.php:267 +#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850 +#: ../../mod/photos.php:865 ../../mod/register.php:267 #: ../../mod/register.php:274 ../../mod/register.php:281 msgid "Profile Photos" msgstr "" @@ -505,8 +536,8 @@ msgstr "" msgid "Account approved." msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:234 -#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:237 +#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -514,37 +545,37 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:196 +#: ../../mod/profiles.php:199 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:251 +#: ../../mod/profiles.php:254 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:267 ../../mod/profiles.php:298 +#: ../../mod/profiles.php:270 ../../mod/profiles.php:301 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:286 ../../mod/profiles.php:325 +#: ../../mod/profiles.php:289 ../../mod/profiles.php:328 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:304 +#: ../../mod/profiles.php:307 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:367 +#: ../../mod/profiles.php:370 msgid "" "This is your public profile.
    It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:377 +#: ../../mod/profiles.php:380 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:418 +#: ../../mod/profiles.php:422 msgid "Profile Image" msgstr "" @@ -564,55 +595,59 @@ msgstr "" msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:95 +#: ../../mod/settings.php:96 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:97 +#: ../../mod/settings.php:98 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:103 +#: ../../mod/settings.php:104 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:105 +#: ../../mod/settings.php:106 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:161 +#: ../../mod/settings.php:163 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:211 +#: ../../mod/settings.php:213 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:212 +#: ../../mod/settings.php:214 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:218 +#: ../../mod/settings.php:220 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:263 +#: ../../mod/settings.php:266 msgid "OpenID: " msgstr "" -#: ../../mod/settings.php:263 +#: ../../mod/settings.php:266 msgid " (Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:295 +#: ../../mod/settings.php:298 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:352 +#: ../../mod/settings.php:355 msgid "Default Post Permissions" msgstr "" -#: ../../mod/search.php:131 ../../mod/network.php:287 +#: ../../mod/search.php:54 +msgid "No results." +msgstr "" + +#: ../../mod/search.php:131 ../../mod/network.php:290 msgid "View in context" msgstr "" @@ -620,12 +655,12 @@ msgstr "" msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:780 -#: ../../mod/photos.php:849 ../../mod/photos.php:864 ../../mod/photos.php:1198 -#: ../../mod/photos.php:1209 ../../include/Photo.php:225 +#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781 +#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233 +#: ../../mod/photos.php:1244 ../../include/Photo.php:225 #: ../../include/Photo.php:232 ../../include/Photo.php:239 -#: ../../include/items.php:959 ../../include/items.php:962 -#: ../../include/items.php:965 +#: ../../include/items.php:982 ../../include/items.php:985 +#: ../../include/items.php:988 msgid "Contact Photos" msgstr "" @@ -637,134 +672,150 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:134 ../../mod/photos.php:858 +#: ../../mod/photos.php:134 ../../mod/photos.php:859 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:197 ../../mod/photos.php:1033 +#: ../../mod/photos.php:197 ../../mod/photos.php:1067 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:468 +#: ../../mod/photos.php:469 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:468 ../../mod/like.php:110 +#: ../../mod/photos.php:469 ../../mod/like.php:110 msgid "photo" msgstr "" -#: ../../mod/photos.php:468 +#: ../../mod/photos.php:469 msgid "by" msgstr "" -#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306 +#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:660 +#: ../../mod/photos.php:661 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:807 +#: ../../mod/photos.php:808 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:810 ../../mod/photos.php:853 +#: ../../mod/photos.php:811 ../../mod/photos.php:854 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:811 +#: ../../mod/photos.php:812 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:813 ../../mod/photos.php:1028 +#: ../../mod/photos.php:814 ../../mod/photos.php:1062 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:868 +#: ../../mod/photos.php:869 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:878 ../../mod/photos.php:1228 +#: ../../mod/photos.php:879 ../../mod/photos.php:1263 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:908 +#: ../../mod/photos.php:909 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:929 +#: ../../mod/photos.php:956 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:931 +#: ../../mod/photos.php:958 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:944 +#: ../../mod/photos.php:969 +msgid "<< Prev" +msgstr "" + +#: ../../mod/photos.php:973 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1002 +#: ../../mod/photos.php:977 +msgid "Next >>" +msgstr "" + +#: ../../mod/photos.php:1036 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1012 +#: ../../mod/photos.php:1046 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1055 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1058 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1026 +#: ../../mod/photos.php:1060 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1030 +#: ../../mod/photos.php:1064 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1214 +#: ../../mod/photos.php:1249 msgid "Recent Photos" msgstr "" -#: ../../mod/photos.php:1218 +#: ../../mod/photos.php:1253 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:1234 +#: ../../mod/photos.php:1269 msgid "View Album" msgstr "" -#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546 +#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598 msgid "Item not found." msgstr "" -#: ../../mod/display.php:259 ../../mod/network.php:435 +#: ../../mod/display.php:263 ../../mod/network.php:442 msgid "View $owner_name's profile" msgstr "" -#: ../../mod/display.php:260 ../../mod/network.php:436 +#: ../../mod/display.php:264 ../../mod/network.php:443 msgid "to" msgstr "" -#: ../../mod/display.php:261 ../../mod/network.php:437 +#: ../../mod/display.php:265 ../../mod/network.php:444 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/display.php:262 ../../mod/network.php:438 +#: ../../mod/display.php:266 ../../mod/network.php:445 msgid "via Wall-To-Wall:" msgstr "" -#: ../../mod/display.php:300 +#: ../../mod/display.php:305 msgid "Item has been removed." msgstr "" +#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 +msgid "Item not found" +msgstr "" + +#: ../../mod/editpost.php:32 +msgid "Edit post" +msgstr "" + #: ../../mod/invite.php:28 #, php-format msgid "%s : Not a valid email address." @@ -953,6 +1004,11 @@ msgstr "" msgid "Currently ignored" msgstr "" +#: ../../mod/contacts.php:303 ../../include/acl_selectors.php:140 +#: ../../include/acl_selectors.php:155 ../../include/nav.php:111 +msgid "Contacts" +msgstr "" + #: ../../mod/contacts.php:305 msgid "Show Blocked Connections" msgstr "" @@ -1077,44 +1133,38 @@ msgstr "" msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:404 -msgid "" -"Members of this network prefer to communicate with real people who use their " -"real names." -msgstr "" - -#: ../../mod/register.php:413 +#: ../../mod/register.php:415 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618 +#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618 msgid "Yes" msgstr "" -#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619 +#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619 msgid "No" msgstr "" -#: ../../mod/register.php:429 +#: ../../mod/register.php:431 msgid "Registration" msgstr "" -#: ../../mod/register.php:437 +#: ../../mod/register.php:439 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:438 +#: ../../mod/register.php:440 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:439 +#: ../../mod/register.php:441 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/register.php:440 +#: ../../mod/register.php:442 msgid "Choose a nickname: " msgstr "" @@ -1250,15 +1300,15 @@ msgstr "" msgid "New Item View" msgstr "" -#: ../../mod/network.php:149 +#: ../../mod/network.php:151 msgid "No such group" msgstr "" -#: ../../mod/network.php:160 +#: ../../mod/network.php:162 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:164 +#: ../../mod/network.php:166 msgid "Group: " msgstr "" @@ -1417,7 +1467,7 @@ msgid "" "strong> profile." msgstr "" -#: ../../mod/dfrn_request.php:536 ../../include/items.php:1341 +#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364 msgid "[Name Withheld]" msgstr "" @@ -1521,41 +1571,41 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:98 +#: ../../mod/item.php:126 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:422 +#: ../../mod/item.php:474 #, php-format msgid "%s commented on your item at %s" msgstr "" -#: ../../mod/item.php:445 +#: ../../mod/item.php:497 #, php-format msgid "%s posted on your profile wall at %s" msgstr "" -#: ../../mod/item.php:471 +#: ../../mod/item.php:523 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:489 +#: ../../mod/item.php:541 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendika social network." msgstr "" -#: ../../mod/item.php:491 +#: ../../mod/item.php:543 msgid "You may visit them online at" msgstr "" -#: ../../mod/item.php:493 +#: ../../mod/item.php:545 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:495 +#: ../../mod/item.php:547 #, php-format msgid "%s posted an update." msgstr "" @@ -2390,11 +2440,16 @@ msgstr "" msgid "Profiles" msgstr "" -#: ../../include/items.php:1004 +#: ../../include/dba.php:31 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "" + +#: ../../include/items.php:1027 msgid "Birthday:" msgstr "" -#: ../../include/items.php:1348 +#: ../../include/items.php:1371 msgid "You have a new follower at " msgstr "" diff --git a/util/strings.php b/util/strings.php index 395901b061..903e61e9e1 100644 --- a/util/strings.php +++ b/util/strings.php @@ -22,18 +22,15 @@ $a->strings['prev'] = 'prev'; $a->strings['first'] = 'first'; $a->strings['last'] = 'last'; $a->strings['next'] = 'next'; -$a->strings[' likes this.'] = ' likes this.'; -$a->strings[' doesn\'t like this.'] = ' doesn\'t like this.'; -$a->strings['people'] = 'people'; -$a->strings['like this.'] = 'like this.'; -$a->strings['don\'t like this.'] = 'don\'t like this.'; +$a->strings['%s likes this.'] = '%s likes this.'; +$a->strings['%s doesn\'t like this.'] = '%s doesn\'t like this.'; +$a->strings['%2$d people like this.'] = '%2$d people like this.'; +$a->strings['%2$d people don\'t like this.'] = '%2$d people don\'t like this.'; $a->strings['and'] = 'and'; -$a->strings[', and '] = ', and '; -$a->strings[' other people'] = ' other people'; -$a->strings[' like this.'] = ' like this.'; -$a->strings[' don\'t like this.'] = ' don\'t like this.'; +$a->strings[', and %d other people'] = ', and %d other people'; +$a->strings['%s like this.'] = '%s like this.'; +$a->strings['%s don\'t like this.'] = '%s don\'t like this.'; $a->strings['No contacts'] = 'No contacts'; -$a->strings['Contacts'] = 'Contacts'; $a->strings['View Contacts'] = 'View Contacts'; $a->strings['Search'] = 'Search'; $a->strings['No profile'] = 'No profile'; @@ -62,6 +59,7 @@ $a->strings['September'] = 'September'; $a->strings['October'] = 'October'; $a->strings['November'] = 'November'; $a->strings['December'] = 'December'; +$a->strings['Birthday Reminders'] = 'Birthday Reminders'; $a->strings['Birthdays this week:'] = 'Birthdays this week:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29"; $a->strings['[today]'] = '[today]'; @@ -105,6 +103,7 @@ $a->strings['Unignore this contact'] = 'Unignore this contact'; $a->strings['Ignore this contact'] = 'Ignore this contact'; $a->strings['Currently blocked'] = 'Currently blocked'; $a->strings['Currently ignored'] = 'Currently ignored'; +$a->strings['Contacts'] = 'Contacts'; $a->strings['Show Blocked Connections'] = 'Show Blocked Connections'; $a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections'; $a->strings['Finding: '] = 'Finding: '; @@ -126,11 +125,10 @@ $a->strings['Contact record was not found for you on our site.'] = 'Contact reco $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.'; $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 %s"] = "Connection accepted at %s"; $a->strings['Administrator'] = 'Administrator'; $a->strings['noreply'] = 'noreply'; $a->strings["%s commented on an item at %s"] = "%s commented on an item at %s"; -$a->strings["From: Administrator@"] = "From: Administrator@"; -$a->strings['%s welcomes %s'] = '%s welcomes %s'; $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted."; $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.'; $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.'; @@ -175,8 +173,10 @@ $a->strings['Item not found.'] = 'Item not found.'; $a->strings['Private Message'] = 'Private Message'; $a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29"; $a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29"; +$a->strings['Share'] = 'Share'; $a->strings['Please wait'] = 'Please wait'; $a->strings['This is you'] = 'This is you'; +$a->strings['Edit'] = 'Edit'; $a->strings['Delete'] = 'Delete'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; $a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile'; @@ -185,6 +185,18 @@ $a->strings['Wall-to-Wall'] = 'Wall-to-Wall'; $a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:'; $a->strings['Item has been removed.'] = 'Item has been removed.'; $a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; +$a->strings['Item not found'] = 'Item not found'; +$a->strings['Edit post'] = 'Edit post'; +$a->strings['Upload photo'] = 'Upload photo'; +$a->strings['Insert web link'] = 'Insert web link'; +$a->strings['Insert YouTube video'] = 'Insert YouTube video'; +$a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video'; +$a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio'; +$a->strings['Set your location'] = 'Set your location'; +$a->strings['Clear browser location'] = 'Clear browser location'; +$a->strings['Permission settings'] = 'Permission settings'; +$a->strings['CC: email addresses'] = 'CC: email addresses'; +$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com'; $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.'; $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.'; $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.'; @@ -240,16 +252,14 @@ $a->strings['Wall Photos'] = 'Wall Photos'; $a->strings["%s commented on your item at %s"] = "%s commented on your item at %s"; $a->strings["Administrator"] = "Administrator"; $a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s"; -$a->strings["Administrator@"] = "Administrator@"; $a->strings['System error. Post not saved.'] = 'System error. Post not saved.'; $a->strings['You may visit them online at'] = 'You may visit them online at'; $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.'; $a->strings['%s posted an update.'] = '%s posted an update.'; $a->strings['photo'] = 'photo'; $a->strings['status'] = 'status'; -$a->strings['likes'] = 'likes'; -$a->strings['doesn\'t like'] = 'doesn\'t like'; -$a->strings["%s's"] = "%s's"; +$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s likes %2$s\'s %3$s'; +$a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s doesn\'t like %2$s\'s %3$s'; $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.'; $a->strings['Visible to:'] = 'Visible to:'; $a->strings["Welcome back %s"] = "Welcome back %s"; @@ -270,8 +280,6 @@ $a->strings['Conversation removed.'] = 'Conversation removed.'; $a->strings['Send Private Message'] = 'Send Private Message'; $a->strings['To:'] = 'To:'; $a->strings['Subject:'] = 'Subject:'; -$a->strings['Upload photo'] = 'Upload photo'; -$a->strings['Insert web link'] = 'Insert web link'; $a->strings['No messages.'] = 'No messages.'; $a->strings['Delete conversation'] = 'Delete conversation'; $a->strings['Message not available.'] = 'Message not available.'; @@ -279,13 +287,6 @@ $a->strings['Delete message'] = 'Delete message'; $a->strings['Send Reply'] = 'Send Reply'; $a->strings['Normal View'] = 'Normal View'; $a->strings['New Item View'] = 'New Item View'; -$a->strings['Share'] = 'Share'; -$a->strings['Insert YouTube video'] = 'Insert YouTube video'; -$a->strings['Set your location'] = 'Set your location'; -$a->strings['Clear browser location'] = 'Clear browser location'; -$a->strings['Permission settings'] = 'Permission settings'; -$a->strings['CC: email addresses'] = 'CC: email addresses'; -$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com'; $a->strings['No such group'] = 'No such group'; $a->strings['Group is empty'] = 'Group is empty'; $a->strings['Group: '] = 'Group: '; @@ -330,7 +331,9 @@ $a->strings['Edit Album'] = 'Edit Album'; $a->strings['View Photo'] = 'View Photo'; $a->strings['Photo not available'] = 'Photo not available'; $a->strings['Edit photo'] = 'Edit photo'; +$a->strings['<< Prev'] = '<< Prev'; $a->strings['View Full Size'] = 'View Full Size'; +$a->strings['Next >>'] = 'Next >>'; $a->strings['Tags: '] = 'Tags: '; $a->strings['[Remove any tag]'] = '[Remove any tag]'; $a->strings['New album name'] = 'New album name'; @@ -384,6 +387,7 @@ $a->strings['Account approved.'] = 'Account approved.'; $a->strings['Remove My Account'] = 'Remove My Account'; $a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.'; $a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:'; +$a->strings['No results.'] = 'No results.'; $a->strings['Passwords do not match. Password unchanged.'] = 'Passwords do not match. Password unchanged.'; $a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Empty passwords are not allowed. Password unchanged.'; $a->strings['Password changed.'] = 'Password changed.'; @@ -438,6 +442,7 @@ $a->strings['minutes'] = 'minutes'; $a->strings['second'] = 'second'; $a->strings['seconds'] = 'seconds'; $a->strings[' ago'] = ' ago'; +$a->strings['Cannot locate DNS info for database server \'%s\'',$server] = 'Cannot locate DNS info for database server \'%s\'',$server; $a->strings['Create a new group'] = 'Create a new group'; $a->strings['Everybody'] = 'Everybody'; $a->strings['Birthday:'] = 'Birthday:'; @@ -623,7 +628,9 @@ $a->strings['America/Argentina/Jujuy'] = 'America/Argentina/Jujuy'; $a->strings['America/Argentina/La_Rioja'] = 'America/Argentina/La_Rioja'; $a->strings['America/Argentina/Mendoza'] = 'America/Argentina/Mendoza'; $a->strings['America/Argentina/Rio_Gallegos'] = 'America/Argentina/Rio_Gallegos'; +$a->strings['America/Argentina/Salta'] = 'America/Argentina/Salta'; $a->strings['America/Argentina/San_Juan'] = 'America/Argentina/San_Juan'; +$a->strings['America/Argentina/San_Luis'] = 'America/Argentina/San_Luis'; $a->strings['America/Argentina/Tucuman'] = 'America/Argentina/Tucuman'; $a->strings['America/Argentina/Ushuaia'] = 'America/Argentina/Ushuaia'; $a->strings['America/Aruba'] = 'America/Aruba'; @@ -701,6 +708,7 @@ $a->strings['America/Louisville'] = 'America/Louisville'; $a->strings['America/Maceio'] = 'America/Maceio'; $a->strings['America/Managua'] = 'America/Managua'; $a->strings['America/Manaus'] = 'America/Manaus'; +$a->strings['America/Marigot'] = 'America/Marigot'; $a->strings['America/Martinique'] = 'America/Martinique'; $a->strings['America/Mazatlan'] = 'America/Mazatlan'; $a->strings['America/Mendoza'] = 'America/Mendoza'; @@ -736,11 +744,13 @@ $a->strings['America/Regina'] = 'America/Regina'; $a->strings['America/Resolute'] = 'America/Resolute'; $a->strings['America/Rio_Branco'] = 'America/Rio_Branco'; $a->strings['America/Rosario'] = 'America/Rosario'; +$a->strings['America/Santarem'] = 'America/Santarem'; $a->strings['America/Santiago'] = 'America/Santiago'; $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo'; $a->strings['America/Sao_Paulo'] = 'America/Sao_Paulo'; $a->strings['America/Scoresbysund'] = 'America/Scoresbysund'; $a->strings['America/Shiprock'] = 'America/Shiprock'; +$a->strings['America/St_Barthelemy'] = 'America/St_Barthelemy'; $a->strings['America/St_Johns'] = 'America/St_Johns'; $a->strings['America/St_Kitts'] = 'America/St_Kitts'; $a->strings['America/St_Lucia'] = 'America/St_Lucia'; @@ -798,6 +808,7 @@ $a->strings['Asia/Dubai'] = 'Asia/Dubai'; $a->strings['Asia/Dushanbe'] = 'Asia/Dushanbe'; $a->strings['Asia/Gaza'] = 'Asia/Gaza'; $a->strings['Asia/Harbin'] = 'Asia/Harbin'; +$a->strings['Asia/Ho_Chi_Minh'] = 'Asia/Ho_Chi_Minh'; $a->strings['Asia/Hong_Kong'] = 'Asia/Hong_Kong'; $a->strings['Asia/Hovd'] = 'Asia/Hovd'; $a->strings['Asia/Irkutsk'] = 'Asia/Irkutsk'; @@ -809,7 +820,9 @@ $a->strings['Asia/Kabul'] = 'Asia/Kabul'; $a->strings['Asia/Kamchatka'] = 'Asia/Kamchatka'; $a->strings['Asia/Karachi'] = 'Asia/Karachi'; $a->strings['Asia/Kashgar'] = 'Asia/Kashgar'; +$a->strings['Asia/Kathmandu'] = 'Asia/Kathmandu'; $a->strings['Asia/Katmandu'] = 'Asia/Katmandu'; +$a->strings['Asia/Kolkata'] = 'Asia/Kolkata'; $a->strings['Asia/Krasnoyarsk'] = 'Asia/Krasnoyarsk'; $a->strings['Asia/Kuala_Lumpur'] = 'Asia/Kuala_Lumpur'; $a->strings['Asia/Kuching'] = 'Asia/Kuching'; diff --git a/view/it/messages.po b/view/it/messages.po index 73ee9e3ad1..11813a3d83 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -6,13 +6,13 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.1.913\n" +"Project-Id-Version: 2.1.921\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-18 10:32+0100\n" +"POT-Creation-Date: 2011-03-23 13:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Fabio Comuni \n" "Language-Team: Italian \n" -"Language: it-IT\n" +"Language: It\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -118,7 +118,7 @@ msgstr "Piace a %s." msgid "%s doesn't like this." msgstr "Non piace a %s." -#: ../../boot.php:1835 +#: ../../boot.php:1835 ../../test.php:8 #, php-format msgid "%2$d people like this." msgstr "Piace a %2$d persone." @@ -2598,3 +2598,10 @@ msgstr "Modifica messaggio" #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Non trovo le informazioni DNS per il database server '%s'" + +#: ../../boot.php:2016 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "%d Contatto" +msgstr[1] "%d Contatti" diff --git a/view/it/strings.php b/view/it/strings.php index 68cf11793a..1312f00135 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -573,3 +573,7 @@ $a->strings["Next >>"] = "Succ >>"; $a->strings["Item not found"] = "Elemento non trovato"; $a->strings["Edit post"] = "Modifica messaggio"; $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'"; +$a->strings["%d Contact"] = array( + 0 => "%d Contatto", + 1 => "%d Contatti", +); From de8d9ab66d4a96bcb629577e22c4b2343040dd8c Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 23 Mar 2011 14:31:02 -0700 Subject: [PATCH 72/83] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 3bec6c48f5..657cc46913 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.926' ); +define ( 'FRIENDIKA_VERSION', '2.1.927' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1045 ); From 51447932f707e1d0177ee4700266285ed80be2f6 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 24 Mar 2011 01:16:14 -0700 Subject: [PATCH 73/83] link same as visited --- mod/profile.php | 1 - view/theme/duepuntozero/style.css | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mod/profile.php b/mod/profile.php index 4b5f92a1fc..d33c9aeb24 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -437,6 +437,5 @@ function profile_content(&$a, $update = 0) { $o .= paginate($a); $o .= '
    ' . t('Shared content is covered by the Creative Commons Attribution 3.0 license.') . '
    '; - return $o; } diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 758ab9699d..7ab85344d5 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -16,7 +16,7 @@ body { } -a, a:visited { color: #3465a4; text-decoration: none; } +a, a:visited, a:link { color: #3465a4; text-decoration: none; } a:hover {text-decoration: underline; } input { @@ -218,7 +218,7 @@ div.wall-item-content-wrapper.shiny { cursor: pointer; } -.fakelink, .fakelink:visited { +.fakelink, .fakelink:visited, .fakelink:link { color: #3465a4; text-decoration: none; cursor: pointer; @@ -1844,7 +1844,7 @@ a.mail-list-link { margin-bottom: 15px; } -#photos-upload-perms-menu, #photos-upload-perms-menu:visited { +#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { color: #8888FF; text-decoration: none; cursor: pointer; From 6bc5d6f17b9d86d909cf43cde0a399b17c46bbf5 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 24 Mar 2011 15:45:27 -0700 Subject: [PATCH 74/83] repair duplicate nickname accounts caused by race condition --- boot.php | 2 +- mod/register.php | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 72ec81c111..e051666095 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.927' ); +define ( 'FRIENDIKA_VERSION', '2.1.928' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1045 ); diff --git a/mod/register.php b/mod/register.php index 95e9d581f1..06ed1e0f18 100644 --- a/mod/register.php +++ b/mod/register.php @@ -199,6 +199,24 @@ function register_post(&$a) { return; } + /** + * if somebody clicked submit twice very quickly, they could end up with two accounts + * due to race condition. Remove this one. + */ + + $r = q("SELECT `uid` FROM `user` + WHERE `nickname` = '%s' ", + dbesc($nickname) + ); + if((count($r) > 1) && $newuid) { + $err .= t('Nickname is already registered. Please choose another.') . EOL; + q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1", + intval($newuid) + ); + notice ($err); + return; + } + if(x($newuid) !== false) { $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` ) VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ", From ca113bfaa05fdf90a904c3a286a4e69b3a2d2082 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 24 Mar 2011 21:10:51 -0700 Subject: [PATCH 75/83] change link to project website --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nav.php b/include/nav.php index 4104cf3cf3..db3b909af1 100644 --- a/include/nav.php +++ b/include/nav.php @@ -124,7 +124,7 @@ function nav(&$a) { $banner = get_config('system','banner'); if($banner === false) - $banner .= 'logoFriendika'; + $banner .= 'logoFriendika'; $a->page['nav'] .= ''; From 9808b0378dbc03d78120bab275b3100eb5f85ccf Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 25 Mar 2011 13:03:30 +0100 Subject: [PATCH 76/83] fixed wrong colors for links --- view/theme/greenzero/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css index 5a84011601..ec15b736e8 100644 --- a/view/theme/greenzero/style.css +++ b/view/theme/greenzero/style.css @@ -2,7 +2,7 @@ /* green variation by Tobias Diekershoff */ -a, a:visited { color: #549f4f; text-decoration: none; } +a:link, a:visited { color: #549f4f; text-decoration: none; } a:hover {text-decoration: underline; } From f7928f15a8b3807f7571a8da78ed43cec34105d3 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 25 Mar 2011 15:08:40 -0700 Subject: [PATCH 77/83] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index e051666095..f1e0290110 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.928' ); +define ( 'FRIENDIKA_VERSION', '2.1.929' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1045 ); From 76918ed5a59ac52486531f8bf4efec1180fc9d59 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 27 Mar 2011 16:35:56 -0700 Subject: [PATCH 78/83] info page --- boot.php | 2 +- mod/friendika.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 mod/friendika.php diff --git a/boot.php b/boot.php index f1e0290110..54b34416f6 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.929' ); +define ( 'FRIENDIKA_VERSION', '2.1.931' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1045 ); diff --git a/mod/friendika.php b/mod/friendika.php new file mode 100644 index 0000000000..4a8240a11b --- /dev/null +++ b/mod/friendika.php @@ -0,0 +1,47 @@ +Friendika'; + + + $o .= '

    '; + + $o .= 'View License' . '

    '; + $o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' '; + $o .= t('running at web location') . ' ' . $a->get_baseurl() . '

    '; + + $o .= t('Shared content within the Friendika network is provided under the Creative Commons Attribution 3.0 license') . '

    '; + + $o .= t('Please visit Project.Friendika.com to learn more about the Friendika project.') . '

    '; + + $o .= t('Bug reports and issues: please visit') . ' ' . 'Bugs.Friendika.com

    '; + $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com') . '

    '; + + $o .= '

    '; + + if(count($a->plugins)) { + $o .= '

    ' . t('Installed plugins/addons/apps') . '

    '; + $o .= '
      '; + foreach($a->plugins as $p) + if(strlen($p)) + $o .= '
    • ' . $p . '
    • '; + $o .= '
    '; + } + else + $o .= '

    ' . t('No installed plugins/addons/apps'); + + return $o; + + + + + + + + + + + +} \ No newline at end of file From c962f5c4bcc26fa7bad98a714cdb5e92b6acb57c Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 27 Mar 2011 19:53:36 -0700 Subject: [PATCH 79/83] comment collapsing, pagination wasn't advancing past 16 --- boot.php | 3 +- mod/network.php | 74 +++++++++++++++++++++++++++++++++++++++++-------- mod/profile.php | 66 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 122 insertions(+), 21 deletions(-) diff --git a/boot.php b/boot.php index 54b34416f6..ba9e2b6e44 100644 --- a/boot.php +++ b/boot.php @@ -1068,6 +1068,7 @@ function paginate(&$a) { $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); $stripped = str_replace('q=','',$stripped); $stripped = trim($stripped,'/'); + $pagenum = $a->pager['page']; $url = $a->get_baseurl() . '/' . $stripped; @@ -1080,7 +1081,7 @@ function paginate(&$a) { $numpages = $a->pager['total'] / $a->pager['itemspage']; - $numstart = 1; + $numstart = 1; $numstop = $numpages; if($numpages > 14) { diff --git a/mod/network.php b/mod/network.php index 97bc0713d1..08bc5af4c8 100644 --- a/mod/network.php +++ b/mod/network.php @@ -183,8 +183,11 @@ function network_content(&$a, $update = 0) { intval($_SESSION['uid']) ); - if(count($r)) + if(count($r)) { $a->set_pager_total($r[0]['total']); + $a->set_pager_itemspage(40); + } + if($nouveau) { $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, @@ -203,21 +206,41 @@ function network_content(&$a, $update = 0) { ); } else { - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, - `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` + $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` + FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = `parentitem`.`id` + AND `item`.`parent` = `item`.`id` $sql_extra - ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC LIMIT %d ,%d ", + ORDER BY `item`.`created` DESC LIMIT %d ,%d ", intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage']) ); + + $parents_arr = array(); + $parents_str = ''; + + if(count($r)) { + foreach($r as $rr) + $parents_arr[] = $rr['item_id']; + $parents_str = implode(', ', $parents_arr); + + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, + `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), + dbesc($parents_str) + ); + } } $author_contacts = extract_item_authors($r,local_user()); @@ -302,15 +325,25 @@ function network_content(&$a, $update = 0) { } - + $comments = array(); + foreach($r as $rr) { + if(intval($rr['gravity']) == 6) { + if(! x($comments,$rr['parent'])) + $comments[$rr['parent']] = 1; + else + $comments[$rr['parent']] += 1; + } + } foreach($r as $item) { like_puller($a,$item,$alike,'like'); like_puller($a,$item,$dlike,'dislike'); } + $comments_collapsed = false; foreach($r as $item) { + $comment = ''; $template = $tpl; $commentww = ''; @@ -320,10 +353,27 @@ function network_content(&$a, $update = 0) { if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; + if($item['id'] == $item['parent']) { + $comments_seen = 0; + $comments_collapsed = false; + } + else + $comments_seen ++; + + + if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) { + if(! $comments_collapsed) { + $o .= '

    '; + $o .= '
    '; + } + $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; - - $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? '
    ' . t('Private Message') . '
    ' diff --git a/mod/profile.php b/mod/profile.php index d33c9aeb24..9544512bab 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -243,31 +243,52 @@ function profile_content(&$a, $update = 0) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 ) + AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1 $sql_extra ", intval($a->profile['profile_uid']) ); - if(count($r)) + if(count($r)) { $a->set_pager_total($r[0]['total']); + $a->set_pager_itemspage(40); + } - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, - `contact`.`thumb`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 ) + AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1 $sql_extra - ORDER BY `parent` DESC, `gravity` ASC, `id` ASC LIMIT %d ,%d ", + LIMIT %d ,%d ", intval($a->profile['profile_uid']), intval($a->pager['start']), intval($a->pager['itemspage']) ); + $parents_arr = array(); + $parents_str = ''; + + if(count($r)) { + foreach($r as $rr) + $parents_arr[] = $rr['item_id']; + $parents_str = implode(', ', $parents_arr); + + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, + `contact`.`thumb`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ", + intval($a->profile['profile_uid']), + dbesc($parents_str) + ); + } if($is_owner && ! $update) $o .= get_birthdays(); @@ -292,6 +313,16 @@ function profile_content(&$a, $update = 0) { if($r !== false && count($r)) { + $comments = array(); + foreach($r as $rr) { + if(intval($rr['gravity']) == 6) { + if(! x($comments,$rr['parent'])) + $comments[$rr['parent']] = 1; + else + $comments[$rr['parent']] += 1; + } + } + foreach($r as $item) { like_puller($a,$item,$alike,'like'); like_puller($a,$item,$dlike,'dislike'); @@ -311,6 +342,25 @@ function profile_content(&$a, $update = 0) { && ($item['id'] != $item['parent'])) continue; + if($item['id'] == $item['parent']) { + $comments_seen = 0; + $comments_collapsed = false; + } + else + $comments_seen ++; + + + if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) { + if(! $comments_collapsed) { + $o .= ''; + $o .= '
    '; + } + $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? '
    ' . t('Private Message') . '
    ' From b57214cb783ca2f741760a2ccfbd01babfbd165b Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 27 Mar 2011 19:59:27 -0700 Subject: [PATCH 80/83] wrong date order profile page --- mod/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/profile.php b/mod/profile.php index 9544512bab..8fb483007f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -260,7 +260,7 @@ function profile_content(&$a, $update = 0) { AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1 $sql_extra - LIMIT %d ,%d ", + ORDER BY `item`.`created` DESC LIMIT %d ,%d ", intval($a->profile['profile_uid']), intval($a->pager['start']), intval($a->pager['itemspage']) From 7defb1768bff1c3da7ea63957cf8c7c928d379ab Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 27 Mar 2011 20:37:44 -0700 Subject: [PATCH 81/83] collapse posts by same author (but not you). --- mod/network.php | 21 +++++++++++++++++++-- mod/profile.php | 2 ++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mod/network.php b/mod/network.php index 08bc5af4c8..21b818f9c9 100644 --- a/mod/network.php +++ b/mod/network.php @@ -325,6 +325,7 @@ function network_content(&$a, $update = 0) { } + $comments = array(); foreach($r as $rr) { if(intval($rr['gravity']) == 6) { @@ -341,9 +342,11 @@ function network_content(&$a, $update = 0) { } $comments_collapsed = false; + $blowhard = 0; + $blowhard_count = 0; + foreach($r as $item) { - $comment = ''; $template = $tpl; $commentww = ''; @@ -354,6 +357,20 @@ function network_content(&$a, $update = 0) { continue; if($item['id'] == $item['parent']) { + if($blowhard == $item['cid'] && (! $item['self'])) { + $blowhard_count ++; + if($blowhard_count == 3) { + $o .= '' . ''; + } + } + $comments_seen = 0; $comments_collapsed = false; } @@ -369,7 +386,7 @@ function network_content(&$a, $update = 0) { } } if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) { - $o .= '
    '; + $o .= '
    '; } $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; diff --git a/mod/profile.php b/mod/profile.php index 8fb483007f..1101c69981 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -328,6 +328,8 @@ function profile_content(&$a, $update = 0) { like_puller($a,$item,$dlike,'dislike'); } + $comments_collapsed = false; + foreach($r as $item) { $sparkle = ''; From 77fbd2f78c6a24201a26d5c4ec60ad5fb42c48dd Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 27 Mar 2011 20:43:45 -0700 Subject: [PATCH 82/83] tweaks to author collapsing --- mod/network.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/network.php b/mod/network.php index 21b818f9c9..f68b399f8b 100644 --- a/mod/network.php +++ b/mod/network.php @@ -365,10 +365,9 @@ function network_content(&$a, $update = 0) { } else { $blowhard = $item['cid']; - if($blowhard_count > 3) { - $blowhard_count = 0; + if($blowhard_count > 3) $o .= '
    '; - } + $blowhard_count = 0; } $comments_seen = 0; From 1f6c6c466a449ba422c4e67744577f6c35b3ce0b Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 28 Mar 2011 00:49:20 -0700 Subject: [PATCH 83/83] author collapse: close off before pagination --- mod/network.php | 4 ++++ view/theme/duepuntozero/style.css | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/mod/network.php b/mod/network.php index f68b399f8b..17d36dfb28 100644 --- a/mod/network.php +++ b/mod/network.php @@ -546,6 +546,10 @@ function network_content(&$a, $update = 0) { } if(! $update) { + if($blowhard_count > 3) + $o .= '
    '; + + $o .= paginate($a); $o .= '
    ' . t('Shared content is covered by the Creative Commons Attribution 3.0 license.') . '
    '; } diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 7ab85344d5..0d89fa3b1c 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -51,6 +51,11 @@ blockquote:before { content: '>> '; } +.icollapse-wrapper, .ccollapse-wrapper { + border: 1px solid #CCC; + padding: 5px; +} + #panel { background-color: ivory; position: absolute;