clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
tommy tomson 2012-04-06 12:58:41 +02:00
parent 52d5ef905e 4f9588d9ee
commit 0cb2407c94
4 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -11,7 +11,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1303' ); define ( 'FRIENDICA_VERSION', '2.3.1303' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1135 ); define ( 'DB_UPDATE_VERSION', 1136 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

13
update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1135 ); define( 'UPDATE_VERSION' , 1136 );
/** /**
* *
@ -1143,16 +1143,21 @@ q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `rep
} }
function update_1134() { function update_1134() {
// faulty update merged forward
// had a hardwired tablename of 'friendica' which isn't the right name on most systems
}
function update_1135() {
//there can't be indexes with more than 1000 bytes in mysql, //there can't be indexes with more than 1000 bytes in mysql,
//so change charset to be smaller //so change charset to be smaller
q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL");
//and add the index //and add the index
q("ALTER TABLE `friendica`.`config` ADD UNIQUE `access` ( `cat` , `k` ) "); q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) ");
//same thing for pconfig //same thing for pconfig
q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL");
q("ALTER TABLE `friendica`.`pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )");
} }

32
view/de/messages.po
View File

@ -16,8 +16,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-04-04 15:51-0700\n" "POT-Creation-Date: 2012-04-05 10:00-0700\n"
"PO-Revision-Date: 2012-04-06 07:35+0000\n" "PO-Revision-Date: 2012-04-06 10:40+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -411,7 +411,7 @@ msgstr "wurde getaggt in einem"
#: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook-blue/theme.php:82
#: ../../view/theme/diabook/theme.php:86 #: ../../view/theme/diabook/theme.php:86
#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 #: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
#: ../../include/diaspora.php:1650 ../../include/conversation.php:53 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
msgid "photo" msgid "photo"
msgstr "Foto" msgstr "Foto"
@ -1021,8 +1021,8 @@ msgid "This is required for message delivery to work."
msgstr "Dies wird für die Auslieferung von Nachrichten benötigt." msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
#: ../../mod/install.php:343 #: ../../mod/install.php:343
msgid "PHP \"register_argc_argv\"" msgid "PHP register_argc_argv"
msgstr "PHP \"register_argc_argv\"" msgstr "PHP register_argc_argv"
#: ../../mod/install.php:364 #: ../../mod/install.php:364
msgid "" msgid ""
@ -2232,7 +2232,7 @@ msgstr "Markierte"
#: ../../mod/network.php:197 #: ../../mod/network.php:197
msgid "Shared Links" msgid "Shared Links"
msgstr "Geteilte Internetlinks" msgstr "Geteilte Links"
#: ../../mod/network.php:270 #: ../../mod/network.php:270
#, php-format #, php-format
@ -2274,7 +2274,7 @@ msgstr "Ungültiger Kontakt."
msgid "Personal Notes" msgid "Personal Notes"
msgstr "Persönliche Notizen" msgstr "Persönliche Notizen"
#: ../../mod/notes.php:63 ../../mod/filer.php:29 #: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 #: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
msgid "Save" msgid "Save"
msgstr "Speichern" msgstr "Speichern"
@ -2713,7 +2713,7 @@ msgstr "Personen Suche"
#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 #: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
#: ../../view/theme/diabook-aerith/theme.php:77 #: ../../view/theme/diabook-aerith/theme.php:77
#: ../../view/theme/diabook-aerith/theme.php:86 #: ../../view/theme/diabook-aerith/theme.php:86
#: ../../include/diaspora.php:1650 ../../include/conversation.php:48 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130 #: ../../include/conversation.php:130
msgid "status" msgid "status"
@ -2725,7 +2725,7 @@ msgstr "Status"
#: ../../view/theme/diabook-blue/theme.php:91 #: ../../view/theme/diabook-blue/theme.php:91
#: ../../view/theme/diabook/theme.php:95 #: ../../view/theme/diabook/theme.php:95
#: ../../view/theme/diabook-aerith/theme.php:91 #: ../../view/theme/diabook-aerith/theme.php:91
#: ../../include/diaspora.php:1666 ../../include/conversation.php:65 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s mag %2$ss %3$s" msgstr "%1$s mag %2$ss %3$s"
@ -3798,11 +3798,11 @@ msgstr "sichtbar für jeden"
msgid "Edit visibility" msgid "Edit visibility"
msgstr "Sichtbarkeit bearbeiten" msgstr "Sichtbarkeit bearbeiten"
#: ../../mod/filer.php:28 ../../include/conversation.php:918 #: ../../mod/filer.php:29 ../../include/conversation.php:918
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "In diesen Ordner verschieben:" msgstr "In diesen Ordner verschieben:"
#: ../../mod/filer.php:28 #: ../../mod/filer.php:29
msgid "- select -" msgid "- select -"
msgstr "- auswählen -" msgstr "- auswählen -"
@ -4006,7 +4006,7 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen."
msgid "Unable to set contact photo." msgid "Unable to set contact photo."
msgstr "Konnte das Bild des Kontakts nicht speichern." msgstr "Konnte das Bild des Kontakts nicht speichern."
#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503 #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
#: ../../include/conversation.php:101 #: ../../include/conversation.php:101
#, php-format #, php-format
msgid "%1$s is now friends with %2$s" msgid "%1$s is now friends with %2$s"
@ -5216,7 +5216,7 @@ msgstr "Hilfe oder @NewHere"
#: ../../view/theme/diabook/theme.php:206 #: ../../view/theme/diabook/theme.php:206
#: ../../view/theme/diabook-aerith/theme.php:201 #: ../../view/theme/diabook-aerith/theme.php:201
msgid "Connect Services" msgid "Connect Services"
msgstr "Mit anderen Webanwendungen verbinden" msgstr "Verbinde Dienste"
#: ../../view/theme/diabook-red/theme.php:207 #: ../../view/theme/diabook-red/theme.php:207
#: ../../view/theme/diabook-blue/theme.php:207 #: ../../view/theme/diabook-blue/theme.php:207
@ -5850,15 +5850,15 @@ msgstr "Beitrag"
msgid "Item filed" msgid "Item filed"
msgstr "Beitrag abgelegt" msgstr "Beitrag abgelegt"
#: ../../include/diaspora.php:578 #: ../../include/diaspora.php:582
msgid "Sharing notification from Diaspora network" msgid "Sharing notification from Diaspora network"
msgstr "Freigabe-Benachrichtigung von Diaspora" msgstr "Freigabe-Benachrichtigung von Diaspora"
#: ../../include/diaspora.php:1965 #: ../../include/diaspora.php:1969
msgid "Attachments:" msgid "Attachments:"
msgstr "Anhänge:" msgstr "Anhänge:"
#: ../../include/diaspora.php:2148 #: ../../include/diaspora.php:2152
#, php-format #, php-format
msgid "[Relayed] Comment authored by %s from network %s" msgid "[Relayed] Comment authored by %s from network %s"
msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk" msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"

6
view/de/strings.php
View File

@ -212,7 +212,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec
$a->strings["Command line PHP"] = "Kommandozeilen-PHP"; $a->strings["Command line PHP"] = "Kommandozeilen-PHP";
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."; $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt."; $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\""; $a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"; $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."; $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
$a->strings["Generate encryption keys"] = "Schlüssel erzeugen"; $a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
@ -491,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
$a->strings["Posted Order"] = "Neueste Beiträge"; $a->strings["Posted Order"] = "Neueste Beiträge";
$a->strings["New"] = "Neue"; $a->strings["New"] = "Neue";
$a->strings["Starred"] = "Markierte"; $a->strings["Starred"] = "Markierte";
$a->strings["Shared Links"] = "Geteilte Internetlinks"; $a->strings["Shared Links"] = "Geteilte Links";
$a->strings["Warning: This group contains %s member from an insecure network."] = array( $a->strings["Warning: This group contains %s member from an insecure network."] = array(
0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.",
1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
@ -1158,7 +1158,7 @@ $a->strings["Similar Interests"] = "Ähnliche Interessen";
$a->strings["Invite Friends"] = "Freunde einladen"; $a->strings["Invite Friends"] = "Freunde einladen";
$a->strings["Community Pages"] = "Foren"; $a->strings["Community Pages"] = "Foren";
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
$a->strings["Connect Services"] = "Mit anderen Webanwendungen verbinden"; $a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["PostIt to Friendica"] = "PostIt nach Friendica"; $a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; $a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."; $a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";