diff --git a/AUTHORS b/AUTHORS
index 70680cf4..6152d894 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
 This file is no longer maintained.  Please see git log for the most
 up to date list about contributions.
 
-$ git clone git://gitorious.org/procps/procps.git
+$ git clone git@gitlab.com:procps-ng/procps.git
 # cd procps
 $ git shortlog --no-merges -sne
 
diff --git a/ChangeLog b/ChangeLog
index d8e7b248..19063d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,3 @@
 See git log.
 
-https://gitorious.org/procps/procps/commits/master
+https://gitlab.com/procps-ng/procps/commits/master
diff --git a/NEWS b/NEWS
index 08fb48e3..d47f40d2 100644
--- a/NEWS
+++ b/NEWS
@@ -188,7 +188,7 @@ procps-ng-3.3.0 --> procps-ng-3.3.1
 procps-3.2.8 --> procps-ng-3.3.0
 ------------------------------------------------------
 Debian, Fedora and openSUSE fork of procps.
-https://gitorious.org/procps
+https://gitlab.com/procps-ng/procps
 
 environment/build changes:
  . autotools integrated
@@ -237,7 +237,7 @@ top changes:
  . improved performance up to 300%
 
 Debian, Fedora and openSUSE fork of procps.
-https://gitorious.org/procps
+https://gitlab.com/procps-ng/procps
 ------------------------------------------------------
 
 procps-3.2.8 --> procps-3.2.9 (pending)
