# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1444135601 -10800
# Node ID ce7009ff237b659eb8adc5a5649cde5b4be50fdb
# Parent  d6cbd0c5f2733db9d2235afbf2c07081455c15a7
install: rebuild fs/ tree respecting destination symlinks before installing files and folders to filesystem

diff -r d6cbd0c5f273 -r ce7009ff237b modules/get
--- a/modules/get	Mon Oct 05 03:53:47 2015 +0300
+++ b/modules/get	Tue Oct 06 15:46:41 2015 +0300
@@ -339,7 +339,7 @@
 	# Make sure we downloaded what we want with checksum
 
 	if [ "$($CHECKSUM "$namever.tazpkg" | cut -d' ' -f1)" != "$pkgsum" ]; then
-		_ 'Checksum error for "%s"' "$namever.tazpkg"
+		_ 'Checksum error for "%s"' "$namever.tazpkg" >&2
 		rm "$namever.tazpkg"
 
 		# Recharge DBs and try again; prevent looping with 'redo'
diff -r d6cbd0c5f273 -r ce7009ff237b modules/install
--- a/modules/install	Mon Oct 05 03:53:47 2015 +0300
+++ b/modules/install	Tue Oct 06 15:46:41 2015 +0300
@@ -177,7 +177,7 @@
 		# Answered 'No' to install dependencies, or '--nodeps' option given
 		newline
 		_ 'Leaving dependencies for package "%s" unresolved.' "$PACKAGE"
-		_ 'The package is installed but will probably not work.'
+		_ 'The package will be installed but will probably not work.'
 		newline
 	fi
 }
@@ -457,9 +457,24 @@
 	fi
 
 
