19 files changed, 401 insertions, 45 deletions
diff --git a/view/de/jot-header.tpl b/view/de/jot-header.tpl
index 58403f1ba..62fbe84e4 100644
--- a/view/de/jot-header.tpl
+++ b/view/de/jot-header.tpl
@@ -104,6 +104,20 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
 	function jotGetLocation() {
 		reply = prompt("Wo bist du im Moment?", $('#jot-location').val());
 		if(reply && reply.length) {
@@ -111,6 +125,16 @@ tinyMCE.init({
 		}
 	}
 
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			$('#like-rotator-' + id).hide();
+			$(window).scrollTop(0);
+		});
+	}
+
+
 
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/de/profile_edit.tpl b/view/de/profile_edit.tpl
index 09a761023..840597ddc 100644
--- a/view/de/profile_edit.tpl
+++ b/view/de/profile_edit.tpl
@@ -134,11 +134,17 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
-<div id="profile-edit-keywords-wrapper" >
-<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Keywords: </label>
-<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" />
-</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</div>
-<div id="profile-edit-keywords-end"></div>
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
+<input type="text" size="32" name="pubkeywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
+<input type="text" size="32" name="prvkeywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<div id="profile-edit-prvkeywords-end"></div>
 
 
 <div class="profile-edit-submit-wrapper" >
diff --git a/view/de/settings.tpl b/view/de/settings.tpl
index 0ef50546f..675ef675f 100644
--- a/view/de/settings.tpl
+++ b/view/de/settings.tpl
@@ -78,7 +78,7 @@ $profile_in_net_dir
 
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
@@ -89,6 +89,10 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
+
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index fe818410e..d73fe7d62 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -104,6 +104,21 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
+
 	function jotGetLocation() {
 		reply = prompt("Where are you right now?", $('#jot-location').val());
 		if(reply && reply.length) {
@@ -111,6 +126,14 @@ tinyMCE.init({
 		}
 	}
 
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			$('#like-rotator-' + id).hide();
+			$(window).scrollTop(0);
+		});
+	}
 
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl
index b0d4850d0..6c7d74daf 100644
--- a/view/en/profile_edit.tpl
+++ b/view/en/profile_edit.tpl
@@ -134,11 +134,17 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
-<div id="profile-edit-keywords-wrapper" >
-<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Keywords: </label>
-<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" />
-</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</div>
-<div id="profile-edit-keywords-end"></div>
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<div id="profile-edit-prvkeywords-end"></div>
 
 
 <div class="profile-edit-submit-wrapper" >
diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 97d67cbf6..39b18c126 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -76,9 +76,8 @@ $profile_in_dir
 $profile_in_net_dir
 
 
-
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
@@ -89,6 +88,10 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
+
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl
index ff7e543a5..b1b6dacf0 100644
--- a/view/fr/jot-header.tpl
+++ b/view/fr/jot-header.tpl
@@ -103,6 +103,20 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
 	function jotGetLocation() {
 		reply = prompt("Where are you right now?", $('#jot-location').val());
 		if(reply && reply.length) {
@@ -110,6 +124,15 @@ tinyMCE.init({
 		}
 	}
 
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			$('#like-rotator-' + id).hide();
+			$(window).scrollTop(0);
+		});
+	}
+
 
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/fr/profile_edit.tpl b/view/fr/profile_edit.tpl
index beff3b8bd..b28255188 100644
--- a/view/fr/profile_edit.tpl
+++ b/view/fr/profile_edit.tpl
@@ -134,11 +134,17 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
-<div id="profile-edit-keywords-wrapper" >
-<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Keywords: </label>
-<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" />
-</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</div>
-<div id="profile-edit-keywords-end"></div>
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<div id="profile-edit-prvkeywords-end"></div>
 
 
 <div class="profile-edit-submit-wrapper" >
diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl
index 97d67cbf6..eb386579f 100644
--- a/view/fr/settings.tpl
+++ b/view/fr/settings.tpl
@@ -78,7 +78,7 @@ $profile_in_net_dir
 
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
@@ -89,6 +89,9 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 423645c86..d177c07b8 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -16,14 +16,14 @@ $a->strings['last'] = 'last';
 $a->strings['next'] = 'next';
 $a->strings[' likes this.'] = ' aime ça.';
 $a->strings[' doesn\'t like this.'] = ' n\'aime pas ça.';
