aboutsummaryrefslogtreecommitdiffstats
path: root/view/de
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-03-23 14:04:35 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-03-23 14:04:35 +0100
commit1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1 (patch)
tree629a2c3cb457293bbe77c956011ad370aa087a78 /view/de
parent4a1426934968384d10a38f335a1c0c49b058dc2d (diff)
parent93504896155d74fc42f6bf60cb61d65295f6b911 (diff)
downloadvolse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.gz
volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.bz2
volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.zip
Merge branch 'master' of github.com:fabrixxm/friendika
Diffstat (limited to 'view/de')
-rw-r--r--view/de/insecure_net.tpl8
-rw-r--r--view/de/jot-header.tpl166
-rw-r--r--view/de/msg-header.tpl104
-rw-r--r--view/de/profile_edit.tpl4
-rw-r--r--view/de/profile_tabs.tpl7
-rw-r--r--view/de/settings.tpl8
-rw-r--r--view/de/strings.php8
7 files changed, 18 insertions, 287 deletions
diff --git a/view/de/insecure_net.tpl b/view/de/insecure_net.tpl
deleted file mode 100644
index 900f28642..000000000
--- a/view/de/insecure_net.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="profile-edit-insecure">
-<p>
-Das Soziale Netzwerk dem $name angehört ist ein offenes Netzwerk das nur
-eingeschränkte oder nicht existente Privatspäreneinstellungen bietet.
-
-Bitte verhalte dich entsprechend diskret.
-</p>
-</div>
diff --git a/view/de/jot-header.tpl b/view/de/jot-header.tpl
deleted file mode 100644
index 62fbe84e4..000000000
--- a/view/de/jot-header.tpl
+++ /dev/null
@@ -1,166 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var editor;
-
-tinyMCE.init({
- theme : "advanced",
- mode : "specific_textareas",
- editor_selector: /(profile-jot-text|prvmail-text)/,
- plugins : "bbcode,paste",
- theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
- theme_advanced_buttons2 : "",
- theme_advanced_buttons3 : "",
- theme_advanced_toolbar_location : "top",
- theme_advanced_toolbar_align : "center",
- theme_advanced_blockformats : "blockquote,code",
- paste_text_sticky : true,
- entity_encoding : "raw",
- add_unload_trigger : false,
- remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
- convert_urls: false,
- content_css: "$baseurl/view/custom_tinymce.css",
- //Character count
- theme_advanced_path : false,
- setup : function(ed) {
- ed.onKeyUp.add(function(ed, e) {
- var txt = tinyMCE.activeEditor.getContent();
- var text = txt.length;
- if(txt.length <= 140) {
- $('#character-counter').removeClass('red');
- $('#character-counter').removeClass('orange');
- $('#character-counter').addClass('grey');
- }
- if((txt.length > 140) && (txt .length <= 420)) {
- $('#character-counter').removeClass('grey');
- $('#character-counter').removeClass('red');
- $('#character-counter').addClass('orange');
- }
- if(txt.length > 420) {
- $('#character-counter').removeClass('grey');
- $('#character-counter').removeClass('orange');
- $('#character-counter').addClass('red');
- }
- $('#character-counter').text(text);
- });
-
- ed.onInit.add(function(ed) {
- ed.pasteAsPlainText = true;
- });
-
- }
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
- $(document).ready(function() {
- var uploader = new window.AjaxUpload(
- 'wall-image-upload',
- { action: 'wall_upload/$nickname',
- name: 'userfile',
- onSubmit: function(file,ext) { $('#profile-rotator').show(); },
- onComplete: function(file,response) {
- tinyMCE.execCommand('mceInsertRawHTML',false,response);
- $('#profile-rotator').hide();
- }
- }
- );
- $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
- var selstr;
- $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
- selstr = $(this).text();
- $('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
- $('.profile-jot-net input').attr('disabled', 'disabled');
- });
- if(selstr == null) {
- $('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
- $('.profile-jot-net input').attr('disabled', false);
- }
-
- }).trigger('change');
-
- });
-
- function jotGetLink() {
- reply = prompt("Bitte URL des Links angeben:");
- if(reply && reply.length) {
- $('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- $('#profile-rotator').hide();
- });
- }
- }
-
- function jotGetVideo() {
- reply = prompt("Bitte den YouTube Link angeben:");
- if(reply && reply.length) {
- tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
- }
- }
-
- 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) {
- $('#jot-location').val(reply);
- }
- }
-
- 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");
- if(linkFound)
- event.preventDefault();
- }
-
- function linkdrop(event) {
- var reply = event.dataTransfer.getData("text/uri-list");
- event.target.textContent = reply;
- event.preventDefault();
- if(reply && reply.length) {
- $('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- $('#profile-rotator').hide();
- });
- }
- }
-
- function jotClearLocation() {
- $('#jot-coord').val('');
- $('#profile-nolocation-wrapper').hide();
- }
-
- $geotag
-
-</script>
-
diff --git a/view/de/msg-header.tpl b/view/de/msg-header.tpl
deleted file mode 100644
index 174e6c985..000000000
--- a/view/de/msg-header.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-tinyMCE.init({
- theme : "advanced",
- mode : "specific_textareas",
- editor_selector: /(profile-jot-text|prvmail-text)/,
- plugins : "bbcode,paste",
- theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
- theme_advanced_buttons2 : "",
- theme_advanced_buttons3 : "",
- theme_advanced_toolbar_location : "top",
- theme_advanced_toolbar_align : "center",
- theme_advanced_blockformats : "blockquote,code",
- paste_text_sticky : true,
- entity_encoding : "raw",
- add_unload_trigger : false,
- remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
- convert_urls: false,
- content_css: "$baseurl/view/custom_tinymce.css",
- //Character count
- theme_advanced_path : false,
- setup : function(ed) {
- ed.onKeyUp.add(function(ed, e) {
- var txt = tinyMCE.activeEditor.getContent();
- var text = txt.length;
- if(txt.length <= 140) {
- $('#character-counter').removeClass('red');
- $('#character-counter').removeClass('orange');
- $('#character-counter').addClass('grey');
- }
- if((txt.length > 140) && (txt .length <= 420)) {
- $('#character-counter').removeClass('grey');
- $('#character-counter').removeClass('red');
- $('#character-counter').addClass('orange');
- }
- if(txt.length > 420) {
- $('#character-counter').removeClass('grey');
- $('#character-counter').removeClass('orange');
- $('#character-counter').addClass('red');
- }
- $('#character-counter').text(text);
- });
-
- ed.onInit.add(function(ed) {
- ed.pasteAsPlainText = true;
- });
- }
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
- $(document).ready(function() {
- var uploader = new window.AjaxUpload(
- 'prvmail-upload',
- { action: 'wall_upload/$nickname',
- name: 'userfile',
- onSubmit: function(file,ext) { $('#profile-rotator').show(); },
- onComplete: function(file,response) {
- tinyMCE.execCommand('mceInsertRawHTML',false,response);
- $('#profile-rotator').hide();
- }
- }
- );
-
- });
-
- function jotGetLink() {
- reply = prompt("Please enter a link URL:");
- if(reply && reply.length) {
- $('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- $('#profile-rotator').hide();
- });
- }
- }
-
- function linkdropper(event) {
- var linkFound = event.dataTransfer.types.contains("text/uri-list");
- if(linkFound)
- event.preventDefault();
- }
-
- function linkdrop(event) {
- var reply = event.dataTransfer.getData("text/uri-list");
- event.target.textContent = reply;
- event.preventDefault();
- if(reply && reply.length) {
- $('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- $('#profile-rotator').hide();
- });
- }
- }
-
-</script>
-
diff --git a/view/de/profile_edit.tpl b/view/de/profile_edit.tpl
index 840597ddc..0b0619420 100644
--- a/view/de/profile_edit.tpl
+++ b/view/de/profile_edit.tpl
@@ -136,13 +136,13 @@ $sexual
<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" />
+<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="prvkeywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
+<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>
diff --git a/view/de/profile_tabs.tpl b/view/de/profile_tabs.tpl
deleted file mode 100644
index 56e7d626f..000000000
--- a/view/de/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profil</a>
- <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Fotos</a>
-<div id="profile-tabs-end"></div>
-</div> \ No newline at end of file
diff --git a/view/de/settings.tpl b/view/de/settings.tpl
index 675ef675f..5f700ff8b 100644
--- a/view/de/settings.tpl
+++ b/view/de/settings.tpl
@@ -89,6 +89,14 @@ $profile_in_net_dir
</div>
<div id="settings-default-perms-end"></div>
+<div id="settings-blockw-wrapper" >
+<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
+<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
+</div>
+<div id="settings-blockw-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>
diff --git a/view/de/strings.php b/view/de/strings.php
index b45ddee69..2d8fe7006 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -272,6 +272,11 @@ $a->strings['Clear browser location'] = 'Browser Standort leeren';
$a->strings['Permission settings'] = 'Berechtigungseinstellungen';
$a->strings['CC: email addresses'] = 'CC: EMail Addresse';
$a->strings['Example: bob@example.com, mary@example.com'] = 'Z.B.: bob@example.com, mary@example.com';
+$a->strings['Please enter a link URL:'] = 'Bitte URL des Links angeben:';
+$a->strings['Please enter a YouTube link:'] = 'Bitte den YouTube Link angeben:';
+$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?'] = 'Wo bist du im Moment?';
$a->strings['No such group'] = 'Es gibt keine solche Gruppe';
$a->strings['Group is empty'] = 'Gruppe ist leer';
$a->strings['Group: '] = 'Gruppe: ';
@@ -326,6 +331,9 @@ $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #cam
$a->strings['Recent Photos'] = 'Neuste Fotos';
$a->strings['Upload New Photos'] = 'Weitere Fotos hochladen';
$a->strings['View Album'] = 'Album betrachten';
+$a->strings['Status'] = 'Status';
+$a->strings['Profile'] = 'Profil';
+$a->strings['Photos'] = 'Fotos';
$a->strings['Image uploaded but image cropping failed.'] = 'Bilder hochgeladen aber das Zuschneiden ist fehlgeschlagen.';
$a->strings['Image size reduction [175] failed.'] = 'Image size reduction [175] failed.';
$a->strings['Image size reduction [80] failed.'] = 'Image size reduction [80] failed.';