From: friendica Date: Thu, 13 Sep 2012 00:18:10 +0000 (-0700) Subject: rev update X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b8eb5d66b52926e46064254487bddc33eb60cdf;p=friendica.git rev update --- diff --git a/boot.php b/boot.php index f56f2fc0fb..5d08e7cec8 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1463' ); +define ( 'FRIENDICA_VERSION', '3.0.1464' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); diff --git a/util/messages.po b/util/messages.po index e34abcab94..694414f4a7 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1463\n" +"Project-Id-Version: 3.0.1464\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-11 10:00-0700\n" +"POT-Creation-Date: 2012-09-12 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,8 +47,8 @@ msgstr "" #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 #: ../../mod/item.php:142 ../../mod/mood.php:114 -#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:142 -#: ../../mod/profile_photo.php:153 ../../mod/profile_photo.php:166 +#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 +#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/message.php:38 ../../mod/message.php:168 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 @@ -398,10 +398,10 @@ msgid "Contact information unavailable" msgstr "" #: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1073 -#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:60 -#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 -#: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261 -#: ../../mod/profile_photo.php:270 +#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:74 +#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 +#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 +#: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 #: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318 #: ../../include/user.php:325 ../../include/user.php:332 @@ -444,12 +444,12 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:729 ../../mod/profile_photo.php:126 +#: ../../mod/photos.php:729 ../../mod/profile_photo.php:153 #: ../../mod/wall_upload.php:110 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:756 ../../mod/profile_photo.php:266 +#: ../../mod/photos.php:756 ../../mod/profile_photo.php:301 #: ../../mod/wall_upload.php:136 msgid "Image upload failed." msgstr "" @@ -2367,7 +2367,7 @@ msgstr "" msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:944 ../../mod/profile_photo.php:214 +#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248 msgid "or" msgstr "" @@ -2771,7 +2771,7 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211 +#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244 msgid "Upload Profile Photo" msgstr "" @@ -3193,61 +3193,65 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../mod/profile_photo.php:30 +#: ../../mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 -#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:273 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84 +#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308 #, php-format msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/profile_photo.php:91 +#: ../../mod/profile_photo.php:118 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: ../../mod/profile_photo.php:101 +#: ../../mod/profile_photo.php:128 msgid "Unable to process image" msgstr "" -#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:88 +#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88 #, php-format msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/profile_photo.php:210 +#: ../../mod/profile_photo.php:242 msgid "Upload File:" msgstr "" -#: ../../mod/profile_photo.php:212 +#: ../../mod/profile_photo.php:243 +msgid "Select a profile:" +msgstr "" + +#: ../../mod/profile_photo.php:245 #: ../../addon/dav/friendica/layout.fnk.php:152 msgid "Upload" msgstr "" -#: ../../mod/profile_photo.php:214 +#: ../../mod/profile_photo.php:248 msgid "skip this step" msgstr "" -#: ../../mod/profile_photo.php:214 +#: ../../mod/profile_photo.php:248 msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/profile_photo.php:227 +#: ../../mod/profile_photo.php:262 msgid "Crop Image" msgstr "" -#: ../../mod/profile_photo.php:228 +#: ../../mod/profile_photo.php:263 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/profile_photo.php:230 +#: ../../mod/profile_photo.php:265 msgid "Done Editing" msgstr "" -#: ../../mod/profile_photo.php:264 +#: ../../mod/profile_photo.php:299 msgid "Image uploaded successfully." msgstr ""