-$a->strings['people'] = 'personne(s)';
-$a->strings['like this.'] = 'aime(nt) ça.';
-$a->strings['don\'t like this.'] = 'n\'aime(nt) pas ça.';
+$a->strings['people'] = 'personnes';
+$a->strings['like this.'] = 'aiment ça.';
+$a->strings['don\'t like this.'] = 'n\'aiment pas ça.';
 $a->strings['and'] = 'et';
 $a->strings[', and '] = ', et ';
-$a->strings[' other people'] = ' autre(s) personne(s)';
-$a->strings[' like this.'] = ' aime(nt) ça.';
-$a->strings[' don\'t like this.'] = ' n\'aime(nt) pas ça.';
+$a->strings[' other people'] = ' autres personnes';
+$a->strings[' like this.'] = ' aiment ça.';
+$a->strings[' don\'t like this.'] = ' n\'aiment pas ça.';
 $a->strings['No contacts'] = 'Aucun contact';
 $a->strings['Contacts'] = 'Contacts';
 $a->strings['View Contacts'] = 'Voir les contacts';
diff --git a/view/it/jot-header.tpl b/view/it/jot-header.tpl
index 117cd1651..8ca5a0717 100644
--- a/view/it/jot-header.tpl
+++ b/view/it/jot-header.tpl
@@ -104,6 +104,20 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
 	function jotGetLocation() {
 		reply = prompt("Dove ti trovi ora?", $('#jot-location').val());
 		if(reply && reply.length) {
@@ -111,6 +125,15 @@ tinyMCE.init({
 		}
 	}
 
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			$('#like-rotator-' + id).hide();
+			$(window).scrollTop(0);
+		});
+	}
+
 
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/it/profile_edit.tpl b/view/it/profile_edit.tpl
index efdb5d448..9f2a13790 100644
--- a/view/it/profile_edit.tpl
+++ b/view/it/profile_edit.tpl
@@ -134,11 +134,17 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
-<div id="profile-edit-keywords-wrapper" >
-<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Parole chiave: </label>
-<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Esempio: pescare fotografia software" value="$keywords" />
-</div><div id="profile-edit-keywords-desc">(Usati per la ricerca dei profili pubblci, mai mostrati agli altri)</div>
-<div id="profile-edit-keywords-end"></div>
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >[Public] Parole chiave: </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Esempio: pescare fotografia software" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Parole chiave: </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Esempio: pescare fotografia software" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Usati per la ricerca dei profili, mai mostrati agli altri)</div>
+<div id="profile-edit-prvkeywords-end"></div>
 
 
 <div class="profile-edit-submit-wrapper" >
diff --git a/view/it/settings.tpl b/view/it/settings.tpl
index 3b68923cf..87f40f26f 100644
--- a/view/it/settings.tpl
+++ b/view/it/settings.tpl
@@ -79,7 +79,7 @@ $profile_in_net_dir
 
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
@@ -90,6 +90,9 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
 </div>
diff --git a/view/jot.tpl b/view/jot.tpl
index 68139ddc0..fd85b9267 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -26,7 +26,13 @@
 		<img id="profile-link" src="images/link-icon.gif" alt="$weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
 	</div> 
 	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="$youtube" title="$youtube" onclick="jotGetVideo();" />
+		<img id="profile-youtube" src="images/youtube_icon.gif" alt="$youtube" title="$youtube" onclick="jotGetVideo();" />
+	</div> 
+	<div id="profile-video-wrapper" style="display: $visitor;" >
+		<img id="profile-video" src="images/video.gif" alt="$video" title="$video" onclick="jotVideoURL();" />
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<img id="profile-audio" src="images/audio.gif" alt="$audio" title="$audio" onclick="jotAudioURL();" />
 	</div> 
 	<div id="profile-location-wrapper" style="display: $visitor;" >
 		<img id="profile-location" src="images/globe.gif" alt="$setloc" title="$setloc" onclick="jotGetLocation();" />
