Changeset 6328 for branches/2.1

Timestamp:

05/24/10 17:30:46 (3 years ago)

Author:

plg

Message:

merge r6240 from trunk to branch 2.1

small translation bug correction

Location:

branches/2.1

Files:

• . (modified) (1 prop)
• about.php (modified) (1 prop)
• action.php (modified) (1 prop)
• admin.php (modified) (1 prop)
• category.php (modified) (1 prop)
• comments.php (modified) (1 prop)
• feed.php (modified) (1 prop)
• identification.php (modified) (1 prop)
• index.php (modified) (1 prop)
• install.php (modified) (1 prop)
• language (modified) (1 prop)
• language/index.php (modified) (1 prop)
• language/pl_PL (modified) (1 prop)
• language/pl_PL/about.html (modified) (1 prop)
• language/pl_PL/admin.lang.php (modified) (1 prop)
• language/pl_PL/common.lang.php (modified) (1 diff, 1 prop)
• language/pl_PL/index.php (modified) (1 prop)
• language/pl_PL/install.lang.php (modified) (1 prop)
• language/pl_PL/iso.txt (modified) (1 prop)
• language/pl_PL/pl_PL.jpg (modified) (1 prop) (previous)
• language/pl_PL/upgrade.lang.php (modified) (1 prop)
• nbm.php (modified) (1 prop)
• notification.php (modified) (1 prop)
• password.php (modified) (1 prop)
• picture.php (modified) (1 prop)
• popuphelp.php (modified) (1 prop)
• profile.php (modified) (1 prop)
• qsearch.php (modified) (1 prop)
• random.php (modified) (1 prop)
• register.php (modified) (1 prop)
• search.php (modified) (1 prop)
• search_rules.php (modified) (1 prop)
• tags.php (modified) (1 prop)
• upgrade.php (modified) (1 prop)
• upgrade_feed.php (modified) (1 prop)
• upload.php (modified) (1 prop)
• ws.php (modified) (1 prop)

branches/2.1

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6265*,6320*
+/trunk:6240*,6265*,6320*

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6265*,6320*
+/trunk:6240*,6265*,6320*

branches/2.1/language/pl_PL/common.lang.php

@@ -305 +305 @@
 $lang['Optional, but recommended : choose a thumbnail to associate to'] = 'Opcjonalne, ale zalecane : wybierz miniaturę do powiązania z ';
 $lang['the width of the picture must not exceed :'] = 'szerokość zdjęcia nie może przekraczać : ';
-$lang['Author'] = 'Autor (np. "Pierrick LE GALL")';
+$lang['Author'] = 'Autor';
 $lang['can\'t upload the picture on the server'] = 'nie można wgrać zdjęcia na serwer';
 $lang['the username must be given'] = 'nazwa użytkonika musi być podana';

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6265*,6320*
+/trunk:6240*,6265*,6320*