Skip to content

Commit

Permalink
Merge pull request #55 from ophian/master
Browse files Browse the repository at this point in the history
Merge master into dev5 via dev5-2
  • Loading branch information
ophian authored Apr 8, 2024
2 parents 57fb950 + c3f238a commit c36fdff
Show file tree
Hide file tree
Showing 66 changed files with 73 additions and 19 deletions.
5 changes: 5 additions & 0 deletions docs/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ Version 4.4.3-DEV ()
------------------------------------------------------------------------


* Add new helper notice in media_items on multi-uploads via enterProperties
submit, explaining that only the last will be able to change.

* Fix rss PHP 8+ gmdate(... 2cd argument) timestamp has to be of type int

* Fix PostgreSQL "character varying" type error in plugins cleanup after
UPDATE_ALL.

Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_bg.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Продължаване за въвеждане на свойства');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Публичен коментар');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_cn.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', '输入内容');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', '版权');
@define('MEDIA_PROPERTY_COMMENT1', '公众评论');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_cs.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Zadej vlastnosti');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Veřejný komentář');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_cz.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Zadej vlastnosti');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Veřejný komentář');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_da.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Offentlig kommentar');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_de.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Variationen löschen');

@define('GO_ADD_PROPERTIES', 'Los & Eigenschaften angeben');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Bitte beachten Sie, dass bei multiple-hochgeladenen Bildern über das "Eigenschaften angeben"-Submit aus Gründen der internen Codeverwendung hier nur die Eigenschaften des letzten Bildes wirklich geändert werden können.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Öffentl. Kommentar');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_en.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_es.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Ir & ingresar propiedades');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Comentario público');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_fa.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'اطلاعات را وارد کن');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'حق کپی');
@define('MEDIA_PROPERTY_COMMENT1', 'نظر عمومی');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_fi.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_fr.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_hu.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Mehet, majd utána a tulajdonságok szerkesztése');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Nyilvános megjegyzés');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_is.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_it.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_ja.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'パブリックコメント');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_ko.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', '등록정보 입력하러 가기');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', '밀도(DPI)');
@define('MEDIA_PROPERTY_COPYRIGHT', '저작권');
@define('MEDIA_PROPERTY_COMMENT1', '공개 댓글');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_nl.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Wijzig afbeeldingseigenschappen');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Auteursrecht');
@define('MEDIA_PROPERTY_COMMENT1', 'Publiek Commentaar');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_no.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_pl.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Dodaj i wprowadź właściwości');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Prawa autorskie (Copyright)');
@define('MEDIA_PROPERTY_COMMENT1', 'Komentarz publiczny');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_pt.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_pt_PT.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Ir & introduzir propriedades');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI (PPP)');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Direitos de Autor');
@define('MEDIA_PROPERTY_COMMENT1', 'Comentário Público');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_ro.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_ru.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_sa.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_se.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Mata in egenskaper');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Upphovsskydd');
@define('MEDIA_PROPERTY_COMMENT1', 'Offentlig kommentar');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_sk.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Zadať vlastnosti');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Veřejný komentář');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_ta.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_tn.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', '輸入內容');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', '版權');
@define('MEDIA_PROPERTY_COMMENT1', '公眾意見');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_tr.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_tw.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', '輸入內容');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', '版權');
@define('MEDIA_PROPERTY_COMMENT1', '公眾意見');
Expand Down
1 change: 1 addition & 0 deletions lang/UTF-8/serendipity_lang_zh.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', '输入内容');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', '版权');
@define('MEDIA_PROPERTY_COMMENT1', '公众评论');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_bg.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', '������������ �� ��������� �� ��������');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', '�������� ��������');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_cn.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', '输入内容');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', '版权');
@define('MEDIA_PROPERTY_COMMENT1', '公众评论');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_cs.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Zadej vlastnosti');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Verejn� koment�r');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_cz.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Zadej vlastnosti');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Verejn� koment�r');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_da.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Offentlig kommentar');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_de.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Variationen l�schen');

@define('GO_ADD_PROPERTIES', 'Los & Eigenschaften angeben');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Bitte beachten Sie, dass bei multiple-hochgeladenen Bildern �ber das "Eigenschaften angeben"-Submit aus Gr�nden der internen Codeverwendung hier nur die Eigenschaften des letzten Bildes wirklich ge�ndert werden k�nnen.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', '�ffentl. Kommentar');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_en.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Go & enter properties');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Public Comment');
Expand Down
1 change: 1 addition & 0 deletions lang/serendipity_lang_es.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@
@define('DIALOG_DELETE_VARIATIONS', 'Delete Variations');

@define('GO_ADD_PROPERTIES', 'Ir & ingresar propiedades');
@define('MEDIA_PROP_MULTIUPLOAD_LAST_ONLY', 'Please note that for multiple uploaded images with the enterProperties-Submit, only the properties of the last image can really be changed here for reasons of code usage.');
@define('MEDIA_PROPERTY_DPI', 'DPI');
@define('MEDIA_PROPERTY_COPYRIGHT', 'Copyright');
@define('MEDIA_PROPERTY_COMMENT1', 'Comentario p�blico');
Expand Down
Loading

1 comment on commit c36fdff

@ophian
Copy link
Owner Author

@ophian ophian commented on c36fdff Apr 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This merge patch did not require the via dev5-2 branch - it went through from current master into dev5 w/o problems!

Please sign in to comment.