diff --git a/view/like.tpl b/view/like.tpl
index e36a624a4..4f530407e 100644
--- a/view/like.tpl
+++ b/view/like.tpl
@@ -1,5 +1,6 @@
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
 				<img src="images/like.gif" alt="$likethis" title="$likethis" onclick="dolike($id,'like');" />
 				<img src="images/dislike.gif" alt="$nolike" title="$nolike" onclick="dolike($id,'dislike');" />
+				<img src="images/share.gif" alt="$share" title="$share" class="wall-item-share-buttons" onclick="jotShare($id);" />
 				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 			</div>
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
new file mode 100644
index 000000000..e36a624a4
--- /dev/null
+++ b/view/like_noshare.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+				<img src="images/like.gif" alt="$likethis" title="$likethis" onclick="dolike($id,'like');" />
+				<img src="images/dislike.gif" alt="$nolike" title="$nolike" onclick="dolike($id,'dislike');" />
+				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			</div>
diff --git a/view/sv/strings.php b/view/sv/strings.php
index 6685130bb..d30a14b1f 100644
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
@@ -60,7 +60,11 @@ $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.';
@@ -94,12 +98,20 @@ $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';
@@ -142,20 +154,41 @@ $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.";
@@ -164,18 +197,28 @@ $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 <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> 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 <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> 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';
@@ -272,16 +315,26 @@ $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: ';
@@ -291,10 +344,17 @@ $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: ';
@@ -311,7 +371,11 @@ $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.';
@@ -320,7 +384,11 @@ $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';
@@ -328,10 +396,17 @@ $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';
@@ -342,7 +417,11 @@ $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-';
@@ -351,7 +430,11 @@ $a->strings['Profile unavailable to clone.'] = 'Det gick inte att klona profilen
 $a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'Det här är din <strong>offentliga</strong> profil.<br />Den <strong>kan</strong> 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.';
@@ -381,7 +464,11 @@ $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:';
@@ -398,12 +485,21 @@ $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["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Valfritt\x29 Tillåt inloggning med detta OpenID på det här kontot.";
+$a->strings['Profile is <strong>not published</strong>.'] = 'Profilen är <strong>inte publicerad</strong>.';
+$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["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profilen är <strong>inte publicerad</strong>.';
 $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:';
@@ -502,7 +598,11 @@ $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.';
@@ -511,10 +611,17 @@ $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';
@@ -525,21 +632,48 @@ $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.<br />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.<br />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 <strong>public</strong> 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 <strong>public</strong> 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 <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> 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 <strong>public</strong> 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 <strong>public</strong> 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. ';
@@ -555,6 +689,7 @@ $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 <strong>public</strong> 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 <strong>public</strong> 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 <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> 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 +1180,11 @@ $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';
@@ -1095,7 +1234,11 @@ $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';
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index d4643b20a..ce75655fb 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -206,8 +206,10 @@ div.wall-item-content-wrapper.shiny {
 /* from default */
 #jot-perms-icon, 
 #profile-location,
-#profile-nolocation, 
+#profile-nolocation,
+#profile-youtube, 
 #profile-video, 
+#profile-audio,
 #profile-link, 
 #wall-image-upload,
 #profile-upload-wrapper,
@@ -373,6 +375,10 @@ input#dfrn-url {
 	margin-bottom: 30px;
 }
 
+#settings-expire-end {
+	margin-bottom: 30px;
+}
+
 #settings-username-end,
 #settings-email-end,
 #settings-nick-end,
@@ -624,7 +630,8 @@ input#dfrn-url {
 #profile-edit-sexual-label,
 #profile-edit-politic-label,
 #profile-edit-religion-label,
-#profile-edit-keywords-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
 #profile-edit-homepage-label {
 	float: left;
 	width: 175px;
@@ -644,7 +651,8 @@ input#dfrn-url {
 #sexual-select,
 #profile-edit-politic,
 #profile-edit-religion,
-#profile-edit-keywords,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
 #profile-in-dir-yes,
 #profile-in-dir-no,
 #profile-in-netdir-yes,
@@ -698,7 +706,8 @@ input#dfrn-url {
 
 
 #profile-edit-pdesc-desc,
-#profile-edit-keywords-desc {
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc {
 	float: left;
 	margin-left: 20px;
 }
@@ -741,7 +750,8 @@ input#dfrn-url {
 #profile-edit-sexual-end,
 #profile-edit-politic-end,
 #profile-edit-religion-end,
-#profile-edit-keywords-end,
+#profile-edit-pubkeywords-end,
+#profile-edit-prvkeywords-end,
 #profile-edit-homepage-end,
 #profile-in-dir-break,
 #profile-in-dir-end,
@@ -913,6 +923,10 @@ input#dfrn-url {
 	cursor: pointer;
 }
 
