72 files changed, 17197 insertions, 13718 deletions
diff --git a/perl-install/install/share/po/DrakX.pot b/perl-install/install/share/po/DrakX.pot index 3b49afc86..aebca3526 100644 --- a/perl-install/install/share/po/DrakX.pot +++ b/perl-install/install/share/po/DrakX.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -83,177 +83,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -262,72 +262,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -337,7 +337,7 @@ msgstr "" msgid "Installation" msgstr "" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "" @@ -431,262 +431,262 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "" @@ -703,7 +703,7 @@ msgstr "" msgid "GNOME Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:156 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -742,22 +742,21 @@ msgstr "" msgid "LXDE Desktop" msgstr "" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:177 +#: share/meta-task/compssUsers.pl:183 #, c-format msgid "RazorQT Desktop" msgstr "" #: share/meta-task/compssUsers.pl:185 #, c-format -msgid "" -"A less developed lightweight fast graphical environment " +msgid "A less developed lightweight fast graphical environment" msgstr "" #: share/meta-task/compssUsers.pl:188 @@ -767,8 +766,7 @@ msgstr "" #: share/meta-task/compssUsers.pl:190 #, c-format -msgid "" -"A lightweight fast graphical environment with a dedicated following" +msgid "A lightweight fast graphical environment with a dedicated following" msgstr "" #: share/meta-task/compssUsers.pl:193 @@ -781,42 +779,42 @@ msgstr "" msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "" @@ -828,7 +826,7 @@ msgid "" "Continue at your own risk." msgstr "" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -870,276 +868,216 @@ msgstr "" msgid "Media Selection" msgstr "" -#: steps_gtk.pm:252 +#: steps_gtk.pm:251 #, c-format msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:253 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:254 -#, c-format -msgid "Install %s MATE Desktop" -msgstr "" - -#: steps_gtk.pm:255 -#, c-format -msgid "Install %s Cinnamon Desktop" -msgstr "" - -#: steps_gtk.pm:256 -#, c-format -msgid "Install %s XFCE Desktop" -msgstr "" - -#: steps_gtk.pm:257 -#, c-format -msgid "Install %s LXDE Desktop" -msgstr "" - -#: steps_gtk.pm:258 -#, c-format -msgid "Install %s RazorQT Desktop" -msgstr "" - -#: steps_gtk.pm:259 -#, c-format -msgid "Install %s E17 Desktop" -msgstr "" - -#: steps_gtk.pm:260 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "" -#: steps_gtk.pm:286 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "" -#: steps_gtk.pm:287 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "" -#: steps_gtk.pm:288 -#, c-format -msgid "MATE Desktop" -msgstr "" - -#: steps_gtk.pm:289 -#, c-format -msgid "Cinnamon Desktop" -msgstr "" - -#: steps_gtk.pm:290 -#, c-format -msgid "XFCE Desktop" -msgstr "" - -#: steps_gtk.pm:291 -#, c-format -msgid "LXDE Desktop" -msgstr "" - -#: steps_gtk.pm:292 -#, c-format -msgid "RazorQT Desktop" -msgstr "" - -#: steps_gtk.pm:293 -#, c-format -msgid "E17 Desktop" -msgstr "" - -#: steps_gtk.pm:294 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "" -#: steps_gtk.pm:300 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "" msgstr[1] "" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "" @@ -1151,7 +1089,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1160,7 +1098,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1312,46 +1250,14 @@ msgstr "" msgid "GNOME" msgstr "" -#: steps_interactive.pm:485 -#, c-format -msgid "MATE" -msgstr "" - -#: steps_interactive.pm:486 -#, c-format -msgid "CINNAMON" -msgstr "" - #: steps_interactive.pm:487 #, c-format -msgid "XFCE" -msgstr "" - -#: steps_interactive.pm:488 -#, c-format -msgid "LXDE" -msgstr "" - -#: steps_interactive.pm:489 -#, c-format -msgid "RAZOR" -msgstr "" - -#: steps_interactive.pm:490 -#, c-format -msgid "E17" -msgstr "" - -#: steps_interactive.pm:494 -#, c-format msgid "Desktop Selection" msgstr "" -#: steps_interactive.pm:495 +#: steps_interactive.pm:488 #, c-format -msgid "" -"You can choose your workstation desktop profile.\n" -"Select 'Custom' for more choices." +msgid "You can choose your workstation desktop profile." msgstr "" #: steps_interactive.pm:576 @@ -1470,101 +1376,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1573,24 +1479,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1598,12 +1504,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "" diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po index cdbee19ee..016a7e5fc 100644 --- a/perl-install/install/share/po/af.po +++ b/perl-install/install/share/po/af.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-af\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-04-21 17:33+0200\n" "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n" "Language-Team: Afrikaans\n" @@ -78,7 +78,7 @@ msgid "Do you have further supplementary media?" msgstr "Beskik u oor nog?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,177 +87,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CDROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Netwerk %s" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Netwerk %s" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Kontak %s se webwerf vir 'n lys van spieëlwebplekke...." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "Kontak %s se webwerf vir 'n lys van spieëlwebplekke...." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Kies 'n spieël waar die pakkette verkry kan word" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Gids" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Kan nie %s op %s vind nie" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Ondersoek pakette wat reeds geïnstalleer is..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Soek vir pakkette om op te gradeer..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -270,73 +270,73 @@ msgstr "" "\n" "Wil u werklik dat ons hulle verwyder?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fout met die lees van lêer %s" # -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Die volgende pakkette geïnstalleer word:\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "Ftp" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "PFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Netwerk" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Kies asseblief" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Lêer bestaan alreeds. Moet dit gebruik word?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Toegang verbied" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Kan nie skermfoto's neem voor partisie skep nie" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s" @@ -346,7 +346,7 @@ msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s" msgid "Installation" msgstr "Besig met installasie" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurasie" @@ -442,42 +442,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "'n Fout het voorgekom" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "'n Ernstige fout het voorgekom: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "onsuksesvolle installasie" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Installeer pakket %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Werkstasie" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kantoorwerkstasie" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -486,32 +486,32 @@ msgstr "" "Kantoorprogramme: Woordverwerkers(LibreOffice Writer, Kword), spreistate " "(LibreOffice Calc, Kspread), PDF-sigprogramme, ens." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Speletjiesrekenaar" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Vermaak: Arkade, Bordspel, Strategie ens." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Multimediastasie" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Klank- en videospelers/redigeerders" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internetstasie" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -520,195 +520,195 @@ msgstr "" "Stel hulpprogramme om e-pos en netnuus te lees en te stuur (mutt, tin) en om " "ook die web deur te blaai." -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Netwerkrekenaar (kliënt)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konsole Hulpprogramme" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" "Redigeerders. teksverwerkers, instruksiedoppe, lêer-nutsprogramme, terminaal-" "programme" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Ontwikkeling" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentasie" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Derdeparty ondersteuning van programme" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web-bediener" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "Groep:" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab-bediener" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Vuurmuur/Netwerkroteerder" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internetpoort" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Lêer/_Nuut" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix e-pos-bediener" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Herstel vanaf CD" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-bediener" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domeinnaam en Netwerk-informasie-bediener (DNS/NIS)" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Drukkerbediener" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "Samba-bediener" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Databasis" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL of MariaDB databasisbediener" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "e-Pos" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix e-pos-bediener" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL of MariaDB databasisbediener" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Netwerkrekenaar-bediener" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS, SMB, Instaan- , SSH (Bedieners)" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafiese Omgewing" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE Werkstasie" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -717,12 +717,12 @@ msgstr "" "Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n " "versameling bygaande hulpprogramme" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME-werkstasie" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -731,12 +731,41 @@ msgstr "" "'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " "werkskerm-hulpprogramme" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE Werkstasie" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " +"werkskerm-hulpprogramme" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME-werkstasie" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Werkstasie" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafiese Omgewing" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "'n Werkstasie" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -745,52 +774,74 @@ msgstr "" "'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " "werkskerm-hulpprogramme" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "'n Werkstasie" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " +"werkskerm-hulpprogramme" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Ander Grafiese Werkskerms" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Nutsprogramme" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-bediener" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Webkamera" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Terminal Server Konfigurasie" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Monitor van Netwerk" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "<b>Mageia Store</b>" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Probleme met die konfigurasie van drukker \" %s\"!" @@ -804,7 +855,7 @@ msgstr "" "'n Fout het plaasgevind en ek weet nie hoe om dit veilig te hanteer\n" "nie. Gaan op u eie risiko voort." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -861,107 +912,107 @@ msgstr "Kies Pakketgroepe" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimale installasie" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "'n Werkstasie" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "'n Werkstasie" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "'n Werkstasie" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Kies Pakketgroepe" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individuele pakket-seleksie" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Herstel Keuses" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Totale grootte: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Weergawe: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Grootte: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Belangrikheid: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "U kan nie hierdie pakket selekteer/deselekteer nie" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "deur %s wat soek is" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "deur problematiese %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "probeer promosie van %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "om %s te kan behou" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -970,104 +1021,104 @@ msgstr "" "U kan nie hierdie pakket selekteer nie, omdat daar nie meer spasie " "beskikbaar is nie" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Ons gaan die volgende pakette installeer" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Die volgende pakkette gaan verwyder word" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Hierdie is 'n verpligte pakket. Dit kan nie uitgehaal word nie." -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "U kan nie heirdie pakket verwyder nie. Dis alreeds geïnstalleer" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "U kan nie hierdie pakket deselekteer nie. Dit moet opgradeer word." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Wys outogeselekteerde pakkette." -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installasie" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Pakketkeuse" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Pakketseleksie word opgedateer" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimale installasie" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Sagteware Beheer" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Kies die pakkette wat u wil installeer" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Besig met installasie" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Geen Detail" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Tyd oor " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Skatting" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakket" msgstr[1] "%d pakkette" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Opsomming" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigureer" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nie gekonfigureer nie" @@ -1079,7 +1130,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1088,7 +1139,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1388,102 +1439,102 @@ msgstr "" "Wil u dit nou installeer?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s op %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardeware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Klankkaart" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Beskik u oor 'n ISA klankkaart?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "Loop \"sndconfig\" na die installasie om u klankkaart te konfigureer" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Geen klankkaart opgespoor nie. Probeer \"harddrake\" na die installasie" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafiese-koppelvlak" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Netwerk & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Instaan bedieners" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "gekonfigureer" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Sekuriteitsvlak" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Vuurmuur" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "ge-aktiveer" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "ge-deaktiveer" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "U het nog nie 'X' opgestel nie. Verlang u dit regtig?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Herlaaistelsel word voorberei..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Berei installasie voor" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1496,7 +1547,7 @@ msgstr "" "Ons sal voortgaan met die installasie, maar u sal\n" "BootX of 'n ander manier moet gedruik om u rekenaar te selflaai" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1505,17 +1556,17 @@ msgstr "" "Met hierdie sekuriteitsvlak word toegang na lêers op die Windows partisie " "vernou na slegs die administrateur" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Sit 'n leë floppie in aandrywer %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Outoinstallasieskyf word geskep." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1526,12 +1577,12 @@ msgstr "" "\n" "Wil u werklik nou eindig?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Geluk" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Herlaai" diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po index 478862e1c..da98d5a6a 100644 --- a/perl-install/install/share/po/am.po +++ b/perl-install/install/share/po/am.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-06-01 03:36+0100\n" "Last-Translator: Alemayehu <alemayehu@gmx.at>\n" "Language-Team: Amharic <am-translate@geez.org>\n" @@ -71,7 +71,7 @@ msgid "Do you have further supplementary media?" msgstr "ሌላ አለ?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -80,177 +80,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "ሲዲ-ሮም" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "መረብ" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "መረብ" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "ዶሴ" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -259,72 +259,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%sን በማንበብ ላይ ስህተት ተፈጥሯል" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "መረብ" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "እባክዎ ያለ ሰነድን ይምረጡ" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "ፋይሉ በፊትም ነበር። ልጠቀምበት?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "ፈቃድ አልተሰጠም" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "ፋይል ተጭኗል %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -334,7 +334,7 @@ msgstr "" msgid "Installation" msgstr "በመትከል ላይ" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "ስየማ" @@ -428,343 +428,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "ስህተት ተፈጥሯል" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr ""
trigger_error($user->lang['MOVE_POSTS_NO_POSTABLE_FORUM'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
// Two stage?
// Move topics comprising only posts from this user
$topic_id_ary = $move_topic_ary = $move_post_ary = $new_topic_id_ary = array();
$forum_id_ary = array($new_forum_id);
$sql = 'SELECT topic_id, post_visibility, COUNT(post_id) AS total_posts
FROM ' . POSTS_TABLE . "
WHERE poster_id = $user_id
AND forum_id <> $new_forum_id
GROUP BY topic_id, post_visibility";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$topic_id_ary[$row['topic_id']][$row['post_visibility']] = $row['total_posts'];
}
$db->sql_freeresult($result);
if (sizeof($topic_id_ary))
{
$sql = 'SELECT topic_id, forum_id, topic_title, topic_posts_approved, topic_posts_unapproved, topic_posts_softdeleted, topic_attachment
FROM ' . TOPICS_TABLE . '
WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
if ($topic_id_ary[$row['topic_id']][ITEM_APPROVED] == $row['topic_posts_approved']
&& $topic_id_ary[$row['topic_id']][ITEM_UNAPPROVED] == $row['topic_posts_unapproved']
&& $topic_id_ary[$row['topic_id']][ITEM_REAPPROVE] == $row['topic_posts_unapproved']
&& $topic_id_ary[$row['topic_id']][ITEM_DELETED] == $row['topic_posts_softdeleted'])
{
$move_topic_ary[] = $row['topic_id'];
}
else
{
$move_post_ary[$row['topic_id']]['title'] = $row['topic_title'];
$move_post_ary[$row['topic_id']]['attach'] = ($row['topic_attachment']) ? 1 : 0;
}
$forum_id_ary[] = $row['forum_id'];
}
$db->sql_freeresult($result);
}
// Entire topic comprises posts by this user, move these topics
if (sizeof($move_topic_ary))
{
move_topics($move_topic_ary, $new_forum_id, false);
}
if (sizeof($move_post_ary))
{
// Create new topic
// Update post_ids, report_ids, attachment_ids
foreach ($move_post_ary as $topic_id => $post_ary)
{
// Create new topic
$sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
'topic_poster' => $user_id,
'topic_time' => time(),
'forum_id' => $new_forum_id,
'icon_id' => 0,
'topic_visibility' => ITEM_APPROVED,
'topic_title' => $post_ary['title'],
'topic_first_poster_name' => $user_row['username'],
'topic_type' => POST_NORMAL,
'topic_time_limit' => 0,
'topic_attachment' => $post_ary['attach'])
);
$db->sql_query($sql);
$new_topic_id = $db->sql_nextid();
// Move posts
$sql = 'UPDATE ' . POSTS_TABLE . "
SET forum_id = $new_forum_id, topic_id = $new_topic_id
WHERE topic_id = $topic_id
AND poster_id = $user_id";
$db->sql_query($sql);
if ($post_ary['attach'])
{
$sql = 'UPDATE ' . ATTACHMENTS_TABLE . "
SET topic_id = $new_topic_id
WHERE topic_id = $topic_id
AND poster_id = $user_id";
$db->sql_query($sql);
}
$new_topic_id_ary[] = $new_topic_id;
}
}
$forum_id_ary = array_unique($forum_id_ary);
$topic_id_ary = array_unique(array_merge(array_keys($topic_id_ary), $new_topic_id_ary));
if (sizeof($topic_id_ary))
{
sync('topic_reported', 'topic_id', $topic_id_ary);
sync('topic', 'topic_id', $topic_id_ary);
}
if (sizeof($forum_id_ary))
{
sync('forum', 'forum_id', $forum_id_ary, false, true);
}
add_log('admin', 'LOG_USER_MOVE_POSTS', $user_row['username'], $forum_info['forum_name']);
add_log('user', $user_id, 'LOG_USER_MOVE_POSTS_USER', $forum_info['forum_name']);
trigger_error($user->lang['USER_POSTS_MOVED'] . adm_back_link($this->u_action . '&u=' . $user_id));
break;
case 'leave_nr':
if (confirm_box(true))
{
remove_newly_registered($user_id, $user_row);
add_log('admin', 'LOG_USER_REMOVED_NR', $user_row['username']);
trigger_error($user->lang['USER_LIFTED_NR'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'u' => $user_id,
'i' => $id,
'mode' => $mode,
'action' => $action,
'update' => true))
);
}
break;
default:
/**
* Run custom quicktool code
*
* @event core.acp_users_overview_run_quicktool
* @var array user_row Current user data
* @var string action Quick tool that should be run
* @since 3.1.0-a1
*/
$vars = array('action', 'user_row');
extract($phpbb_dispatcher->trigger_event('core.acp_users_overview_run_quicktool', compact($vars)));
break;
}
// Handle registration info updates
$data = array(
'username' => utf8_normalize_nfc(request_var('user', $user_row['username'], true)),
'user_founder' => request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0),
'email' => strtolower(request_var('user_email', $user_row['user_email'])),
'new_password' => $request->variable('new_password', '', true),
'password_confirm' => $request->variable('password_confirm', '', true),
);
// Validation data - we do not check the password complexity setting here
$check_ary = array(
'new_password' => array(
array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
array('password')),
'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
);
// Check username if altered
if ($data['username'] != $user_row['username'])
{
$check_ary += array(
'username' => array(
array('string', false, $config['min_name_chars'], $config['max_name_chars']),
array('username', $user_row['username'])
),
);
}
// Check email if altered
if ($data['email'] != $user_row['user_email'])
{
$check_ary += array(
'email' => array(
array('string', false, 6, 60),
array('user_email', $user_row['user_email']),
),
);
}
$error = validate_data($data, $check_ary);
if ($data['new_password'] && $data['password_confirm'] != $data['new_password'])
{
$error[] = 'NEW_PASSWORD_ERROR';
}
if (!check_form_key($form_name))
{
$error[] = 'FORM_INVALID';
}
// Instantiate passwords manager
$passwords_manager = $phpbb_container->get('passwords.manager');
// Which updates do we need to do?
$update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false;
$update_password = $data['new_password'] && !$passwords_manager->check($data['new_password'], $user_row['user_password']);
$update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false;
if (!sizeof($error))
{
$sql_ary = array();
if ($user_row['user_type'] != USER_FOUNDER || $user->data['user_type'] == USER_FOUNDER)
{
// Only allow founders updating the founder status...
if ($user->data['user_type'] == USER_FOUNDER)
{
// Setting a normal member to be a founder
if ($data['user_founder'] && $user_row['user_type'] != USER_FOUNDER)
{
// Make sure the user is not setting an Inactive or ignored user to be a founder
if ($user_row['user_type'] == USER_IGNORE)
{
trigger_error($user->lang['CANNOT_SET_FOUNDER_IGNORED'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
if ($user_row['user_type'] == USER_INACTIVE)
{
trigger_error($user->lang['CANNOT_SET_FOUNDER_INACTIVE'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
$sql_ary['user_type'] = USER_FOUNDER;
}
else if (!$data['user_founder'] && $user_row['user_type'] == USER_FOUNDER)
{
// Check if at least one founder is present
$sql = 'SELECT user_id
FROM ' . USERS_TABLE . '
WHERE user_type = ' . USER_FOUNDER . '
AND user_id <> ' . $user_id;
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if ($row)
{
$sql_ary['user_type'] = USER_NORMAL;
}
else
{
trigger_error($user->lang['AT_LEAST_ONE_FOUNDER'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
}
}
}
/**
* Modify user data before we update it
*
* @event core.acp_users_overview_modify_data
* @var array user_row Current user data
* @var array data Submitted user data
* @var array sql_ary User data we udpate
* @since 3.1.0-a1
*/
$vars = array('user_row', 'data', 'sql_ary');
extract($phpbb_dispatcher->trigger_event('core.acp_users_overview_modify_data', compact($vars)));
if ($update_username !== false)
{
$sql_ary['username'] = $update_username;
$sql_ary['username_clean'] = utf8_clean_string($update_username);
add_log('user', $user_id, 'LOG_USER_UPDATE_NAME', $user_row['username'], $update_username);
}
if ($update_email !== false)
{
$sql_ary += array(
'user_email' => $update_email,
'user_email_hash' => phpbb_email_hash($update_email),
);
add_log('user', $user_id, 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email);
}
if ($update_password)
{
$sql_ary += array(
'user_password' => $passwords_manager->hash($data['new_password']),
'user_passchg' => time(),
);
$user->reset_login_keys($user_id);
add_log('user', $user_id, 'LOG_USER_NEW_PASSWORD', $user_row['username']);
}
if (sizeof($sql_ary))
{
$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE user_id = ' . $user_id;
$db->sql_query($sql);
}
if ($update_username)
{
user_update_name($user_row['username'], $update_username);
}
// Let the users permissions being updated
$auth->acl_clear_prefetch($user_id);
add_log('admin', 'LOG_USER_USER_UPDATE', $data['username']);
trigger_error($user->lang['USER_OVERVIEW_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
// Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error);
}
if ($user_id == $user->data['user_id'])
{
$quick_tool_ary = array('delsig' => 'DEL_SIG', 'delavatar' => 'DEL_AVATAR', 'moveposts' => 'MOVE_POSTS', 'delposts' => 'DEL_POSTS', 'delattach' => 'DEL_ATTACH', 'deloutbox' => 'DEL_OUTBOX');
if ($user_row['user_new'])
{
$quick_tool_ary['leave_nr'] = 'LEAVE_NR';
}
}
else
{
$quick_tool_ary = array();
if ($user_row['user_type'] != USER_FOUNDER)
{
$quick_tool_ary += array('banuser' => 'BAN_USER', 'banemail' => 'BAN_EMAIL', 'banip' => 'BAN_IP');
}
if ($user_row['user_type'] != USER_FOUNDER && $user_row['user_type'] != USER_IGNORE)
{
$quick_tool_ary += array('active' => (($user_row['user_type'] == USER_INACTIVE) ? 'ACTIVATE' : 'DEACTIVATE'));
}
$quick_tool_ary += array('delsig' => 'DEL_SIG', 'delavatar' => 'DEL_AVATAR', 'moveposts' => 'MOVE_POSTS', 'delposts' => 'DEL_POSTS', 'delattach' => 'DEL_ATTACH', 'deloutbox' => 'DEL_OUTBOX');
if ($config['email_enable'] && ($user_row['user_type'] == USER_NORMAL || $user_row['user_type'] == USER_INACTIVE))
{
$quick_tool_ary['reactivate'] = 'FORCE';
}
if ($user_row['user_new'])
{
$quick_tool_ary['leave_nr'] = 'LEAVE_NR';
}
}
if ($config['load_onlinetrack'])
{
$sql = 'SELECT MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline
FROM ' . SESSIONS_TABLE . "
WHERE session_user_id = $user_id";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$user_row['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0;
$user_row['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0;
unset($row);
}
/**
* Add additional quick tool options and overwrite user data
*
* @event core.acp_users_display_overview
* @var array user_row Array with user data
* @var array quick_tool_ary Ouick tool options
* @since 3.1.0-a1
*/
$vars = array('user_row', 'quick_tool_ary');
extract($phpbb_dispatcher->trigger_event('core.acp_users_display_overview', compact($vars)));
$s_action_options = '<option class="sep" value="">' . $user->lang['SELECT_OPTION'] . '</option>';
foreach ($quick_tool_ary as $value => $lang)
{
$s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
}
$last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit'];
$inactive_reason = '';
if ($user_row['user_type'] == USER_INACTIVE)
{
$inactive_reason = $user->lang['INACTIVE_REASON_UNKNOWN'];
switch ($user_row['user_inactive_reason'])
{
case INACTIVE_REGISTER:
$inactive_reason = $user->lang['INACTIVE_REASON_REGISTER'];
break;
case INACTIVE_PROFILE:
$inactive_reason = $user->lang['INACTIVE_REASON_PROFILE'];
break;
case INACTIVE_MANUAL:
$inactive_reason = $user->lang['INACTIVE_REASON_MANUAL'];
break;
case INACTIVE_REMIND:
$inactive_reason = $user->lang['INACTIVE_REASON_REMIND'];
break;
}
}
// Posts in Queue
$sql = 'SELECT COUNT(post_id) as posts_in_queue
FROM ' . POSTS_TABLE . '
WHERE poster_id = ' . $user_id . '
AND ' . $db->sql_in_set('post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE));
$result = $db->sql_query($sql);
$user_row['posts_in_queue'] = (int) $db->sql_fetchfield('posts_in_queue');
$db->sql_freeresult($result);
$sql = 'SELECT post_id
FROM ' . POSTS_TABLE . '
WHERE poster_id = '. $user_id;
$result = $db->sql_query_limit($sql, 1);
$user_row['user_has_posts'] = (bool) $db->sql_fetchfield('post_id');
$db->sql_freeresult($result);
$template->assign_vars(array(
'L_NAME_CHARS_EXPLAIN' => $user->lang($config['allow_name_chars'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_name_chars']), $user->lang('CHARACTERS', (int) $config['max_name_chars'])),
'L_CHANGE_PASSWORD_EXPLAIN' => $user->lang($config['pass_complex'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_pass_chars']), $user->lang('CHARACTERS', (int) $config['max_pass_chars'])),
'L_POSTS_IN_QUEUE' => $user->lang('NUM_POSTS_IN_QUEUE', $user_row['posts_in_queue']),
'S_FOUNDER' => ($user->data['user_type'] == USER_FOUNDER) ? true : false,
'S_OVERVIEW' => true,
'S_USER_IP' => ($user_row['user_ip']) ? true : false,
'S_USER_FOUNDER' => ($user_row['user_type'] == USER_FOUNDER) ? true : false,
'S_ACTION_OPTIONS' => $s_action_options,
'S_OWN_ACCOUNT' => ($user_id == $user->data['user_id']) ? true : false,
'S_USER_INACTIVE' => ($user_row['user_type'] == USER_INACTIVE) ? true : false,
'U_SHOW_IP' => $this->u_action . "&u=$user_id&ip=" . (($ip == 'ip') ? 'hostname' : 'ip'),
'U_WHOIS' => $this->u_action . "&action=whois&user_ip={$user_row['user_ip']}",
'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '',
'U_SEARCH_USER' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$user_row['user_id']}&sr=posts") : '',
'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_row['user_id']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&u={$user_row['user_id']}&hash=" . generate_link_hash('switchperm')) : '',
'POSTS_IN_QUEUE' => $user_row['posts_in_queue'],
'USER' => $user_row['username'],
'USER_REGISTERED' => $user->format_date($user_row['user_regdate']),
'REGISTERED_IP' => ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'],
'USER_LASTACTIVE' => ($last_active) ? $user->format_date($last_active) : ' - ',
'USER_EMAIL' => $user_row['user_email'],
'USER_WARNINGS' => $user_row['user_warnings'],
'USER_POSTS' => $user_row['user_posts'],
'USER_HAS_POSTS' => $user_row['user_has_posts'],
'USER_INACTIVE_REASON' => $inactive_reason,
));
break;
case 'feedback':
$user->add_lang('mcp');
// Set up general vars
$start = request_var('start', 0);
$deletemark = (isset($_POST['delmarked'])) ? true : false;
$deleteall = (isset($_POST['delall'])) ? true : false;
$marked = request_var('mark', array(0));
$message = utf8_normalize_nfc(request_var('message', '', true));
$pagination = $phpbb_container->get('pagination');
// Sort keys
$sort_days = request_var('st', 0);
$sort_key = request_var('sk', 't');
$sort_dir = request_var('sd', 'd');
// Delete entries if requested and able
if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs'))
{
if (!check_form_key($form_name))
{
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
$where_sql = '';
if ($deletemark && $marked)
{
$sql_in = array();
foreach ($marked as $mark)
{
$sql_in[] = $mark;
}
$where_sql = ' AND ' . $db->sql_in_set('log_id', $sql_in);
unset($sql_in);
}
if ($where_sql || $deleteall)
{
$sql = 'DELETE FROM ' . LOG_TABLE . '
WHERE log_type = ' . LOG_USERS . "
AND reportee_id = $user_id
$where_sql";
$db->sql_query($sql);
add_log('admin', 'LOG_CLEAR_USER', $user_row['username']);
}
}
if ($submit && $message)
{
if (!check_form_key($form_name))
{
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
add_log('admin', 'LOG_USER_FEEDBACK', $user_row['username']);
add_log('mod', 0, 0, 'LOG_USER_FEEDBACK', $user_row['username']);
add_log('user', $user_id, 'LOG_USER_GENERAL', $message);
trigger_error($user->lang['USER_FEEDBACK_ADDED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
// Sorting
$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
$sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']);
$sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation');
$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
// Define where and sort sql for use in displaying logs
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
// Grab log data
$log_data = array();
$log_count = 0;
$start = view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
$base_url = $this->u_action . "&u=$user_id&$u_sort_param";
$pagination->generate_template_pagination($base_url, 'pagination', 'start', $log_count, $config['topics_per_page'], $start);
$template->assign_vars(array(
'S_FEEDBACK' => true,
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'))
);
foreach ($log_data as $row)
{
$template->assign_block_vars('log', array(
'USERNAME' => $row['username_full'],
'IP' => $row['ip'],
'DATE' => $user->format_date($row['time']),
'ACTION' => nl2br($row['action']),
'ID' => $row['id'])
);
}
break;
case 'warnings':
$user->add_lang('mcp');
// Set up general vars
$start = request_var('start', 0);
$deletemark = (isset($_POST['delmarked'])) ? true : false;
$deleteall = (isset($_POST['delall'])) ? true : false;
$confirm = (isset($_POST['confirm'])) ? true : false;
$marked = request_var('mark', array(0));
$message = utf8_normalize_nfc(request_var('message', '', true));
// Sort keys
$sort_days = request_var('st', 0);
$sort_key = request_var('sk', 't');
$sort_dir = request_var('sd', 'd');
// Delete entries if requested and able
if ($deletemark || $deleteall || $confirm)
{
if (confirm_box(true))
{
$where_sql = '';
$deletemark = request_var('delmarked', 0);
$deleteall = request_var('delall', 0);
if ($deletemark && $marked)
{
$where_sql = ' AND ' . $db->sql_in_set('warning_id', array_values($marked));
}
if ($where_sql || $deleteall)
{
$sql = 'DELETE FROM ' . WARNINGS_TABLE . "
WHERE user_id = $user_id
$where_sql";
$db->sql_query($sql);
if ($deleteall)
{
$log_warnings = $deleted_warnings = 0;
}
else
{
$num_warnings = (int) $db->sql_affectedrows();
$deleted_warnings = ' user_warnings - ' . $num_warnings;
$log_warnings = ($num_warnings > 2) ? 2 : $num_warnings;
}
$sql = 'UPDATE ' . USERS_TABLE . "
SET user_warnings = $deleted_warnings
WHERE user_id = $user_id";
$db->sql_query($sql);
if ($log_warnings)
{
add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings);
}
else
{
add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']);
}
}
}
else
{
$s_hidden_fields = array(
'i' => $id,
'mode' => $mode,
'u' => $user_id,
'mark' => $marked,
);
if (isset($_POST['delmarked']))
{
$s_hidden_fields['delmarked'] = 1;
}
if (isset($_POST['delall']))
{
$s_hidden_fields['delall'] = 1;
}
if (isset($_POST['delall']) || (isset($_POST['delmarked']) && sizeof($marked)))
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields));
}
}
}
$sql = 'SELECT w.warning_id, w.warning_time, w.post_id, l.log_operation, l.log_data, l.user_id AS mod_user_id, m.username AS mod_username, m.user_colour AS mod_user_colour
FROM ' . WARNINGS_TABLE . ' w
LEFT JOIN ' . LOG_TABLE . ' l
ON (w.log_id = l.log_id)
LEFT JOIN ' . USERS_TABLE . ' m
ON (l.user_id = m.user_id)
WHERE w.user_id = ' . $user_id . '
ORDER BY w.warning_time DESC';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
if (!$row['log_operation'])
{
// We do not have a log-entry anymore, so there is no data available
$row['action'] = $user->lang['USER_WARNING_LOG_DELETED'];
}
else
{
$row['action'] = (isset($user->lang[$row['log_operation']])) ? $user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}';
if (!empty($row['log_data']))
{
$log_data_ary = @unserialize($row['log_data']);
$log_data_ary = ($log_data_ary === false) ? array() : $log_data_ary;
if (isset($user->lang[$row['log_operation']]))
{
// Check if there are more occurrences of % than arguments, if there are we fill out the arguments array
// It doesn't matter if we add more arguments than placeholders
if ((substr_count($row['action'], '%') - sizeof($log_data_ary)) > 0)
{
$log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($row['action'], '%') - sizeof($log_data_ary), ''));
}
$row['action'] = vsprintf($row['action'], $log_data_ary);
$row['action'] = bbcode_nl2br(censor_text($row['action']));
}
else if (!empty($log_data_ary))
{
$row['action'] .= '<br />' . implode('', $log_data_ary);
}
}
}
$template->assign_block_vars('warn', array(
'ID' => $row['warning_id'],
'USERNAME' => ($row['log_operation']) ? get_username_string('full', $row['mod_user_id'], $row['mod_username'], $row['mod_user_colour']) : '-',
'ACTION' => make_clickable($row['action']),
'DATE' => $user->format_date($row['warning_time']),
));
}
$db->sql_freeresult($result);
$template->assign_vars(array(
'S_WARNINGS' => true,
));
break;
case 'profile':
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$cp = $phpbb_container->get('profilefields.manager');
$cp_data = $cp_error = array();
$sql = 'SELECT lang_id
FROM ' . LANG_TABLE . "
WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$user_row['iso_lang_id'] = $row['lang_id'];
$data = array(
'jabber' => utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
'bday_day' => 0,
'bday_month' => 0,
'bday_year' => 0,
);
if ($user_row['user_birthday'])
{
list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user_row['user_birthday']);
}
$data['bday_day'] = request_var('bday_day', $data['bday_day']);
$data['bday_month'] = request_var('bday_month', $data['bday_month']);
$data['bday_year'] = request_var('bday_year', $data['bday_year']);
$data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']);
if ($submit)
{
$error = validate_data($data, array(
'jabber' => array(
array('string', true, 5, 255),
array('jabber')),
'bday_day' => array('num', true, 1, 31),
'bday_month' => array('num', true, 1, 12),
'bday_year' => array('num', true, 1901, gmdate('Y', time())),
'user_birthday' => array('date', true),
));
// validate custom profile fields
$cp->submit_cp_field('profile', $user_row['iso_lang_id'], $cp_data, $cp_error);
if (sizeof($cp_error))
{
$error = array_merge($error, $cp_error);
}
if (!check_form_key($form_name))
{
$error[] = 'FORM_INVALID';
}
if (!sizeof($error))
{
$sql_ary = array(
'user_jabber' => $data['jabber'],
'user_birthday' => $data['user_birthday'],
);
$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
WHERE user_id = $user_id";
$db->sql_query($sql);
// Update Custom Fields
$cp->update_profile_field_data($user_id, $cp_data);
trigger_error($user->lang['USER_PROFILE_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
// Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error);
}
$s_birthday_day_options = '<option value="0"' . ((!$data['bday_day']) ? ' selected="selected"' : '') . '>--</option>';
for ($i = 1; $i < 32; $i++)
{
$selected = ($i == $data['bday_day']) ? ' selected="selected"' : '';
$s_birthday_day_options .= "<option value=\"$i\"$selected>$i</option>";
}
$s_birthday_month_options = '<option value="0"' . ((!$data['bday_month']) ? ' selected="selected"' : '') . '>--</option>';
for ($i = 1; $i < 13; $i++)
{
$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';
$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";
}
$s_birthday_year_options = '';
$now = getdate();
$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';
for ($i = $now['year'] - 100; $i <= $now['year']; $i++)
{
$selected = ($i == $data['bday_year']) ? ' selected="selected"' : '';
$s_birthday_year_options .= "<option value=\"$i\"$selected>$i</option>";
}
unset($now);
$template->assign_vars(array(
'JABBER' => $data['jabber'],
'S_BIRTHDAY_DAY_OPTIONS' => $s_birthday_day_options,
'S_BIRTHDAY_MONTH_OPTIONS' => $s_birthday_month_options,
'S_BIRTHDAY_YEAR_OPTIONS' => $s_birthday_year_options,
'S_PROFILE' => true)
);
// Get additional profile fields and assign them to the template block var 'profile_fields'
$user->get_profile_fields($user_id);
$cp->generate_profile_fields('profile', $user_row['iso_lang_id']);
break;
case 'prefs':
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$data = array(
'dateformat' => utf8_normalize_nfc(request_var('dateformat', $user_row['user_dateformat'], true)),
'lang' => basename(request_var('lang', $user_row['user_lang'])),
'tz' => request_var('tz', $user_row['user_timezone']),
'style' => request_var('style', $user_row['user_style']),
'viewemail' => request_var('viewemail', $user_row['user_allow_viewemail']),
'massemail' => request_var('massemail', $user_row['user_allow_massemail']),
'hideonline' => request_var('hideonline', !$user_row['user_allow_viewonline']),
'notifymethod' => request_var('notifymethod', $user_row['user_notify_type']),
'notifypm' => request_var('notifypm', $user_row['user_notify_pm']),
'allowpm' => request_var('allowpm', $user_row['user_allow_pm']),
'topic_sk' => request_var('topic_sk', ($user_row['user_topic_sortby_type']) ? $user_row['user_topic_sortby_type'] : 't'),
'topic_sd' => request_var('topic_sd', ($user_row['user_topic_sortby_dir']) ? $user_row['user_topic_sortby_dir'] : 'd'),
'topic_st' => request_var('topic_st', ($user_row['user_topic_show_days']) ? $user_row['user_topic_show_days'] : 0),
'post_sk' => request_var('post_sk', ($user_row['user_post_sortby_type']) ? $user_row['user_post_sortby_type'] : 't'),
'post_sd' => request_var('post_sd', ($user_row['user_post_sortby_dir']) ? $user_row['user_post_sortby_dir'] : 'a'),
'post_st' => request_var('post_st', ($user_row['user_post_show_days']) ? $user_row['user_post_show_days'] : 0),
'view_images' => request_var('view_images', $this->optionget($user_row, 'viewimg')),
'view_flash' => request_var('view_flash', $this->optionget($user_row, 'viewflash')),
'view_smilies' => request_var('view_smilies', $this->optionget($user_row, 'viewsmilies')),
'view_sigs' => request_var('view_sigs', $this->optionget($user_row, 'viewsigs')),
'view_avatars' => request_var('view_avatars', $this->optionget($user_row, 'viewavatars')),
'view_wordcensor' => request_var('view_wordcensor', $this->optionget($user_row, 'viewcensors')),
'bbcode' => request_var('bbcode', $this->optionget($user_row, 'bbcode')),
'smilies' => request_var('smilies', $this->optionget($user_row, 'smilies')),
'sig' => request_var('sig', $this->optionget($user_row, 'attachsig')),
'notify' => request_var('notify', $user_row['user_notify']),
);
/**
* Modify users preferences data
*
* @event core.acp_users_prefs_modify_data
* @var array data Array with users preferences data
* @var array user_row Array with user data
* @since 3.1.0-b3
*/
$vars = array('data', 'user_row');
extract($phpbb_dispatcher->trigger_event('core.acp_users_prefs_modify_data', compact($vars)));
if ($submit)
{
$error = validate_data($data, array(
'dateformat' => array('string', false, 1, 30),
'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'),
'tz' => array('timezone'),
'topic_sk' => array('string', false, 1, 1),
'topic_sd' => array('string', false, 1, 1),
'post_sk' => array('string', false, 1, 1),
'post_sd' => array('string', false, 1, 1),
));
if (!check_form_key($form_name))
{
$error[] = 'FORM_INVALID';
}
if (!sizeof($error))
{
$this->optionset($user_row, 'viewimg', $data['view_images']);
$this->optionset($user_row, 'viewflash', $data['view_flash']);
$this->optionset($user_row, 'viewsmilies', $data['view_smilies']);
$this->optionset($user_row, 'viewsigs', $data['view_sigs']);
$this->optionset($user_row, 'viewavatars', $data['view_avatars']);
$this->optionset($user_row, 'viewcensors', $data['view_wordcensor']);
$this->optionset($user_row, 'bbcode', $data['bbcode']);
$this->optionset($user_row, 'smilies', $data['smilies']);
$this->optionset($user_row, 'attachsig', $data['sig']);
$sql_ary = array(
'user_options' => $user_row['user_options'],
'user_allow_pm' => $data['allowpm'],
'user_allow_viewemail' => $data['viewemail'],
'user_allow_massemail' => $data['massemail'],
'user_allow_viewonline' => !$data['hideonline'],
'user_notify_type' => $data['notifymethod'],
'user_notify_pm' => $data['notifypm'],
'user_dateformat' => $data['dateformat'],
'user_lang' => $data['lang'],
'user_timezone' => $data['tz'],
'user_style' => $data['style'],
'user_topic_sortby_type' => $data['topic_sk'],
'user_post_sortby_type' => $data['post_sk'],
'user_topic_sortby_dir' => $data['topic_sd'],
'user_post_sortby_dir' => $data['post_sd'],
'user_topic_show_days' => $data['topic_st'],
'user_post_show_days' => $data['post_st'],
'user_notify' => $data['notify'],
);
/**
* Modify SQL query before users preferences are updated
*
* @event core.acp_users_prefs_modify_sql
* @var array data Array with users preferences data
* @var array user_row Array with user data
* @var array sql_ary SQL array with users preferences data to update
* @var array error Array with errors data
* @since 3.1.0-b3
*/
$vars = array('data', 'user_row', 'sql_ary', 'error');
extract($phpbb_dispatcher->trigger_event('core.acp_users_prefs_modify_sql', compact($vars)));
if (!sizeof($error))
{
$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
WHERE user_id = $user_id";
$db->sql_query($sql);
// Check if user has an active session
if ($user_row['session_id'])
{
// We'll update the session if user_allow_viewonline has changed and the user is a bot
// Or if it's a regular user and the admin set it to hide the session
if ($user_row['user_allow_viewonline'] != $sql_ary['user_allow_viewonline'] && $user_row['user_type'] == USER_IGNORE
|| $user_row['user_allow_viewonline'] && !$sql_ary['user_allow_viewonline'])
{
// We also need to check if the user has the permission to cloak.
$user_auth = new \phpbb\auth\auth();
$user_auth->acl($user_row);
$session_sql_ary = array(
'session_viewonline' => ($user_auth->acl_get('u_hideonline')) ? $sql_ary['user_allow_viewonline'] : true,
);
$sql = 'UPDATE ' . SESSIONS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $session_sql_ary) . "
WHERE session_user_id = $user_id";
$db->sql_query($sql);
unset($user_auth);
}
}
trigger_error($user->lang['USER_PREFS_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
}
// Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error);
}
$dateformat_options = '';
foreach ($user->lang['dateformats'] as $format => $null)
{
$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
$dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time(), $format, true) : '');
$dateformat_options .= '</option>';
}
$s_custom = false;
$dateformat_options .= '<option value="custom"';
if (!isset($user->lang['dateformats'][$data['dateformat']]))
{
$dateformat_options .= ' selected="selected"';
$s_custom = true;
}
$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
$sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
// Topic ordering options
$limit_topic_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
$sort_by_topic_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']);
// Post ordering options
$limit_post_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
$sort_by_post_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
$_options = array('topic', 'post');
foreach ($_options as $sort_option)
{
${'s_limit_' . $sort_option . '_days'} = '<select name="' . $sort_option . '_st">';
foreach (${'limit_' . $sort_option . '_days'} as $day => $text)
{
$selected = ($data[$sort_option . '_st'] == $day) ? ' selected="selected"' : '';
${'s_limit_' . $sort_option . '_days'} .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
}
${'s_limit_' . $sort_option . '_days'} .= '</select>';
${'s_sort_' . $sort_option . '_key'} = '<select name="' . $sort_option . '_sk">';
foreach (${'sort_by_' . $sort_option . '_text'} as $key => $text)
{
$selected = ($data[$sort_option . '_sk'] == $key) ? ' selected="selected"' : '';
${'s_sort_' . $sort_option . '_key'} .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
}
${'s_sort_' . $sort_option . '_key'} .= '</select>';
${'s_sort_' . $sort_option . '_dir'} = '<select name="' . $sort_option . '_sd">';
foreach ($sort_dir_text as $key => $value)
{
$selected = ($data[$sort_option . '_sd'] == $key) ? ' selected="selected"' : '';
${'s_sort_' . $sort_option . '_dir'} .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
}
${'s_sort_' . $sort_option . '_dir'} .= '</select>';
}
$timezone_selects = phpbb_timezone_select($user, $data['tz'], true);
$user_prefs_data = array(
'S_PREFS' => true,
'S_JABBER_DISABLED' => ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
'VIEW_EMAIL' => $data['viewemail'],
'MASS_EMAIL' => $data['massemail'],
'ALLOW_PM' => $data['allowpm'],
'HIDE_ONLINE' => $data['hideonline'],
'NOTIFY_EMAIL' => ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
'NOTIFY_IM' => ($data['notifymethod'] == NOTIFY_IM) ? true : false,
'NOTIFY_BOTH' => ($data['notifymethod'] == NOTIFY_BOTH) ? true : false,
'NOTIFY_PM' => $data['notifypm'],
'BBCODE' => $data['bbcode'],
'SMILIES' => $data['smilies'],
'ATTACH_SIG' => $data['sig'],
'NOTIFY' => $data['notify'],
'VIEW_IMAGES' => $data['view_images'],
'VIEW_FLASH' => $data['view_flash'],
'VIEW_SMILIES' => $data['view_smilies'],
'VIEW_SIGS' => $data['view_sigs'],
'VIEW_AVATARS' => $data['view_avatars'],
'VIEW_WORDCENSOR' => $data['view_wordcensor'],
'S_TOPIC_SORT_DAYS' => $s_limit_topic_days,
'S_TOPIC_SORT_KEY' => $s_sort_topic_key,
'S_TOPIC_SORT_DIR' => $s_sort_topic_dir,
'S_POST_SORT_DAYS' => $s_limit_post_days,
'S_POST_SORT_KEY' => $s_sort_post_key,
'S_POST_SORT_DIR' => $s_sort_post_dir,
'DATE_FORMAT' => $data['dateformat'],
'S_DATEFORMAT_OPTIONS' => $dateformat_options,
'S_CUSTOM_DATEFORMAT' => $s_custom,
'DEFAULT_DATEFORMAT' => $config['default_dateformat'],
'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']),
'S_LANG_OPTIONS' => language_select($data['lang']),
'S_STYLE_OPTIONS' => style_select($data['style']),
'S_TZ_OPTIONS' => $timezone_selects['tz_select'],
'S_TZ_DATE_OPTIONS' => $timezone_selects['tz_dates'],
);
/**
* Modify users preferences data before assigning it to the template
*
* @event core.acp_users_prefs_modify_template_data
* @var array data Array with users preferences data
* @var array user_row Array with user data
* @var array user_prefs_data Array with users preferences data to be assigned to the template
* @since 3.1.0-b3
*/
$vars = array('data', 'user_row', 'user_prefs_data');
extract($phpbb_dispatcher->trigger_event('core.acp_users_prefs_modify_template_data', compact($vars)));
$template->assign_vars($user_prefs_data);
break;
case 'avatar':
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
$avatars_enabled = false;
if ($config['allow_avatar'])
{
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the user_ prefix
$avatar_data = \phpbb\avatar\manager::clean_row($user_row, 'user');
if ($submit)
{
if (check_form_key($form_name))
{
$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
{
$driver = $phpbb_avatar_manager->get_driver($driver_name);
$result = $driver->process_form($request, $template, $user, $avatar_data, $error);
if ($result && empty($error))
{
// Success! Lets save the result in the database
$result = array(
'user_avatar_type' => $driver_name,
'user_avatar' => $result['avatar'],
'user_avatar_width' => $result['avatar_width'],
'user_avatar_height' => $result['avatar_height'],
);
$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . (int) $user_id;
$db->sql_query($sql);
trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
}
else
{
$driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']);
if ($driver)
{
$driver->delete($avatar_data);
}
// Removing the avatar
$result = array(
'user_avatar' => '',
'user_avatar_type' => '',
'user_avatar_width' => 0,
'user_avatar_height' => 0,
);
$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . (int) $user_id;
$db->sql_query($sql);
trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
}
else
{
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
}
$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
foreach ($avatar_drivers as $current_driver)
{
$driver = $phpbb_avatar_manager->get_driver($current_driver);
$avatars_enabled = true;
$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
$template->set_filenames(array(
'avatar' => "acp_avatar_options_{$config_name}.html",
));
if ($driver->prepare_form($request, $template, $user, $avatar_data, $error))
{
$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
$driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name,
'SELECTED' => $current_driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'),
));
}
}
}
// Replace "error" strings with their real, localised form
$error = $phpbb_avatar_manager->localize_errors($user, $error);
$avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true);
$template->assign_vars(array(
'S_AVATAR' => true,
'ERROR' => (!empty($error)) ? implode('<br />', $error) : '',
'AVATAR' => (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',
'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled),
));
break;
case 'rank':
if ($submit)
{
if (!check_form_key($form_name))
{
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
$rank_id = request_var('user_rank', 0);
$sql = 'UPDATE ' . USERS_TABLE . "
SET user_rank = $rank_id
WHERE user_id = $user_id";
$db->sql_query($sql);
trigger_error($user->lang['USER_RANK_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
$sql = 'SELECT *
FROM ' . RANKS_TABLE . '
WHERE rank_special = 1
ORDER BY rank_title';
$result = $db->sql_query($sql);
$s_rank_options = '<option value="0"' . ((!$user_row['user_rank']) ? ' selected="selected"' : '') . '>' . $user->lang['NO_SPECIAL_RANK'] . '</option>';
while ($row = $db->sql_fetchrow($result))
{
$selected = ($user_row['user_rank'] && $row['rank_id'] == $user_row['user_rank']) ? ' selected="selected"' : '';
$s_rank_options .= '<option value="' . $row['rank_id'] . '"' . $selected . '>' . $row['rank_title'] . '</option>';
}
$db->sql_freeresult($result);
$template->assign_vars(array(
'S_RANK' => true,
'S_RANK_OPTIONS' => $s_rank_options)
);
break;
case 'sig':
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
$enable_bbcode = ($config['allow_sig_bbcode']) ? (bool) $this->optionget($user_row, 'sig_bbcode') : false;
$enable_smilies = ($config['allow_sig_smilies']) ? (bool) $this->optionget($user_row, 'sig_smilies') : false;
$enable_urls = ($config['allow_sig_links']) ? (bool) $this->optionget($user_row, 'sig_links') : false;
$signature = utf8_normalize_nfc(request_var('signature', (string) $user_row['user_sig'], true));
$preview = (isset($_POST['preview'])) ? true : false;
if ($submit || $preview)
{
include_once($phpbb_root_path . 'includes/message_parser.' . $phpEx);
$enable_bbcode = ($config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', false)) ? false : true) : false;
$enable_smilies = ($config['allow_sig_smilies']) ? ((request_var('disable_smilies', false)) ? false : true) : false;
$enable_urls = ($config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false;
$message_parser = new parse_message($signature);
// Allowing Quote BBCode
$message_parser->parse($enable_bbcode, $enable_urls, $enable_smilies, $config['allow_sig_img'], $config['allow_sig_flash'], true, $config['allow_sig_links'], true, 'sig');
if (sizeof($message_parser->warn_msg))
{
$error[] = implode('<br />', $message_parser->warn_msg);
}
if (!check_form_key($form_name))
{
$error = 'FORM_INVALID';
}
if (!sizeof($error) && $submit)
{
$this->optionset($user_row, 'sig_bbcode', $enable_bbcode);
$this->optionset($user_row, 'sig_smilies', $enable_smilies);
$this->optionset($user_row, 'sig_links', $enable_urls);
$sql_ary = array(
'user_sig' => (string) $message_parser->message,
'user_options' => $user_row['user_options'],
'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid,
'user_sig_bbcode_bitfield' => (string) $message_parser->bbcode_bitfield
);
$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE user_id = ' . $user_id;
$db->sql_query($sql);
trigger_error($user->lang['USER_SIG_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id));
}
// Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error);
}
$signature_preview = '';
if ($preview)
{
// Now parse it for displaying
$signature_preview = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
unset($message_parser);
}
decode_message($signature, $user_row['user_sig_bbcode_uid']);
$template->assign_vars(array(
'S_SIGNATURE' => true,
'SIGNATURE' => $signature,
'SIGNATURE_PREVIEW' => $signature_preview,
'S_BBCODE_CHECKED' => (!$enable_bbcode) ? ' checked="checked"' : '',
'S_SMILIES_CHECKED' => (!$enable_smilies) ? ' checked="checked"' : '',
'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? ' checked="checked"' : '',
'BBCODE_STATUS' => ($config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</a>'),
'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
'FLASH_STATUS' => ($config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],
'URL_STATUS' => ($config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
'L_SIGNATURE_EXPLAIN' => $user->lang('SIGNATURE_EXPLAIN', (int) $config['max_sig_chars']),
'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'],
'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'],
'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false,
'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false,
'S_LINKS_ALLOWED' => ($config['allow_sig_links']) ? true : false)
);
// Assigning custom bbcodes
display_custom_bbcodes();
break;
case 'attach':
$start = request_var('start', 0);
$deletemark = (isset($_POST['delmarked'])) ? true : false;
$marked = request_var('mark', array(0));
$pagination = $phpbb_container->get('pagination');
// Sort keys
$sort_key = request_var('sk', 'a');
$sort_dir = request_var('sd', 'd');
if ($deletemark && sizeof($marked))
{
$sql = 'SELECT attach_id
FROM ' . ATTACHMENTS_TABLE . '
WHERE poster_id = ' . $user_id . '
AND is_orphan = 0
AND ' . $db->sql_in_set('attach_id', $marked);
$result = $db->sql_query($sql);
$marked = array();
while ($row = $db->sql_fetchrow($result))
{
$marked[] = $row['attach_id'];
}
$db->sql_freeresult($result);
}
if ($deletemark && sizeof($marked))
{
if (confirm_box(true))
{
$sql = 'SELECT real_filename
FROM ' . ATTACHMENTS_TABLE . '
WHERE ' . $db->sql_in_set('attach_id', $marked);
$result = $db->sql_query($sql);
$log_attachments = array();
while ($row = $db->sql_fetchrow($result))
{
$log_attachments[] = $row['real_filename'];
}
$db->sql_freeresult($result);
delete_attachments('attach', $marked);
$message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED'];
add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode($user->lang['COMMA_SEPARATOR'], $log_attachments));
trigger_error($message . adm_back_link($this->u_action . '&u=' . $user_id));
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'u' => $user_id,
'i' => $id,
'mode' => $mode,
'action' => $action,
'delmarked' => true,
'mark' => $marked))
);
}
}
$sk_text = array('a' => $user->lang['SORT_FILENAME'], 'c' => $user->lang['SORT_EXTENSION'], 'd' => $user->lang['SORT_SIZE'], 'e' => $user->lang['SORT_DOWNLOADS'], 'f' => $user->lang['SORT_POST_TIME'], 'g' => $user->lang['SORT_TOPIC_TITLE']);
$sk_sql = array('a' => 'a.real_filename', 'c' => 'a.extension', 'd' => 'a.filesize', 'e' => 'a.download_count', 'f' => 'a.filetime', 'g' => 't.topic_title');
$sd_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
$s_sort_key = '';
foreach ($sk_text as $key => $value)
{
$selected = ($sort_key == $key) ? ' selected="selected"' : '';
$s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
}
$s_sort_dir = '';
foreach ($sd_text as $key => $value)
{
$selected = ($sort_dir == $key) ? ' selected="selected"' : '';
$s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
}
if (!isset($sk_sql[$sort_key]))
{
$sort_key = 'a';
}
$order_by = $sk_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
$sql = 'SELECT COUNT(attach_id) as num_attachments
FROM ' . ATTACHMENTS_TABLE . "
WHERE poster_id = $user_id
AND is_orphan = 0";
$result = $db->sql_query_limit($sql, 1);
$num_attachments = (int) $db->sql_fetchfield('num_attachments');
$db->sql_freeresult($result);
$sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title
FROM ' . ATTACHMENTS_TABLE . ' a
LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id
AND a.in_message = 0)
LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id
AND a.in_message = 1)
WHERE a.poster_id = ' . $user_id . "
AND a.is_orphan = 0
ORDER BY $order_by";
$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
while ($row = $db->sql_fetchrow($result))
{
if ($row['in_message'])
{
$view_topic = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&p={$row['post_msg_id']}");
}
else
{
$view_topic = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t={$row['topic_id']}&p={$row['post_msg_id']}") . '#p' . $row['post_msg_id'];
}
$template->assign_block_vars('attach', array(
'REAL_FILENAME' => $row['real_filename'],
'COMMENT' => nl2br($row['attach_comment']),
'EXTENSION' => $row['extension'],
'SIZE' => get_formatted_filesize($row['filesize']),
'DOWNLOAD_COUNT' => $row['download_count'],
'POST_TIME' => $user->format_date($row['filetime']),
'TOPIC_TITLE' => ($row['in_message']) ? $row['message_title'] : $row['topic_title'],
'ATTACH_ID' => $row['attach_id'],
'POST_ID' => $row['post_msg_id'],
'TOPIC_ID' => $row['topic_id'],
'S_IN_MESSAGE' => $row['in_message'],
'U_DOWNLOAD' => append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&id=' . $row['attach_id']),
'U_VIEW_TOPIC' => $view_topic)
);
}
$db->sql_freeresult($result);
$base_url = $this->u_action . "&u=$user_id&sk=$sort_key&sd=$sort_dir";
$pagination->generate_template_pagination($base_url, 'pagination', 'start', $num_attachments, $config['topics_per_page'], $start);
$template->assign_vars(array(
'S_ATTACHMENTS' => true,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
));
break;
case 'groups':
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$user->add_lang(array('groups', 'acp/groups'));
$group_id = request_var('g', 0);
if ($group_id)
{
// Check the founder only entry for this group to make sure everything is well
$sql = 'SELECT group_founder_manage
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $group_id;
$result = $db->sql_query($sql);
$founder_manage = (int) $db->sql_fetchfield('group_founder_manage');
$db->sql_freeresult($result);
if ($user->data['user_type'] != USER_FOUNDER && $founder_manage)
{
trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
}
else
{
$founder_manage = 0;
}
switch ($action)
{
case 'demote':
case 'promote':
case 'default':
if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
group_user_attributes($action, $group_id, $user_id);
if ($action == 'default')
{
$user_row['group_id'] = $group_id;
}
break;
case 'delete':
if (confirm_box(true))
{
if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
if ($error = group_user_del($group_id, $user_id))
{
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
$error = array();
// The delete action was successful - therefore update the user row...
$sql = 'SELECT u.*, s.*
FROM ' . USERS_TABLE . ' u
LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id)
WHERE u.user_id = ' . $user_id . '
ORDER BY s.session_time DESC';
$result = $db->sql_query_limit($sql, 1);
$user_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'u' => $user_id,
'i' => $id,
'mode' => $mode,
'action' => $action,
'g' => $group_id))
);
}
break;
case 'approve':
if (confirm_box(true))
{
if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
group_user_attributes($action, $group_id, $user_id);
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'u' => $user_id,
'i' => $id,
'mode' => $mode,
'action' => $action,
'g' => $group_id))
);
}
break;
}
// Add user to group?
if ($submit)
{
if (!check_form_key($form_name))
{
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
// Add user/s to group
if ($error = group_user_add($group_id, $user_id))
{
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
}
$error = array();
}
$sql = 'SELECT ug.*, g.*
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug
WHERE ug.user_id = $user_id
AND g.group_id = ug.group_id
ORDER BY g.group_type DESC, ug.user_pending ASC, g.group_name";
$result = $db->sql_query($sql);
$i = 0;
$group_data = $id_ary = array();
while ($row = $db->sql_fetchrow($result))
{
$type = ($row['group_type'] == GROUP_SPECIAL) ? 'special' : (($row['user_pending']) ? 'pending' : 'normal');
$group_data[$type][$i]['group_id'] = $row['group_id'];
$group_data[$type][$i]['group_name'] = $row['group_name'];
$group_data[$type][$i]['group_leader'] = ($row['group_leader']) ? 1 : 0;
$id_ary[] = $row['group_id'];
$i++;
}
$db->sql_freeresult($result);
// Select box for other groups
$sql = 'SELECT group_id, group_name, group_type, group_founder_manage
FROM ' . GROUPS_TABLE . '
' . ((sizeof($id_ary)) ? 'WHERE ' . $db->sql_in_set('group_id', $id_ary, true) : '') . '
ORDER BY group_type DESC, group_name ASC';
$result = $db->sql_query($sql);
$s_group_options = '';
while ($row = $db->sql_fetchrow($result))
{
if (!$config['coppa_enable'] && $row['group_name'] == 'REGISTERED_COPPA')
{
continue;
}
// Do not display those groups not allowed to be managed
if ($user->data['user_type'] != USER_FOUNDER && $row['group_founder_manage'])
{
continue;
}
$s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
}
$db->sql_freeresult($result);
$current_type = '';
foreach ($group_data as $group_type => $data_ary)
{
if ($current_type != $group_type)
{
$template->assign_block_vars('group', array(
'S_NEW_GROUP_TYPE' => true,
'GROUP_TYPE' => $user->lang['USER_GROUP_' . strtoupper($group_type)])
);
}
foreach ($data_ary as $data)
{
$template->assign_block_vars('group', array(
'U_EDIT_GROUP' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=groups&mode=manage&action=edit&u=$user_id&g={$data['group_id']}&back_link=acp_users_groups"),
'U_DEFAULT' => $this->u_action . "&action=default&u=$user_id&g=" . $data['group_id'],
'U_DEMOTE_PROMOTE' => $this->u_action . '&action=' . (($data['group_leader']) ? 'demote' : 'promote') . "&u=$user_id&g=" . $data['group_id'],
'U_DELETE' => $this->u_action . "&action=delete&u=$user_id&g=" . $data['group_id'],
'U_APPROVE' => ($group_type == 'pending') ? $this->u_action . "&action=approve&u=$user_id&g=" . $data['group_id'] : '',
'GROUP_NAME' => ($group_type == 'special') ? $user->lang['G_' . $data['group_name']] : $data['group_name'],
'L_DEMOTE_PROMOTE' => ($data['group_leader']) ? $user->lang['GROUP_DEMOTE'] : $user->lang['GROUP_PROMOTE'],
'S_IS_MEMBER' => ($group_type != 'pending') ? true : false,
'S_NO_DEFAULT' => ($user_row['group_id'] != $data['group_id']) ? true : false,
'S_SPECIAL_GROUP' => ($group_type == 'special') ? true : false,
)
);
}
}
$template->assign_vars(array(
'S_GROUPS' => true,
'S_GROUP_OPTIONS' => $s_group_options)
);
break;
case 'perm':
include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
$auth_admin = new auth_admin();
$user->add_lang('acp/permissions');
add_permission_language();
$forum_id = request_var('f', 0);
// Global Permissions
if (!$forum_id)
{
// Select auth options
$sql = 'SELECT auth_option, is_local, is_global
FROM ' . ACL_OPTIONS_TABLE . '
WHERE auth_option ' . $db->sql_like_expression($db->get_any_char() . '_') . '
AND is_global = 1
ORDER BY auth_option';
$result = $db->sql_query($sql);
$hold_ary = array();
while ($row = $db->sql_fetchrow($result))
{
$hold_ary = $auth_admin->get_mask('view', $user_id, false, false, $row['auth_option'], 'global', ACL_NEVER);
$auth_admin->display_mask('view', $row['auth_option'], $hold_ary, 'user', false, false);
}
$db->sql_freeresult($result);
unset($hold_ary);
}
else
{
$sql = 'SELECT auth_option, is_local, is_global
FROM ' . ACL_OPTIONS_TABLE . "
WHERE auth_option " . $db->sql_like_expression($db->get_any_char() . '_') . "
AND is_local = 1
ORDER BY is_global DESC, auth_option";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$hold_ary = $auth_admin->get_mask('view', $user_id, false, $forum_id, $row['auth_option'], 'local', ACL_NEVER);
$auth_admin->display_mask('view', $row['auth_option'], $hold_ary, 'user', true, false);
}
$db->sql_freeresult($result);
}
$s_forum_options = '<option value="0"' . ((!$forum_id) ? ' selected="selected"' : '') . '>' . $user->lang['VIEW_GLOBAL_PERMS'] . '</option>';
$s_forum_options .= make_forum_select($forum_id, false, true, false, false, false);
$template->assign_vars(array(
'S_PERMISSIONS' => true,
'S_GLOBAL' => (!$forum_id) ? true : false,
'S_FORUM_OPTIONS' => $s_forum_options,
'U_ACTION' => $this->u_action . '&u=' . $user_id,
'U_USER_PERMISSIONS' => append_sid("{$phpbb_admin_path}index.$phpEx" ,'i=permissions&mode=setting_user_global&user_id[]=' . $user_id),
'U_USER_FORUM_PERMISSIONS' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions&mode=setting_user_local&user_id[]=' . $user_id))
);
break;
}
// Assign general variables
$template->assign_vars(array(
'S_ERROR' => (sizeof($error)) ? true : false,
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '')
);
}
/**
* Set option bit field for user options in a user row array.
*
* Optionset replacement for this module based on $user->optionset.
*
* @param array $user_row Row from the users table.
* @param int $key Option key, as defined in $user->keyoptions property.
* @param bool $value True to set the option, false to clear the option.
* @param int $data Current bit field value, or false to use $user_row['user_options']
* @return int|bool If $data is false, the bit field is modified and
* written back to $user_row['user_options'], and
* return value is true if the bit field changed and
* false otherwise. If $data is not false, the new
* bitfield value is returned.
*/
function optionset(&$user_row, $key, $value, $data = false)
{
global $user;
$var = ($data !== false) ? $data : $user_row['user_options'];
$new_var = phpbb_optionset($user->keyoptions[$key], $value, $var);
if ($data === false)
{
if ($new_var != $var)
{
$user_row['user_options'] = $new_var;
return true;
}
else
{
return false;
}
}
else
{
return $new_var;
}
}
/**
* Get option bit field from user options in a user row array.
*
* Optionget replacement for this module based on $user->optionget.
*
* @param array $user_row Row from the users table.
* @param int $key option key, as defined in $user->keyoptions property.
* @param int $data bit field value to use, or false to use $user_row['user_options']
* @return bool true if the option is set in the bit field, false otherwise
*/
function optionget(&$user_row, $key, $data = false)
{
global $user;
$var = ($data !== false) ? $data : $user_row['user_options'];
return phpbb_optionget($user->keyoptions[$key], $var);
}
}
|