diff --git a/configure.ac b/configure.ac
index 79ba3c7e..fd7d4ca0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ([2.69])
 AC_CONFIG_MACRO_DIR([m4])
 AC_INIT([procps-ng],
 	m4_esyscmd([misc/git-version-gen .tarball-version]),
-	[procps@freelists.org],,[http://gitorious.org/procps])
+	[procps@freelists.org],,[https://gitlab.com/procps-ng/procps])
 AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 AC_CONFIG_SRCDIR([free.c])
diff --git a/po/de.po b/po/de.po
index fca20ede..e6d84069 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: procps-ng-3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-01-24 19:06+1100\n"
+"POT-Creation-Date: 2015-05-09 16:51+1000\n"
 "PO-Revision-Date: 2014-09-10 20:18+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:443
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [OPTIONEN]\n"
@@ -28,15 +28,18 @@ msgid " -b, --bytes         show output in bytes\n"
 msgstr " -b, --bytes         Ausgabe in Byte anzeigen\n"
 
 #: free.c:77
-msgid " -k, --kilo          show output in kilobytes\n"
+#, fuzzy
+msgid "     --kilo          show output in kilobytes\n"
 msgstr " -k, --kilo          Ausgabe in Kilobyte anzeigen\n"
 
 #: free.c:78
-msgid " -m, --mega          show output in megabytes\n"
+#, fuzzy
+msgid "     --mega          show output in megabytes\n"
 msgstr " -m, --mega          Ausgabe in Megabyte anzeigen\n"
 
 #: free.c:79
-msgid " -g, --giga          show output in gigabytes\n"
+#, fuzzy
+msgid "     --giga          show output in gigabytes\n"
 msgstr " -g, --giga          Ausgabe in Gigabyte anzeigen\n"
 
 #: free.c:80
@@ -44,59 +47,93 @@ msgid "     --tera          show output in terabytes\n"
 msgstr "     --tera          Ausgabe in Terabyte anzeigen\n"
 
 #: free.c:81
+#, fuzzy
+msgid "     --peta          show output in petabytes\n"
+msgstr "     --tera          Ausgabe in Terabyte anzeigen\n"
+
+#: free.c:82
+#, fuzzy
+msgid " -k, --kibi          show output in kibibytes\n"
+msgstr " -k, --kilo          Ausgabe in Kilobyte anzeigen\n"
+
+#: free.c:83
+#, fuzzy
+msgid " -m, --mebi          show output in mebibytes\n"
+msgstr " -m, --mega          Ausgabe in Megabyte anzeigen\n"
+
+#: free.c:84
+#, fuzzy
+msgid " -g, --gibi          show output in gibibytes\n"
+msgstr " -g, --giga          Ausgabe in Gigabyte anzeigen\n"
+
+#: free.c:85
+#, fuzzy
+msgid "     --tebi          show output in tebibytes\n"
+msgstr "     --tera          Ausgabe in Terabyte anzeigen\n"
+
+#: free.c:86
+#, fuzzy
+msgid "     --pebi          show output in pebibytes\n"
+msgstr "     --tera          Ausgabe in Terabyte anzeigen\n"
+
+#: free.c:87
 msgid " -h, --human         show human-readable output\n"
 msgstr " -h, --human         menschenlesbare Ausgabe\n"
 
-#: free.c:82
+#: free.c:88
 msgid "     --si            use powers of 1000 not 1024\n"
 msgstr "     --si            Potenzen von 1000 und nicht 1024 verwenden\n"
 
-#: free.c:83
+#: free.c:89
 msgid " -l, --lohi          show detailed low and high memory statistics\n"
 msgstr ""
 " -l, --lohi          detaillierte Statistiken für hohe und niedrige\n"
 "                     Speicherbelegung anzeigen\n"
 
-#: free.c:84
+#: free.c:90
 msgid " -t, --total         show total for RAM + swap\n"
 msgstr " -t, --total         Gesamtgröße von RAM + Swap anzeigen\n"
 
-#: free.c:85
+#: free.c:91
 msgid " -s N, --seconds N   repeat printing every N seconds\n"
 msgstr " -s N, --seconds N   Ausgabe alle N Sekunden wiederholen\n"
 
-#: free.c:86
+#: free.c:92
 msgid " -c N, --count N     repeat printing N times, then exit\n"
 msgstr " -c N, --count N     Ausgabe N-mal wiederholen, dann beenden\n"
 
-#: free.c:87
+#: free.c:93
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          breite Ausgabe\n"
 
-#: free.c:89 w.c:452
+#: free.c:95 w.c:456
 msgid "     --help     display this help and exit\n"
 msgstr "      --help     diese Hilfe anzeigen und beenden\n"
 
-#: free.c:267
+#: free.c:198
+msgid "Multiple unit options doesn't make sense."
+msgstr ""
+
+#: free.c:328
 #, c-format
 msgid "seconds argument `%s' failed"
 msgstr "Sekunden-Argument »%s« fehlgeschlagen "
 
-#: free.c:270
+#: free.c:331
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "Sekunden-Argument »%s« ist keine positive Zahl"
 
-#: free.c:276
+#: free.c:337
 msgid "failed to parse count argument"
 msgstr "Anzahl im Argument konnte nicht verarbeitet werden"
 
-#: free.c:279
+#: free.c:340
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "Anzahl im Argument konnte nicht verarbeitet werden: »%s«"
 
-#: free.c:300
+#: free.c:361
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -105,7 +142,7 @@ msgstr ""
 "              gesamt       benutzt     frei      gemeins.   Puffer        "
 "Cache   verfügbar"
 
-#: free.c:302
+#: free.c:363
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -114,23 +151,23 @@ msgstr ""
 "              gesamt       benutzt     frei      gemns.  Puffer/Cache "
 "verfügbar"
 
-#: free.c:305
+#: free.c:366
 msgid "Mem:"
 msgstr "Speicher:"
 
-#: free.c:325
+#: free.c:386
 msgid "Low:"
 msgstr "Niedrig:"
 
-#: free.c:331
+#: free.c:392
 msgid "High:"
 msgstr "Hoch:"
 
-#: free.c:338
+#: free.c:399
 msgid "Swap:"
 msgstr "Swap:"
 
-#: free.c:345
+#: free.c:406
 msgid "Total:"
 msgstr "Gesamt:"
 
@@ -513,7 +550,7 @@ msgid " total %8ldK\n"
 msgstr " gesamt %8ldK\n"
 
 #: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:704
+#: vmstat.c:959 vmstat.c:968 watch.c:707
 msgid "failed to parse argument"
 msgstr "Argument konnte nicht eingelesen werden"
 
@@ -2087,7 +2124,7 @@ msgid "Effective User Id"
 msgstr "Effektive Benutzer‐ID"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:586
+#: top/top_nls.c:133 w.c:590
 msgid "USER"
 msgstr "USER"
 
@@ -3949,143 +3986,143 @@ msgstr ""
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  Versionsinformation anzeigen und beenden\n"
 
-#: watch.c:372
+#: watch.c:375
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Alle %.1fs: "
 
-#: watch.c:433
+#: watch.c:436
 msgid "unable to create IPC pipes"
 msgstr "IPC-Pipes konnten nicht angelegt werden"
 
-#: watch.c:443
+#: watch.c:446
 msgid "unable to fork process"
 msgstr "Prozess kann nicht geforkt werden"
 
-#: watch.c:448
+#: watch.c:451
 msgid "dup2 failed"
 msgstr "dup2 fehlgeschlagen"
 
-#: watch.c:455
+#: watch.c:458
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "»%s« kann nicht ausgeführt werden"
 
-#: watch.c:472
+#: watch.c:475
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:618
+#: watch.c:621
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:626
+#: watch.c:629
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "der Befehl wurde mit einem von Null verschiedenen Exit-Status beendet, "
 "drücken Sie eine Taste zum Beenden"
 
-#: watch.c:751
+#: watch.c:754
 #, c-format
 msgid "unicode handling error\n"
 msgstr "Unicode-Verarbeitungsfehler\n"
 
-#: watch.c:757
+#: watch.c:760
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "Unicode-Verarbeitungsfehler (malloc)\n"
 
-#: w.c:236 w.c:251
+#: w.c:240 w.c:255
 #, c-format
 msgid " %2ludays"
 msgstr " %2lu Tage"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:245 w.c:255
+#: w.c:249 w.c:259
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02u m"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:263
+#: w.c:267
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02u s"
 
-#: w.c:445
+#: w.c:449
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     keinen Header ausgeben\n"
 
-#: w.c:446
+#: w.c:450
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    Benutzername des aktuellen Prozesses ignorieren\n"
 
-#: w.c:447
+#: w.c:451
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         Kurzformat\n"
 
-#: w.c:448
+#: w.c:452
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          Feld für entfernten Rechnernamen anzeigen\n"
 
-#: w.c:449
+#: w.c:453
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     Ausgabe im alten Stil\n"
 
-#: w.c:450
+#: w.c:454
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       IP-Adresse anstelle des Rechnernamens anzeigen\n"
 "                     (falls möglich)\n"
 
-#: w.c:547
+#: w.c:551
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
 msgstr ""
 
-#: w.c:557
+#: w.c:561
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
 msgstr ""
 
-#: w.c:569
+#: w.c:573
 #, c-format
 msgid "%d column window is too narrow"
 msgstr "Fenster mit %d Spalten ist zu klein"
 
-#: w.c:571
+#: w.c:575
 #, c-format
 msgid "%d column width exceeds command buffer size, truncating to %d"
 msgstr ""
 "die Breite der Spalte %d überschreitet die Puffergröße des Befehls, wird auf "
 "%d abgeschnitten "
 
-#: w.c:577
+#: w.c:581
 #, c-format
 msgid "warning: screen width %d suboptimal"
 msgstr "Warnung: Bildschirmbreite %d ist nicht optimal"
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:586
+#: w.c:590
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:588
+#: w.c:592
 msgid "FROM"
 msgstr "VON"
 
-#: w.c:590
+#: w.c:594
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr ""
 
-#: w.c:592
+#: w.c:596
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index c7fa1561..900b004b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: procps-ng 3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-01-24 19:06+1100\n"
+"POT-Creation-Date: 2015-05-09 16:51+1000\n"
 "PO-Revision-Date: 2014-09-12 09:22+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:443
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [options]\n"
@@ -39,15 +39,18 @@ msgid " -b, --bytes         show output in bytes\n"
 msgstr " -b, --bytes         afficher la sortie en octets\n"
 
 #: free.c:77
-msgid " -k, --kilo          show output in kilobytes\n"
+#, fuzzy
+msgid "     --kilo          show output in kilobytes\n"
 msgstr " -k, --kilo          afficher la sortie en kilo-octets\n"
 
 #: free.c:78
-msgid " -m, --mega          show output in megabytes\n"
+#, fuzzy
+msgid "     --mega          show output in megabytes\n"
 msgstr " -m, --mega          afficher la sortie en méga-octets\n"
 
 #: free.c:79
-msgid " -g, --giga          show output in gigabytes\n"
+#, fuzzy
+msgid "     --giga          show output in gigabytes\n"
 msgstr " -g, --giga          afficher la sortie en giga-octets\n"
 
 #: free.c:80
@@ -55,60 +58,94 @@ msgid "     --tera          show output in terabytes\n"
 msgstr "     --tera          afficher la sortie en téra-octets\n"
 
 #: free.c:81
+#, fuzzy
+msgid "     --peta          show output in petabytes\n"
+msgstr "     --tera          afficher la sortie en téra-octets\n"
+
+#: free.c:82
+#, fuzzy
+msgid " -k, --kibi          show output in kibibytes\n"
+msgstr " -k, --kilo          afficher la sortie en kilo-octets\n"
+
+#: free.c:83
+#, fuzzy
+msgid " -m, --mebi          show output in mebibytes\n"
+msgstr " -m, --mega          afficher la sortie en méga-octets\n"
+
+#: free.c:84
+#, fuzzy
+msgid " -g, --gibi          show output in gibibytes\n"
+msgstr " -g, --giga          afficher la sortie en giga-octets\n"
+
+#: free.c:85
+#, fuzzy
+msgid "     --tebi          show output in tebibytes\n"
+msgstr "     --tera          afficher la sortie en téra-octets\n"
+
+#: free.c:86
+#, fuzzy
+msgid "     --pebi          show output in pebibytes\n"
+msgstr "     --tera          afficher la sortie en téra-octets\n"
+
+#: free.c:87
 msgid " -h, --human         show human-readable output\n"
 msgstr ""
 " -h, --human         afficher la sortie sous forme lisible par un humain\n"
 
-#: free.c:82
+#: free.c:88
 msgid "     --si            use powers of 1000 not 1024\n"
 msgstr "     --si            utiliser des puissances de 1000 au lieu de 1024\n"
 
-#: free.c:83
+#: free.c:89
 msgid " -l, --lohi          show detailed low and high memory statistics\n"
 msgstr ""
 " -l, --lohi          afficher des statistiques détaillées pour les mémoires "
 "basse et haute\n"
 
-#: free.c:84
+#: free.c:90
 msgid " -t, --total         show total for RAM + swap\n"
 msgstr " -t, --total         afficher le total de la RAM + swap\n"
 
-#: free.c:85
+#: free.c:91
 msgid " -s N, --seconds N   repeat printing every N seconds\n"
 msgstr " -s N, --seconds N   répéter l'affichage toutes les N secondes\n"
 
-#: free.c:86
+#: free.c:92
 msgid " -c N, --count N     repeat printing N times, then exit\n"
 msgstr " -c N, --count N     répéter l'affichage N fois puis termine\n"
 
-#: free.c:87
+#: free.c:93
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          sortie large\n"
 
-#: free.c:89 w.c:452
+#: free.c:95 w.c:456
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     afficher cette aide et termine\n"
 
-#: free.c:267
+#: free.c:198
+msgid "Multiple unit options doesn't make sense."
+msgstr ""
+
+#: free.c:328
 #, c-format
 msgid "seconds argument `%s' failed"
 msgstr "l'argument des secondes « %s » n'est pas valable"
 
-#: free.c:270
+#: free.c:331
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "l'argument des secondes « %s » n'est pas un nombre positif"
 
-#: free.c:276
+#: free.c:337
 msgid "failed to parse count argument"
 msgstr "l'argument du nombre de répétitions ne peut pas être décodé"
 
-#: free.c:279
+#: free.c:340
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "échec du décodage de l'argument du nombre de répétitions: « %s »"
 
-#: free.c:300
+#: free.c:361
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -117,7 +154,7 @@ msgstr ""
 "              total       utilisé      libre     partagé    tampons       "
 "cache   disponible"
 
-#: free.c:302
+#: free.c:363
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -126,23 +163,23 @@ msgstr ""
 "              total       utilisé      libre     partagé tamp/cache   "
 "disponible"
 
-#: free.c:305
+#: free.c:366
 msgid "Mem:"
 msgstr "Mem:"
 
-#: free.c:325
+#: free.c:386
 msgid "Low:"
 msgstr "Basse:"
 
-#: free.c:331
+#: free.c:392
 msgid "High:"
 msgstr "Haute:"
 
-#: free.c:338
+#: free.c:399
 msgid "Swap:"
 msgstr "Partition d'échange:"
 
-#: free.c:345
+#: free.c:406
 msgid "Total:"
 msgstr "Total:"
 
@@ -527,7 +564,7 @@ msgid " total %8ldK\n"
 msgstr " total %8ldK\n"
 
 #: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:704
+#: vmstat.c:959 vmstat.c:968 watch.c:707
 msgid "failed to parse argument"
 msgstr "échec de l'analyse de l'argument"
 
@@ -2106,7 +2143,7 @@ msgid "Effective User Id"
 msgstr "ID util. effectif"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:586
+#: top/top_nls.c:133 w.c:590
 msgid "USER"
 msgstr "UTIL."
 
@@ -4097,99 +4134,99 @@ msgstr ""
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  affiche les informations de version et sort\n"
 
-#: watch.c:372
+#: watch.c:375
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Toutes les %.1lfs: "
 
-#: watch.c:433
+#: watch.c:436
 msgid "unable to create IPC pipes"
 msgstr "impossible de créer les tubes IPC"
 
-#: watch.c:443
+#: watch.c:446
 msgid "unable to fork process"
 msgstr "impossible de clôner le processus"
 
-#: watch.c:448
+#: watch.c:451
 msgid "dup2 failed"
 msgstr "dup2 a échoué"
 
-#: watch.c:455
+#: watch.c:458
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "impossible d'exécuter « %s »"
 
-#: watch.c:472
+#: watch.c:475
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:618
+#: watch.c:621
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:626
+#: watch.c:629
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "la commande s'est terminée avec un statut non nul, pressez une touche pour "
 "terminer"
 
-#: watch.c:751
+#: watch.c:754
 #, c-format
 msgid "unicode handling error\n"
 msgstr "erreur de gestion de unicode\n"
 
-#: watch.c:757
+#: watch.c:760
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "erreur de gestion de unicode (malloc)\n"
 
-#: w.c:236 w.c:251
+#: w.c:240 w.c:255
 #, c-format
 msgid " %2ludays"
 msgstr "%2lujours"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:245 w.c:255
+#: w.c:249 w.c:259
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02um"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:263
+#: w.c:267
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02us"
 
-#: w.c:445
+#: w.c:449
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     n'affiche pas l'en-tête\n"
 
-#: w.c:446
+#: w.c:450
 msgid " -u, --no-current    ignore current process username\n"
 msgstr ""
 " -u, --no-current    ignore le nom d'utilisateur du processus courant\n"
 
-#: w.c:447
+#: w.c:451
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         format court\n"
 
-#: w.c:448
+#: w.c:452
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          montre le champ du nom d'hôte distant\n"
 
-#: w.c:449
+#: w.c:453
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     sortie dans l'ancien style\n"
 
-#: w.c:450
+#: w.c:454
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       affiche l'adresse IP au lieu du nom d'hôte (si "
 "possible)\n"
 
-#: w.c:547
+#: w.c:551
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4197,7 +4234,7 @@ msgstr ""
 "la longueur « utilisateur » dans l'environnement PROCPS_USERLEN doit être "
 "entre 8 et %i, ignoré.\n"
 
-#: w.c:557
+#: w.c:561
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4205,40 +4242,40 @@ msgstr ""
 "la longueur « de » dans l'environnement PROCPS_FROMLEN doit être entre 8 et "
 "%d, ignoré.\n"
 
-#: w.c:569
+#: w.c:573
 #, c-format
 msgid "%d column window is too narrow"
 msgstr "la fenêtre avec %d colonnes est trop étroite"
 
-#: w.c:571
+#: w.c:575
 #, c-format
 msgid "%d column width exceeds command buffer size, truncating to %d"
 msgstr ""
 "la largeur de colonne %d dépasse la taille du tampon de commande, tronqué à "
 "%d"
 
-#: w.c:577
+#: w.c:581
 #, c-format
 msgid "warning: screen width %d suboptimal"
 msgstr "attention: la largeur %d de l'écran n'est pas optimale"
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:586
+#: w.c:590
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:588
+#: w.c:592
 msgid "FROM"
 msgstr "DE  "
 
-#: w.c:590
+#: w.c:594
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr "  LOGIN@   IDLE   JCPU   PCPU QUOI\n"
 
-#: w.c:592
+#: w.c:596
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr "   IDLE QUOI\n"
diff --git a/po/pl.po b/po/pl.po
index d4c357a5..7dfb2f74 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: procps-ng-3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-01-24 19:06+1100\n"
+"POT-Creation-Date: 2015-05-09 16:51+1000\n"
 "PO-Revision-Date: 2015-01-23 23:06+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:443
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [opcje]\n"
@@ -26,15 +26,18 @@ msgid " -b, --bytes         show output in bytes\n"
 msgstr " -b, --bytes         wyjście w bajtach\n"
 
 #: free.c:77
-msgid " -k, --kilo          show output in kilobytes\n"
+#, fuzzy
+msgid "     --kilo          show output in kilobytes\n"
 msgstr " -k, --kilo          wyjście w kilobajtach\n"
 
 #: free.c:78
-msgid " -m, --mega          show output in megabytes\n"
+#, fuzzy
+msgid "     --mega          show output in megabytes\n"
 msgstr " -m, --mega          wyjście w megabajtach\n"
 
 #: free.c:79
-msgid " -g, --giga          show output in gigabytes\n"
+#, fuzzy
+msgid "     --giga          show output in gigabytes\n"
 msgstr " -g, --giga          wyjście w gigabajtach\n"
 
 #: free.c:80
@@ -42,58 +45,92 @@ msgid "     --tera          show output in terabytes\n"
 msgstr "     --tera          wyjście w terabajtach\n"
 
 #: free.c:81
+#, fuzzy
+msgid "     --peta          show output in petabytes\n"
+msgstr "     --tera          wyjście w terabajtach\n"
+
+#: free.c:82
+#, fuzzy
+msgid " -k, --kibi          show output in kibibytes\n"
+msgstr " -k, --kilo          wyjście w kilobajtach\n"
+
+#: free.c:83
+#, fuzzy
+msgid " -m, --mebi          show output in mebibytes\n"
+msgstr " -m, --mega          wyjście w megabajtach\n"
+
+#: free.c:84
+#, fuzzy
+msgid " -g, --gibi          show output in gibibytes\n"
+msgstr " -g, --giga          wyjście w gigabajtach\n"
+
+#: free.c:85
+#, fuzzy
+msgid "     --tebi          show output in tebibytes\n"
+msgstr "     --tera          wyjście w terabajtach\n"
+
+#: free.c:86
+#, fuzzy
+msgid "     --pebi          show output in pebibytes\n"
+msgstr "     --tera          wyjście w terabajtach\n"
+
+#: free.c:87
 msgid " -h, --human         show human-readable output\n"
 msgstr " -h, --human         wyjście czytelne dla człowieka\n"
 
-#: free.c:82
+#: free.c:88
 msgid "     --si            use powers of 1000 not 1024\n"
 msgstr "     --si            użycie potęg 1000 zamiast 1024\n"
 
-#: free.c:83
+#: free.c:89
 msgid " -l, --lohi          show detailed low and high memory statistics\n"
 msgstr ""
 " -l, --lohi          szczegółowe statystyki niskiej i wysokiej pamięci\n"
 
-#: free.c:84
+#: free.c:90
 msgid " -t, --total         show total for RAM + swap\n"
 msgstr " -t, --total         całkowity rozmiar RAM-u + obszaru wymiany\n"
 
-#: free.c:85
+#: free.c:91
 msgid " -s N, --seconds N   repeat printing every N seconds\n"
 msgstr " -s N, --seconds N   powtarzanie wypisywania co N sekund\n"
 
-#: free.c:86
+#: free.c:92
 msgid " -c N, --count N     repeat printing N times, then exit\n"
 msgstr " -c N, --count N     powtórzenie wypisania N razy i zakończenie\n"
 
-#: free.c:87
+#: free.c:93
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          szeroki format wyjścia\n"
 
-#: free.c:89 w.c:452
+#: free.c:95 w.c:456
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     wyświetlenie tego opisu i zakończenie\n"
 
-#: free.c:267
+#: free.c:198
+msgid "Multiple unit options doesn't make sense."
+msgstr ""
+
+#: free.c:328
 #, c-format
 msgid "seconds argument `%s' failed"
 msgstr "niezrozumiały argument liczby sekund `%s'"
 
-#: free.c:270
+#: free.c:331
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "argument liczby sekund `%s' nie jest liczbą dodatnią"
 
-#: free.c:276
+#: free.c:337
 msgid "failed to parse count argument"
 msgstr "niezrozumiały argument liczby powtórzeń"
 
-#: free.c:279
+#: free.c:340
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "niezrozumiały argument liczby powtórzeń: '%s'"
 
-#: free.c:300
+#: free.c:361
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -102,7 +139,7 @@ msgstr ""
 "              razem       użyte       wolne    dzielone      bufory     w "
 "cache    dostępne"
 
-#: free.c:302
+#: free.c:363
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -111,23 +148,23 @@ msgstr ""
 "              razem       użyte       wolne    dzielone   buf/cache    "
 "dostępne"
 
-#: free.c:305
+#: free.c:366
 msgid "Mem:"
 msgstr "Pamięć:"
 
-#: free.c:325
+#: free.c:386
 msgid "Low:"
 msgstr "Niska:"
 
-#: free.c:331
+#: free.c:392
 msgid "High:"
 msgstr "Wysoka:"
 
-#: free.c:338
+#: free.c:399
 msgid "Swap:"
 msgstr "Wymiana:"
 
-#: free.c:345
+#: free.c:406
 msgid "Total:"
 msgstr "Razem:"
 
@@ -508,7 +545,7 @@ msgid " total %8ldK\n"
 msgstr " razem %8ldK\n"
 
 #: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:704
+#: vmstat.c:959 vmstat.c:968 watch.c:707
 msgid "failed to parse argument"
 msgstr "niezrozumiały argument"
 
@@ -2064,7 +2101,7 @@ msgid "Effective User Id"
 msgstr "Id. użytkownika efektywnego"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:586
+#: top/top_nls.c:133 w.c:590
 msgid "USER"
 msgstr "UŻYTK."
 
@@ -4037,98 +4074,98 @@ msgstr ""
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  wypisanie informacji o wejściu i zakończenie\n"
 
-#: watch.c:372
+#: watch.c:375
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Co %.1fs: "
 
-#: watch.c:433
+#: watch.c:436
 msgid "unable to create IPC pipes"
 msgstr "nie można utworzyć potoków IPC"
 
-#: watch.c:443
+#: watch.c:446
 msgid "unable to fork process"
 msgstr "nie można rozgałęzić procesu"
 
-#: watch.c:448
+#: watch.c:451
 msgid "dup2 failed"
 msgstr "dup2 nie powiodło się"
 
-#: watch.c:455
+#: watch.c:458
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "nie można uruchomić '%s'"
 
-#: watch.c:472
+#: watch.c:475
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:618
+#: watch.c:621
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:626
+#: watch.c:629
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "polecenie zakończyło się kodem błędnym; proszę nacisnąć klawisz, aby "
 "zakończyć"
 
-#: watch.c:751
+#: watch.c:754
 #, c-format
 msgid "unicode handling error\n"
 msgstr "błąd obsługi unikodu\n"
 
-#: watch.c:757
+#: watch.c:760
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "błąd obsługi unikodu (malloc)\n"
 
-#: w.c:236 w.c:251
+#: w.c:240 w.c:255
 #, c-format
 msgid " %2ludays"
 msgstr " %2ludni"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:245 w.c:255
+#: w.c:249 w.c:259
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02um"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:263
+#: w.c:267
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02us"
 
-#: w.c:445
+#: w.c:449
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     bez wypisywania nagłówka\n"
 
-#: w.c:446
+#: w.c:450
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    pominiecie użytkownika bieżącego procesu\n"
 
-#: w.c:447
+#: w.c:451
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         format krótki\n"
 
-#: w.c:448
+#: w.c:452
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          wyświetlenie pola nazwy zdalnego hosta\n"
 
-#: w.c:449
+#: w.c:453
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     wyjście w starym stylu\n"
 
-#: w.c:450
+#: w.c:454
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       wyświetlanie adresów IP zamiast nazw (jeśli to "
 "możliwe)\n"
 
-#: w.c:547
+#: w.c:551
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4136,7 +4173,7 @@ msgstr ""
 "Zmienna długości użytkowników PROCS_USERLEN musi być pomiędzy 8 a %i, "
 "zignorowano.\n"
 
-#: w.c:557
+#: w.c:561
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4144,39 +4181,39 @@ msgstr ""
 "Zmienna długości miejsca logowania PROCPS_FROMLEN musi być pomiędzy 8 a %d, "
 "zignorowano\n"
 
-#: w.c:569
+#: w.c:573
 #, c-format
 msgid "%d column window is too narrow"
 msgstr "Okno o szerokości %d jest za wąskie"
 
-#: w.c:571
+#: w.c:575
 #, c-format
 msgid "%d column width exceeds command buffer size, truncating to %d"
 msgstr ""
 "Szerokość okna %d przekracza rozmiar bufora polecenia, ograniczenie do %d"
 
-#: w.c:577
+#: w.c:581
 #, c-format
 msgid "warning: screen width %d suboptimal"
 msgstr "uwaga: szerokość ekranu %d nie jest optymalna"
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:586
+#: w.c:590
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:588
+#: w.c:592
 msgid "FROM"
 msgstr "Z   "
 
-#: w.c:590
+#: w.c:594
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr "  ZAL.OD   BEZCZ. JCPU   PCPU CO\n"
 
-#: w.c:592
+#: w.c:596
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr " BEZCZ. CO\n"
diff --git a/po/uk.po b/po/uk.po
index 10840fc7..b8fcda67 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: procps-ng-3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-01-24 19:06+1100\n"
+"POT-Creation-Date: 2015-05-09 16:51+1000\n"
 "PO-Revision-Date: 2014-09-10 07:37+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:443
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [параметри]\n"
@@ -29,15 +29,18 @@ msgid " -b, --bytes         show output in bytes\n"
 msgstr " -b, --bytes         вивести дані у байтах\n"
 
 #: free.c:77
-msgid " -k, --kilo          show output in kilobytes\n"
+#, fuzzy
+msgid "     --kilo          show output in kilobytes\n"
 msgstr " -k, --kilo          вивести дані у кілобайтах\n"
 
 #: free.c:78
-msgid " -m, --mega          show output in megabytes\n"
+#, fuzzy
+msgid "     --mega          show output in megabytes\n"
 msgstr " -m, --mega          вивести дані у мегабайтах\n"
 
 #: free.c:79
-msgid " -g, --giga          show output in gigabytes\n"
+#, fuzzy
+msgid "     --giga          show output in gigabytes\n"
 msgstr " -g, --giga          вивести дані у гігабайтах\n"
 
 #: free.c:80
@@ -45,61 +48,95 @@ msgid "     --tera          show output in terabytes\n"
 msgstr "     --tera          вивести дані у терабайтах\n"
 
 #: free.c:81
+#, fuzzy
+msgid "     --peta          show output in petabytes\n"
+msgstr "     --tera          вивести дані у терабайтах\n"
+
+#: free.c:82
+#, fuzzy
+msgid " -k, --kibi          show output in kibibytes\n"
+msgstr " -k, --kilo          вивести дані у кілобайтах\n"
+
+#: free.c:83
+#, fuzzy
+msgid " -m, --mebi          show output in mebibytes\n"
+msgstr " -m, --mega          вивести дані у мегабайтах\n"
+
+#: free.c:84
+#, fuzzy
+msgid " -g, --gibi          show output in gibibytes\n"
+msgstr " -g, --giga          вивести дані у гігабайтах\n"
+
+#: free.c:85
+#, fuzzy
+msgid "     --tebi          show output in tebibytes\n"
+msgstr "     --tera          вивести дані у терабайтах\n"
+
+#: free.c:86
+#, fuzzy
+msgid "     --pebi          show output in pebibytes\n"
+msgstr "     --tera          вивести дані у терабайтах\n"
+
+#: free.c:87
 msgid " -h, --human         show human-readable output\n"
 msgstr " -h, --human         вивести дані у зручному для читання вигляді\n"
 
-#: free.c:82
+#: free.c:88
 msgid "     --si            use powers of 1000 not 1024\n"
 msgstr ""
 "     --si            використовувати одиниці з кратністю 1000, а не 1024\n"
 
-#: free.c:83
+#: free.c:89
 msgid " -l, --lohi          show detailed low and high memory statistics\n"
 msgstr ""
 " -l, --lohi          вивести докладні дані щодо використання верхньої і "
 "нижньої областей пам’яті\n"
 
-#: free.c:84
+#: free.c:90
 msgid " -t, --total         show total for RAM + swap\n"
 msgstr " -t, --total         вивести загальні дані для RAM + свопінґ\n"
 
-#: free.c:85
+#: free.c:91
 msgid " -s N, --seconds N   repeat printing every N seconds\n"
 msgstr " -s N, --seconds N   повторювати виведення кожні N секунд\n"
 
-#: free.c:86
+#: free.c:92
 msgid " -c N, --count N     repeat printing N times, then exit\n"
 msgstr ""
 " -c N, --count N     повторити виведення N разів, потім завершити роботу\n"
 
-#: free.c:87
+#: free.c:93
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          виведення у широкому форматі\n"
 
-#: free.c:89 w.c:452
+#: free.c:95 w.c:456
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     показати цю довідку та вийти\n"
 
-#: free.c:267
+#: free.c:198
+msgid "Multiple unit options doesn't make sense."
+msgstr ""
+
+#: free.c:328
 #, c-format
 msgid "seconds argument `%s' failed"
 msgstr "помилка аргументу секунд, «%s»"
 
-#: free.c:270
+#: free.c:331
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "аргумент секунд, «%s», не є додатним числом"
 
-#: free.c:276
+#: free.c:337
 msgid "failed to parse count argument"
 msgstr "не вдалося обробити аргумент кількості"
 
-#: free.c:279
+#: free.c:340
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "не вдалося обробити аргумент кількості: «%s»"
 
-#: free.c:300
+#: free.c:361
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -108,7 +145,7 @@ msgstr ""
 "             загалом       використ.   вільна    спільна    буфери        "
 "кеш     дост."
 
-#: free.c:302
+#: free.c:363
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -116,23 +153,23 @@ msgid ""
 msgstr ""
 "             загалом       використ.   вільна    спільна буфери/кеш   дост."
 
-#: free.c:305
+#: free.c:366
 msgid "Mem:"
 msgstr "Пам.:"
 
-#: free.c:325
+#: free.c:386
 msgid "Low:"
 msgstr "Нижня:"
 
-#: free.c:331
+#: free.c:392
 msgid "High:"
 msgstr "Верхня:"
 
-#: free.c:338
+#: free.c:399
 msgid "Swap:"
 msgstr "Своп.:"
 
-#: free.c:345
+#: free.c:406
 msgid "Total:"
 msgstr "Загалом:"
 
@@ -522,7 +559,7 @@ msgid " total %8ldK\n"
 msgstr " загалом %8ld К\n"
 
 #: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:704
+#: vmstat.c:959 vmstat.c:968 watch.c:707
 msgid "failed to parse argument"
 msgstr "не вдалося обробити аргумент"
 
@@ -2084,7 +2121,7 @@ msgid "Effective User Id"
 msgstr "Ідентифікатор ефективного користувача"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:586
+#: top/top_nls.c:133 w.c:590
 msgid "USER"
 msgstr "КОР."
 
@@ -4075,97 +4112,97 @@ msgstr "  -x, --exec             передати команду exec, а не \
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  вивести інформацію про версію та вийти\n"
 
-#: watch.c:372
+#: watch.c:375
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Кожні %.1f с: "
 
-#: watch.c:433
+#: watch.c:436
 msgid "unable to create IPC pipes"
 msgstr "не вдалося створити канали IPC"
 
-#: watch.c:443
+#: watch.c:446
 msgid "unable to fork process"
 msgstr "не вдалося розгалузити процес"
 
-#: watch.c:448
+#: watch.c:451
 msgid "dup2 failed"
 msgstr "помилка dup2"
 
-#: watch.c:455
+#: watch.c:458
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "не вдалося виконати «%s»"
 
-#: watch.c:472
+#: watch.c:475
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:618
+#: watch.c:621
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:626
+#: watch.c:629
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "виконання команди завершено з ненульовим повідомлення щодо стану, натисніть "
 "клавішу, щоб завершити роботу"
 
-#: watch.c:751
+#: watch.c:754
 #, c-format
 msgid "unicode handling error\n"
 msgstr "помилка обробки unicode\n"
 
-#: watch.c:757
+#: watch.c:760
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "помилка обробки unicode (malloc)\n"
 
-#: w.c:236 w.c:251
+#: w.c:240 w.c:255
 #, c-format
 msgid " %2ludays"
 msgstr " %2lu днів"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:245 w.c:255
+#: w.c:249 w.c:259
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02um"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:263
+#: w.c:267
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu,%02us"
 
-#: w.c:445
+#: w.c:449
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     не виводити заголовок\n"
 
-#: w.c:446
+#: w.c:450
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    ігнорувати ім’я користувача поточного процесу\n"
 
-#: w.c:447
+#: w.c:451
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         скорочений формат\n"
 
-#: w.c:448
+#: w.c:452
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          вивести поле назви віддаленого вузла\n"
 
-#: w.c:449
+#: w.c:453
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     виведення даних у застарілому форматі\n"
 
-#: w.c:450
+#: w.c:454
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       виводити IP-адресу замість назви вузла (якщо можна)\n"
 
-#: w.c:547
+#: w.c:551
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4173,7 +4210,7 @@ msgstr ""
 "Значення довжини для середовища користувача, PROCPS_USERLEN, має належати "
 "діапазону від 8 до %i, ігноруємо.\n"
 
-#: w.c:557
+#: w.c:561
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4181,38 +4218,38 @@ msgstr ""
 "значення довжини вхідних даних середовища, PROCPS_FROMLEN, має бути від 8 до "
 "%d, ігноруємо\n"
 
-#: w.c:569
+#: w.c:573
 #, c-format
 msgid "%d column window is too narrow"
 msgstr "вікно у %d стовпчиків є надто вузьким"
 
-#: w.c:571
+#: w.c:575
 #, c-format
 msgid "%d column width exceeds command buffer size, truncating to %d"
 msgstr "ширина у %d перевищує розмір буфера команд, зменшуємо її до %d"
 
-#: w.c:577
+#: w.c:581
 #, c-format
 msgid "warning: screen width %d suboptimal"
 msgstr "попередження: ширина екрана %d не є оптимальною"
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:586
+#: w.c:590
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:588
+#: w.c:592
 msgid "FROM"
 msgstr "З"
 
-#: w.c:590
+#: w.c:594
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 
-#: w.c:592
+#: w.c:596
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr "   IDLE WHAT\n"
diff --git a/po/vi.po b/po/vi.po
index 8fe17340..627aff5f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: procps-ng 3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-01-24 19:06+1100\n"
+"POT-Creation-Date: 2015-05-09 16:51+1000\n"
 "PO-Revision-Date: 2014-09-13 08:57+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Basepath: ../\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:443
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [các tùy chọn]\n"
@@ -29,15 +29,18 @@ msgid " -b, --bytes         show output in bytes\n"
 msgstr " -b, --bytes         hiển thị kết xuất theo đơn vị byte\n"
 
 #: free.c:77
-msgid " -k, --kilo          show output in kilobytes\n"
+#, fuzzy
+msgid "     --kilo          show output in kilobytes\n"
 msgstr " -k, --kilo          hiển thị kết xuất theo đơn vị kilobytes\n"
 
 #: free.c:78
-msgid " -m, --mega          show output in megabytes\n"
+#, fuzzy
+msgid "     --mega          show output in megabytes\n"
 msgstr " -m, --mega          hiển thị kết xuất theo đơn vị megabytes\n"
 
 #: free.c:79
-msgid " -g, --giga          show output in gigabytes\n"
+#, fuzzy
+msgid "     --giga          show output in gigabytes\n"
 msgstr " -g, --giga          hiển thị kết xuất theo đơn vị gigabytes\n"
 
 #: free.c:80
@@ -45,57 +48,91 @@ msgid "     --tera          show output in terabytes\n"
 msgstr "     --tera          hiển thị kết xuất theo đơn vị terabytes\n"
 
 #: free.c:81
+#, fuzzy
+msgid "     --peta          show output in petabytes\n"
+msgstr "     --tera          hiển thị kết xuất theo đơn vị terabytes\n"
+
+#: free.c:82
+#, fuzzy
+msgid " -k, --kibi          show output in kibibytes\n"
+msgstr " -k, --kilo          hiển thị kết xuất theo đơn vị kilobytes\n"
+
+#: free.c:83
+#, fuzzy
+msgid " -m, --mebi          show output in mebibytes\n"
+msgstr " -m, --mega          hiển thị kết xuất theo đơn vị megabytes\n"
+
+#: free.c:84
+#, fuzzy
+msgid " -g, --gibi          show output in gibibytes\n"
+msgstr " -g, --giga          hiển thị kết xuất theo đơn vị gigabytes\n"
+
+#: free.c:85
+#, fuzzy
+msgid "     --tebi          show output in tebibytes\n"
+msgstr "     --tera          hiển thị kết xuất theo đơn vị terabytes\n"
+
+#: free.c:86
+#, fuzzy
+msgid "     --pebi          show output in pebibytes\n"
+msgstr "     --tera          hiển thị kết xuất theo đơn vị terabytes\n"
+
+#: free.c:87
 msgid " -h, --human         show human-readable output\n"
 msgstr " -h, --human         hiển thị ở dạng cho con người đọc\n"
 
-#: free.c:82
+#: free.c:88
 msgid "     --si            use powers of 1000 not 1024\n"
 msgstr "     --si            dùng lũy thừa của 1000 không phải 1024\n"
 
-#: free.c:83
+#: free.c:89
 msgid " -l, --lohi          show detailed low and high memory statistics\n"
 msgstr " -l, --lohi          hiển thị thống kê chi tiết bộ nhớ thấp và cao\n"
 
-#: free.c:84
+#: free.c:90
 msgid " -t, --total         show total for RAM + swap\n"
 msgstr " -t, --total         hiển thị tổng số cho RAM + swap\n"
 
-#: free.c:85
+#: free.c:91
 msgid " -s N, --seconds N   repeat printing every N seconds\n"
 msgstr " -s N, --seconds N   in lặp lại sau mỗi N giây\n"
 
-#: free.c:86
+#: free.c:92
 msgid " -c N, --count N     repeat printing N times, then exit\n"
 msgstr " -c N, --count N     in lặp lại N lần rồi thoát\n"
 
-#: free.c:87
+#: free.c:93
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          kết xuất rộng\n"
 
-#: free.c:89 w.c:452
+#: free.c:95 w.c:456
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     hiển thị trợ giúp này rồi thoát\n"
 
-#: free.c:267
+#: free.c:198
+msgid "Multiple unit options doesn't make sense."
+msgstr ""
+
+#: free.c:328
 #, c-format
 msgid "seconds argument `%s' failed"
 msgstr "đối số thứ hai “%s” bị lỗi"
 
-#: free.c:270
+#: free.c:331
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "đối số thứ hai “%s” không phải là số nguyên dương"
 
-#: free.c:276
+#: free.c:337
 msgid "failed to parse count argument"
 msgstr "gặp lỗi khi phân tích số lượng đối số"
 
-#: free.c:279
+#: free.c:340
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "gặp lỗi khi phân tích số lượng đối số: “%s”"
 
-#: free.c:300
+#: free.c:361
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -104,7 +141,7 @@ msgstr ""
 "               tổng        dùng       trống        chsẻ         đệm     nhớ "
 "tạm    sẵn sàng"
 
-#: free.c:302
+#: free.c:363
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -113,23 +150,23 @@ msgstr ""
 "               tổng        dùng       trống        chsẻ     đệm/tạm    sẵn "
 "sàng"
 
-#: free.c:305
+#: free.c:366
 msgid "Mem:"
 msgstr "BNhớ:"
 
-#: free.c:325
+#: free.c:386
 msgid "Low:"
 msgstr "Thấp:"
 
-#: free.c:331
+#: free.c:392
 msgid "High:"
 msgstr "Cao:"
 
-#: free.c:338
+#: free.c:399
 msgid "Swap:"
 msgstr "Tráo đổi:"
 
-#: free.c:345
+#: free.c:406
 msgid "Total:"
 msgstr "Tổng:"
 
@@ -501,7 +538,7 @@ msgid " total %8ldK\n"
 msgstr " tổng %8ldK\n"
 
 #: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:704
+#: vmstat.c:959 vmstat.c:968 watch.c:707
 msgid "failed to parse argument"
 msgstr "gặp lỗi khi phân tích đối số"
 
@@ -2048,7 +2085,7 @@ msgid "Effective User Id"
 msgstr "Mã số người dùng chịu tác động"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:586
+#: top/top_nls.c:133 w.c:590
 msgid "USER"
 msgstr "NG_DÙNG"
 
@@ -4017,94 +4054,94 @@ msgstr "  -x, --exec             chuyển lệnh cho exec thay cho \"sh -c\"\n"
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  hiển thị thông tin phiên bản rồi thoát\n"
 
-#: watch.c:372
+#: watch.c:375
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Mỗi %.1fs: "
 
-#: watch.c:433
+#: watch.c:436
 msgid "unable to create IPC pipes"
 msgstr "không thể tạo đường ống IPC"
 
-#: watch.c:443
+#: watch.c:446
 msgid "unable to fork process"
 msgstr "không thể rẽ nhánh tiến trình"
 
-#: watch.c:448
+#: watch.c:451
 msgid "dup2 failed"
 msgstr "dup2 bị lỗi"
 
-#: watch.c:455
+#: watch.c:458
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "không thể thực hiện “%s”"
 
-#: watch.c:472
+#: watch.c:475
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:618
+#: watch.c:621
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:626
+#: watch.c:629
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr "lệnh kết thúc với mã thoát khác không, hãy bấm phím bất kỳ để thoát"
 
-#: watch.c:751
+#: watch.c:754
 #, c-format
 msgid "unicode handling error\n"
 msgstr "xử lý unicode gặp lỗi\n"
 
-#: watch.c:757
+#: watch.c:760
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "xử lý unicode gặp lỗi (malloc)\n"
 
-#: w.c:236 w.c:251
+#: w.c:240 w.c:255
 #, c-format
 msgid " %2ludays"
 msgstr " %2lungày"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:245 w.c:255
+#: w.c:249 w.c:259
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02uphút"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:263
+#: w.c:267
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02ugiây"
 
-#: w.c:445
+#: w.c:449
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     không in phần đầu\n"
 
-#: w.c:446
+#: w.c:450
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    bỏ qua tiến trình từ người dùng hiện tại\n"
 
-#: w.c:447
+#: w.c:451
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         định dạng ngắn gọn\n"
 
-#: w.c:448
+#: w.c:452
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          hiển thị trường tên máy chủ\n"
 
-#: w.c:449
+#: w.c:453
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     hiển thị kiểu cũ\n"
 
-#: w.c:450
+#: w.c:454
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr " -i, --ip-addr       hiển thị địa chỉ IP thay cho tên máy (nếu được)\n"
 
-#: w.c:547
+#: w.c:551
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4112,7 +4149,7 @@ msgstr ""
 "“chiều dài biến môi trường của người dùng” PROCPS_USERLEN phải nằm giữa 8 và "
 "%d, nên bỏ qua\n"
 
-#: w.c:557
+#: w.c:561
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4120,38 +4157,38 @@ msgstr ""
 "“chiều dài biến môi trường từ” PROCPS_FROMLEN phải nằm giữa 8 và %d, nên bỏ "
 "qua\n"
 
-#: w.c:569
+#: w.c:573
 #, c-format
 msgid "%d column window is too narrow"
 msgstr "cửa sổ %d cột là quá hẹp"
 
-#: w.c:571
+#: w.c:575
 #, c-format
 msgid "%d column width exceeds command buffer size, truncating to %d"
 msgstr "độ rộng cột %d là vượt quá cỡ bộ đệm lệnh, cắt ngắn thành %d"
 
-#: w.c:577
+#: w.c:581
 #, c-format
 msgid "warning: screen width %d suboptimal"
 msgstr "cảnh báo: độ rộng màn hình %d gần dưới điểm cực thuận"
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:586
+#: w.c:590
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:588
+#: w.c:592
 msgid "FROM"
 msgstr "TỪ"
 
-#: w.c:590
+#: w.c:594
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr " ĐNHẬP@      NGHỈ   JCPU   PCPU   GÌ\n"
 
-#: w.c:592
+#: w.c:596
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr "   NGHỈ GÌ\n"