+.wall-item-share-buttons {
+	margin-left: 10px;
+}
+
 .wall-item-links-wrapper {
 	float: left;
 }
@@ -1044,6 +1058,14 @@ input#dfrn-url {
 	float: left;
 	margin-left: 20px;
 }
+#profile-video-wrapper {
+	float: left;
+	margin-left: 20px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 20px;
+}
 #profile-location-wrapper {
 	float: left;
 	margin-left: 20px;
@@ -1055,7 +1077,7 @@ input#dfrn-url {
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 200px;
+	margin-left: 150px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2094,3 +2116,16 @@ a.mail-list-link {
 	margin-top: 20px;
 }
 
+#photo-prev-link, #photo-next-link {
+	padding: 10px;
+	float: left;
+}
+
+#photo-photo {
+	float: left;
+}
+
+#photo-photo-end {
+	clear: both;
+}
+
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index ffd352c5a..1c378793a 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -107,8 +107,10 @@ blockquote:before {
 
 #jot-perms-icon, 
 #profile-location,
-#profile-nolocation, 
-#profile-video, 
+#profile-nolocation,
+#profile-youtube, 
+#profile-video,
+#profile-audio, 
 #profile-link, 
 #wall-image-upload,
 #profile-upload-wrapper,
@@ -506,6 +508,10 @@ input#dfrn-url {
 	margin-bottom: 30px;
 }
 
+#settings-expire-end {
+	margin-bottom: 30px;
+}
+
 #settings-username-end,
 #settings-email-end,
 #settings-nick-end,
@@ -755,7 +761,8 @@ input#dfrn-url {
 #profile-edit-sexual-label,
 #profile-edit-politic-label,
 #profile-edit-religion-label,
-#profile-edit-keywords-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
 #profile-edit-homepage-label {
 	float: left;
 	width: 175px;
@@ -775,7 +782,8 @@ input#dfrn-url {
 #sexual-select,
 #profile-edit-politic,
 #profile-edit-religion,
-#profile-edit-keywords,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
 #profile-in-dir-yes,
 #profile-in-dir-no,
 #profile-in-netdir-yes,
@@ -806,7 +814,8 @@ input#dfrn-url {
 	margin-left: 20px;
 }
 
-#profile-edit-keywords-desc {
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc {
 	float: left;
 	margin-left: 20px;
 }
@@ -864,7 +873,8 @@ input#dfrn-url {
 #profile-edit-sexual-end,
 #profile-edit-politic-end,
 #profile-edit-religion-end,
-#profile-edit-keywords-end,
+#profile-edit-pubkeywords-end,
+#profile-edit-prvkeywords-end,
 #profile-edit-homepage-end,
 #profile-in-dir-break,
 #profile-in-dir-end,
@@ -985,6 +995,10 @@ input#dfrn-url {
     border-right: 2px solid #fff;
 }
 
+.wall-item-share-buttons {
+	margin-left: 5px;
+}
+
 .wall-item-links-wrapper {
     float: left;
 }
@@ -1113,6 +1127,14 @@ padding: 5px 10px 0px;
 	float: left;
 	margin-left: 20px;
 }
+#profile-video-wrapper {
+	float: left;
+	margin-left: 20px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 20px;
+}
 #profile-location-wrapper {
 	float: left;
 	margin-left: 20px;
@@ -1124,7 +1146,7 @@ padding: 5px 10px 0px;
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 200px;
+	margin-left: 150px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2126,3 +2148,17 @@ a.mail-list-link {
 	margin-top: 20px;
 }
 
+
+#photo-prev-link, #photo-next-link {
+	padding: 10px;
+	float: left;
+}
+
+#photo-photo {
+	float: left;
+}
+
+#photo-photo-end {
+	clear: both;
+}
+