-	action 'Installing package...'
-	[ -n "$(busybox ls fs/* 2>/dev/null)" ] && cp -aLf fs/* "$root/"
-	status
+	if [ -n "$(busybox ls fs/* 2>/dev/null)" ]; then
+		action 'Installing package...'
+
+		debug '\n  resolving destination links in source'
+		IFS=$'\n'
+		for dir in $(find fs -type d | sed 's|^fs||;/^$/d'); do
+			if ldir=$(busybox readlink -n $root$dir); then
+				debug "  * mv 'fs$dir'\n    -> 'fs${dir%/*}/$ldir'"
+				mkdir -p "fs${dir%/*}/${ldir%/*}"
+				mv "fs$dir" "fs${dir%/*}/$ldir"
+			fi
+		done
+		unset IFS
+
+		debug '  copying folders and files to destination'
+		cp -af fs/* "$root/"
+		status
+	fi
 
 
 	if [ -s files2remove.list ]; then
diff -r d6cbd0c5f273 -r ce7009ff237b po/el.po
--- a/po/el.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/el.po	Tue Oct 06 15:46:41 2015 +0300
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2012-12-23 14:08+0200\n"
 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n"
 "Language-Team: Kostis Mousafiris\n"
@@ -747,7 +747,8 @@
 msgstr "Κάποιες εξαρτήσεις για το %s έμειναν ανεπίλυτες."
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+#, fuzzy
+msgid "The package will be installed but will probably not work."
 msgstr "Το πακέτο εγκαταστάθηκε, αλλά μάλλον δε θα δουλέψει."
 
 #: modules/install:251
@@ -784,33 +785,33 @@
 msgid "Saving configuration files..."
 msgstr "Γίνεται αποθήκευση των αρχείων ρυθμίσεως..."
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "Γίνεται εγκατάσταση..."
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "Γίνεται απομάκρυνση όλων των προσωρινών αρχείων temp..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "Γίνεται απομάκρυνση όλων των προσωρινών αρχείων temp..."
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "Γίνεται απομάκρυνση όλων των προσωρινών αρχείων temp..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "Το πακέτο %s (%s) δεν έχει εγκατασταθεί."
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "Το πακέτο \"%s\" είναι ήδη εγκατεστημένο."
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr ""
 "Μπορείτε να χρησιμοποιήσετε την επιλογή --forced για να κάνετε υποχρεωτική\n"
diff -r d6cbd0c5f273 -r ce7009ff237b po/es.po
--- a/po/es.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/es.po	Tue Oct 06 15:46:41 2015 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2012-06-11 18:31-0000\n"
 "Last-Translator: Kevin Fabian Quintero <kefaquin@gmail.com>\n"
 "Language-Team: \n"
@@ -773,7 +773,8 @@
 msgstr "Dejando dependencias de %s sin resolver."
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+#, fuzzy
+msgid "The package will be installed but will probably not work."
 msgstr "El paquete está instalado pero probablemente no trabaje."
 
 #: modules/install:251
@@ -808,33 +809,33 @@
 msgid "Saving configuration files..."
 msgstr "Guardando archivos de configuración..."
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "Instalando..."
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "Removiendo todos los archivos tmp..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "Removiendo todos los archivos tmp..."
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "Removiendo todos los archivos tmp..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "Paquete %s (%s) no está instalado."
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "El paquete \"%s\" ya esta instalado."
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr ""
 "Usted puede utilizar la opción --force para forzar la instalación o "
diff -r d6cbd0c5f273 -r ce7009ff237b po/fr.po
--- a/po/fr.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/fr.po	Tue Oct 06 15:46:41 2015 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2014-02-16 14:06+0100\n"
 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
 "Language-Team: French\n"
@@ -712,7 +712,8 @@
 msgstr "Dépendances pour %s non résolues."
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+#, fuzzy
+msgid "The package will be installed but will probably not work."
 msgstr "Le paquet est installé mais ne va probablement pas fonctionner."
 
 #: modules/install:251
@@ -746,33 +747,33 @@
 msgid "Saving configuration files..."
 msgstr "Sauvegarde des fichiers de configuration..."
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "Installation du paquet..."
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "Suppression des fichiers temporaires..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "Suppression des fichiers temporaires..."
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "Restoration des fichiers d'index..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "Le paquet %s (%s) est installé."
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "Le paquet « %s » est déjà installé."
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr "Vous pouvez utiliser l'option --forced pour forcer son installation."
 
diff -r d6cbd0c5f273 -r ce7009ff237b po/pl.po
--- a/po/pl.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/pl.po	Tue Oct 06 15:46:41 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2013-08-07 13:34+0100\n"
 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n"
 "Language-Team: Paweł Pyrczak <support@pyrczak.pl>\n"
@@ -758,7 +758,8 @@
 msgstr "Pozostawianie nierozwiązanych zależności dla %s."
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+#, fuzzy
+msgid "The package will be installed but will probably not work."
 msgstr "Pakiet jest zainstalowany ale prawdopodobnie nie będzie działał."
 
 #: modules/install:251
@@ -793,33 +794,33 @@
 msgid "Saving configuration files..."
 msgstr "Zachowywanie plików konfiguracyjnych..."
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "Instalowanie..."
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "Usuwanie wszystkich tymczasowych plików tmp..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "Usuwanie wszystkich tymczasowych plików tmp..."
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "Usuwanie wszystkich tymczasowych plików tmp..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "Pakiet %s (%s) nie jest zainstalowany."
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "Pakiet \"%s\" już jest zainstalowany."
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr ""
 "Można użyć opcji --forced aby wymusić instalację, albo usunąć\n"
diff -r d6cbd0c5f273 -r ce7009ff237b po/pt_BR.po
--- a/po/pt_BR.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/pt_BR.po	Tue Oct 06 15:46:41 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2014-03-06 22:34-0300\n"
 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n"
 "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n"
@@ -727,7 +727,8 @@
 msgstr "Deixando dependências para %s não resolvidas."
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+#, fuzzy
+msgid "The package will be installed but will probably not work."
 msgstr "O pacote está instalado mas provavelmente não funcionará."
 
 #: modules/install:251
@@ -762,33 +763,33 @@
 msgid "Saving configuration files..."
 msgstr "Salvando arquivos de configuração..."
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "Instalando..."
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "Removendo todos os arquivos temporários..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "Removendo todos os arquivos temporários..."
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "Removendo todos os arquivos temporários..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "Pacote %s (%s) está instalado."
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "O pacote \"%s\" já está instalado."
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr "Você pode usar a opção --forced para forçar a instalação."
 
diff -r d6cbd0c5f273 -r ce7009ff237b po/ru.po
--- a/po/ru.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/ru.po	Tue Oct 06 15:46:41 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2015-10-05 03:50+0300\n"
 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -714,8 +714,8 @@
 msgstr "Зависимости пакета «%s» оставлены нерешенными."
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
-msgstr "Пакет установлен, но, возможно, не будет работать."
+msgid "The package will be installed but will probably not work."
+msgstr "Пакет будет установлен, но, возможно, не будет работать."
 
 #: modules/install:251
 msgid "Execute pre-install commands..."
@@ -745,31 +745,31 @@
 msgid "Saving configuration files..."
 msgstr "Сохранение конфигурационных файлов…"
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "Установка пакета…"
 
-#: modules/install:466
+#: modules/install:481
 msgid "Removing old files..."
 msgstr "Удаление устаревших файлов…"
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "Удаление всех временных файлов…"
 
-#: modules/install:508
+#: modules/install:523
 msgid "Update system databases..."
 msgstr "Обновление системных баз данных…"
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "Пакет «%s» (%s) установлен."
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "Пакет «%s» уже был установлен."
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr "Используйте опцию --forced, чтобы принудительно установить пакет."
 
diff -r d6cbd0c5f273 -r ce7009ff237b po/sv.po
--- a/po/sv.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/sv.po	Tue Oct 06 15:46:41 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2012-07-11 11:33-0000\n"
 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -737,7 +737,7 @@
 msgstr ""
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+msgid "The package will be installed but will probably not work."
 msgstr ""
 
 #: modules/install:251
@@ -770,33 +770,33 @@
 msgid "Saving configuration files..."
 msgstr ""
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr ""
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "Listar relaterade paket..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr ""
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "Listar relaterade paket..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr ""
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr ""
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr ""
 
diff -r d6cbd0c5f273 -r ce7009ff237b po/tazpkg.pot
--- a/po/tazpkg.pot	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/tazpkg.pot	Tue Oct 06 15:46:41 2015 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\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"
@@ -697,7 +697,7 @@
 msgstr ""
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+msgid "The package will be installed but will probably not work."
 msgstr ""
 
 #: modules/install:251
@@ -728,31 +728,31 @@
 msgid "Saving configuration files..."
 msgstr ""
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr ""
 
-#: modules/install:466
+#: modules/install:481
 msgid "Removing old files..."
 msgstr ""
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr ""
 
-#: modules/install:508
+#: modules/install:523
 msgid "Update system databases..."
 msgstr ""
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr ""
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr ""
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr ""
 
diff -r d6cbd0c5f273 -r ce7009ff237b po/zh_CN.po
--- a/po/zh_CN.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/zh_CN.po	Tue Oct 06 15:46:41 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2015-07-24 19:08+0800\n"
 "Last-Translator: Wenyu Zhang <jame987165702@gmail.com>\n"
 "Language-Team: rhsky <rhsky@qq.com>\n"
@@ -715,7 +715,8 @@
 msgstr "放任 %s 依赖软件包不管。"
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+#, fuzzy
+msgid "The package will be installed but will probably not work."
 msgstr "软件会被安装但是可能不会正常运行。"
 
 #: modules/install:251
@@ -749,33 +750,33 @@
 msgid "Saving configuration files..."
 msgstr "正在储存 的配置文件"
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "正在安装..."
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "正在移除所有暂存文件..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "正在移除所有暂存文件..."
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "还原数据库文件..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "软件包%s (%s) 软件包已安装。"
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "\"%s\" 软件包已经被安装"
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr "你可以用 --forced 选项强制安装"
 
diff -r d6cbd0c5f273 -r ce7009ff237b po/zh_TW.po
--- a/po/zh_TW.po	Mon Oct 05 03:53:47 2015 +0300
+++ b/po/zh_TW.po	Tue Oct 06 15:46:41 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazPkg 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 03:48+0300\n"
+"POT-Creation-Date: 2015-10-06 15:41+0300\n"
 "PO-Revision-Date: 2014-06-07 22:55+0800\n"
 "Last-Translator: lunglungyu <lunglungyu2004@gmail.com>\n"
 "Language-Team: \n"
@@ -720,7 +720,8 @@
 msgstr "%s 有未解決包依賴."
 
 #: modules/install:180
-msgid "The package is installed but will probably not work."
+#, fuzzy
+msgid "The package will be installed but will probably not work."
 msgstr "包已安裝但可能無法正常工作."
 
 #: modules/install:251
@@ -755,33 +756,33 @@
 msgid "Saving configuration files..."
 msgstr "正在儲存 的配置文件"
 
-#: modules/install:460
+#: modules/install:461
 msgid "Installing package..."
 msgstr "正在安裝..."
 
-#: modules/install:466
+#: modules/install:481
 #, fuzzy
 msgid "Removing old files..."
 msgstr "正在移除所有暫存文件..."
 
-#: modules/install:483
+#: modules/install:498
 msgid "Removing all tmp files..."
 msgstr "正在移除所有暫存文件..."
 
-#: modules/install:508
+#: modules/install:523
 #, fuzzy
 msgid "Update system databases..."
 msgstr "正在移除所有暫存文件..."
 
-#: modules/install:546
+#: modules/install:561
 msgid "Package \"%s\" (%s) is installed."
 msgstr "%s (%s) 包未被安裝"
 
-#: modules/install:576
+#: modules/install:591
 msgid "\"%s\" package is already installed."
 msgstr "包已經被安裝"
 
-#: modules/install:577
+#: modules/install:592
 msgid "You can use the --forced option to force installation."
 msgstr "你可以用 --forced 選項強制安裝"