tazpkg rev 845
install: rebuild fs/ tree respecting destination symlinks before installing files and folders to filesystem
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Oct 06 15:46:41 2015 +0300 (2015-10-06) |
| parents | d6cbd0c5f273 |
| children | 8a73a58ed3cb |
| files | modules/get modules/install po/el.po po/es.po po/fr.po po/pl.po po/pt_BR.po po/ru.po po/sv.po po/tazpkg.pot po/zh_CN.po po/zh_TW.po |
line diff
1.1 --- a/modules/get Mon Oct 05 03:53:47 2015 +0300 1.2 +++ b/modules/get Tue Oct 06 15:46:41 2015 +0300 1.3 @@ -339,7 +339,7 @@ 1.4 # Make sure we downloaded what we want with checksum 1.5 1.6 if [ "$($CHECKSUM "$namever.tazpkg" | cut -d' ' -f1)" != "$pkgsum" ]; then 1.7 - _ 'Checksum error for "%s"' "$namever.tazpkg" 1.8 + _ 'Checksum error for "%s"' "$namever.tazpkg" >&2 1.9 rm "$namever.tazpkg" 1.10 1.11 # Recharge DBs and try again; prevent looping with 'redo'
2.1 --- a/modules/install Mon Oct 05 03:53:47 2015 +0300 2.2 +++ b/modules/install Tue Oct 06 15:46:41 2015 +0300 2.3 @@ -177,7 +177,7 @@ 2.4 # Answered 'No' to install dependencies, or '--nodeps' option given 2.5 newline 2.6 _ 'Leaving dependencies for package "%s" unresolved.' "$PACKAGE" 2.7 - _ 'The package is installed but will probably not work.' 2.8 + _ 'The package will be installed but will probably not work.' 2.9 newline 2.10 fi 2.11 } 2.12 @@ -457,9 +457,24 @@ 2.13 fi 2.14 2.15 2.16 - action 'Installing package...' 2.17 - [ -n "$(busybox ls fs/* 2>/dev/null)" ] && cp -aLf fs/* "$root/" 2.18 - status 2.19 + if [ -n "$(busybox ls fs/* 2>/dev/null)" ]; then 2.20 + action 'Installing package...' 2.21 + 2.22 + debug '\n resolving destination links in source' 2.23 + IFS=$'\n' 2.24 + for dir in $(find fs -type d | sed 's|^fs||;/^$/d'); do 2.25 + if ldir=$(busybox readlink -n $root$dir); then 2.26 + debug " * mv 'fs$dir'\n -> 'fs${dir%/*}/$ldir'" 2.27 + mkdir -p "fs${dir%/*}/${ldir%/*}" 2.28 + mv "fs$dir" "fs${dir%/*}/$ldir" 2.29 + fi 2.30 + done 2.31 + unset IFS 2.32 + 2.33 + debug ' copying folders and files to destination' 2.34 + cp -af fs/* "$root/" 2.35 + status 2.36 + fi 2.37 2.38 2.39 if [ -s files2remove.list ]; then
3.1 --- a/po/el.po Mon Oct 05 03:53:47 2015 +0300 3.2 +++ b/po/el.po Tue Oct 06 15:46:41 2015 +0300 3.3 @@ -6,7 +6,7 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: TazPkg 5.3\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 3.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 3.9 "PO-Revision-Date: 2012-12-23 14:08+0200\n" 3.10 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n" 3.11 "Language-Team: Kostis Mousafiris\n" 3.12 @@ -747,7 +747,8 @@ 3.13 msgstr "Κάποιες εξαρτήσεις για το %s έμειναν ανεπίλυτες." 3.14 3.15 #: modules/install:180 3.16 -msgid "The package is installed but will probably not work." 3.17 +#, fuzzy 3.18 +msgid "The package will be installed but will probably not work." 3.19 msgstr "Το πακέτο εγκαταστάθηκε, αλλά μάλλον δε θα δουλέψει." 3.20 3.21 #: modules/install:251 3.22 @@ -784,33 +785,33 @@ 3.23 msgid "Saving configuration files..." 3.24 msgstr "Γίνεται αποθήκευση των αρχείων ρυθμίσεως..." 3.25 3.26 -#: modules/install:460 3.27 +#: modules/install:461 3.28 msgid "Installing package..." 3.29 msgstr "Γίνεται εγκατάσταση..." 3.30 3.31 -#: modules/install:466 3.32 +#: modules/install:481 3.33 #, fuzzy 3.34 msgid "Removing old files..." 3.35 msgstr "Γίνεται απομάκρυνση όλων των προσωρινών αρχείων temp..." 3.36 3.37 -#: modules/install:483 3.38 +#: modules/install:498 3.39 msgid "Removing all tmp files..." 3.40 msgstr "Γίνεται απομάκρυνση όλων των προσωρινών αρχείων temp..." 3.41 3.42 -#: modules/install:508 3.43 +#: modules/install:523 3.44 #, fuzzy 3.45 msgid "Update system databases..." 3.46 msgstr "Γίνεται απομάκρυνση όλων των προσωρινών αρχείων temp..." 3.47 3.48 -#: modules/install:546 3.49 +#: modules/install:561 3.50 msgid "Package \"%s\" (%s) is installed." 3.51 msgstr "Το πακέτο %s (%s) δεν έχει εγκατασταθεί." 3.52 3.53 -#: modules/install:576 3.54 +#: modules/install:591 3.55 msgid "\"%s\" package is already installed." 3.56 msgstr "Το πακέτο \"%s\" είναι ήδη εγκατεστημένο." 3.57 3.58 -#: modules/install:577 3.59 +#: modules/install:592 3.60 msgid "You can use the --forced option to force installation." 3.61 msgstr "" 3.62 "Μπορείτε να χρησιμοποιήσετε την επιλογή --forced για να κάνετε υποχρεωτική\n"
4.1 --- a/po/es.po Mon Oct 05 03:53:47 2015 +0300 4.2 +++ b/po/es.po Tue Oct 06 15:46:41 2015 +0300 4.3 @@ -8,7 +8,7 @@ 4.4 msgstr "" 4.5 "Project-Id-Version: TazPkg 5.1\n" 4.6 "Report-Msgid-Bugs-To: \n" 4.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 4.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 4.9 "PO-Revision-Date: 2012-06-11 18:31-0000\n" 4.10 "Last-Translator: Kevin Fabian Quintero <kefaquin@gmail.com>\n" 4.11 "Language-Team: \n" 4.12 @@ -773,7 +773,8 @@ 4.13 msgstr "Dejando dependencias de %s sin resolver." 4.14 4.15 #: modules/install:180 4.16 -msgid "The package is installed but will probably not work." 4.17 +#, fuzzy 4.18 +msgid "The package will be installed but will probably not work." 4.19 msgstr "El paquete está instalado pero probablemente no trabaje." 4.20 4.21 #: modules/install:251 4.22 @@ -808,33 +809,33 @@ 4.23 msgid "Saving configuration files..." 4.24 msgstr "Guardando archivos de configuración..." 4.25 4.26 -#: modules/install:460 4.27 +#: modules/install:461 4.28 msgid "Installing package..." 4.29 msgstr "Instalando..." 4.30 4.31 -#: modules/install:466 4.32 +#: modules/install:481 4.33 #, fuzzy 4.34 msgid "Removing old files..." 4.35 msgstr "Removiendo todos los archivos tmp..." 4.36 4.37 -#: modules/install:483 4.38 +#: modules/install:498 4.39 msgid "Removing all tmp files..." 4.40 msgstr "Removiendo todos los archivos tmp..." 4.41 4.42 -#: modules/install:508 4.43 +#: modules/install:523 4.44 #, fuzzy 4.45 msgid "Update system databases..." 4.46 msgstr "Removiendo todos los archivos tmp..." 4.47 4.48 -#: modules/install:546 4.49 +#: modules/install:561 4.50 msgid "Package \"%s\" (%s) is installed." 4.51 msgstr "Paquete %s (%s) no está instalado." 4.52 4.53 -#: modules/install:576 4.54 +#: modules/install:591 4.55 msgid "\"%s\" package is already installed." 4.56 msgstr "El paquete \"%s\" ya esta instalado." 4.57 4.58 -#: modules/install:577 4.59 +#: modules/install:592 4.60 msgid "You can use the --forced option to force installation." 4.61 msgstr "" 4.62 "Usted puede utilizar la opción --force para forzar la instalación o "
5.1 --- a/po/fr.po Mon Oct 05 03:53:47 2015 +0300 5.2 +++ b/po/fr.po Tue Oct 06 15:46:41 2015 +0300 5.3 @@ -8,7 +8,7 @@ 5.4 msgstr "" 5.5 "Project-Id-Version: TazPkg 5.1\n" 5.6 "Report-Msgid-Bugs-To: \n" 5.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 5.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 5.9 "PO-Revision-Date: 2014-02-16 14:06+0100\n" 5.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 5.11 "Language-Team: French\n" 5.12 @@ -712,7 +712,8 @@ 5.13 msgstr "Dépendances pour %s non résolues." 5.14 5.15 #: modules/install:180 5.16 -msgid "The package is installed but will probably not work." 5.17 +#, fuzzy 5.18 +msgid "The package will be installed but will probably not work." 5.19 msgstr "Le paquet est installé mais ne va probablement pas fonctionner." 5.20 5.21 #: modules/install:251 5.22 @@ -746,33 +747,33 @@ 5.23 msgid "Saving configuration files..." 5.24 msgstr "Sauvegarde des fichiers de configuration..." 5.25 5.26 -#: modules/install:460 5.27 +#: modules/install:461 5.28 msgid "Installing package..." 5.29 msgstr "Installation du paquet..." 5.30 5.31 -#: modules/install:466 5.32 +#: modules/install:481 5.33 #, fuzzy 5.34 msgid "Removing old files..." 5.35 msgstr "Suppression des fichiers temporaires..." 5.36 5.37 -#: modules/install:483 5.38 +#: modules/install:498 5.39 msgid "Removing all tmp files..." 5.40 msgstr "Suppression des fichiers temporaires..." 5.41 5.42 -#: modules/install:508 5.43 +#: modules/install:523 5.44 #, fuzzy 5.45 msgid "Update system databases..." 5.46 msgstr "Restoration des fichiers d'index..." 5.47 5.48 -#: modules/install:546 5.49 +#: modules/install:561 5.50 msgid "Package \"%s\" (%s) is installed." 5.51 msgstr "Le paquet %s (%s) est installé." 5.52 5.53 -#: modules/install:576 5.54 +#: modules/install:591 5.55 msgid "\"%s\" package is already installed." 5.56 msgstr "Le paquet « %s » est déjà installé." 5.57 5.58 -#: modules/install:577 5.59 +#: modules/install:592 5.60 msgid "You can use the --forced option to force installation." 5.61 msgstr "Vous pouvez utiliser l'option --forced pour forcer son installation." 5.62
6.1 --- a/po/pl.po Mon Oct 05 03:53:47 2015 +0300 6.2 +++ b/po/pl.po Tue Oct 06 15:46:41 2015 +0300 6.3 @@ -7,7 +7,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: TazPkg 5.0\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 6.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 6.9 "PO-Revision-Date: 2013-08-07 13:34+0100\n" 6.10 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n" 6.11 "Language-Team: Paweł Pyrczak <support@pyrczak.pl>\n" 6.12 @@ -758,7 +758,8 @@ 6.13 msgstr "Pozostawianie nierozwiązanych zależności dla %s." 6.14 6.15 #: modules/install:180 6.16 -msgid "The package is installed but will probably not work." 6.17 +#, fuzzy 6.18 +msgid "The package will be installed but will probably not work." 6.19 msgstr "Pakiet jest zainstalowany ale prawdopodobnie nie będzie działał." 6.20 6.21 #: modules/install:251 6.22 @@ -793,33 +794,33 @@ 6.23 msgid "Saving configuration files..." 6.24 msgstr "Zachowywanie plików konfiguracyjnych..." 6.25 6.26 -#: modules/install:460 6.27 +#: modules/install:461 6.28 msgid "Installing package..." 6.29 msgstr "Instalowanie..." 6.30 6.31 -#: modules/install:466 6.32 +#: modules/install:481 6.33 #, fuzzy 6.34 msgid "Removing old files..." 6.35 msgstr "Usuwanie wszystkich tymczasowych plików tmp..." 6.36 6.37 -#: modules/install:483 6.38 +#: modules/install:498 6.39 msgid "Removing all tmp files..." 6.40 msgstr "Usuwanie wszystkich tymczasowych plików tmp..." 6.41 6.42 -#: modules/install:508 6.43 +#: modules/install:523 6.44 #, fuzzy 6.45 msgid "Update system databases..." 6.46 msgstr "Usuwanie wszystkich tymczasowych plików tmp..." 6.47 6.48 -#: modules/install:546 6.49 +#: modules/install:561 6.50 msgid "Package \"%s\" (%s) is installed." 6.51 msgstr "Pakiet %s (%s) nie jest zainstalowany." 6.52 6.53 -#: modules/install:576 6.54 +#: modules/install:591 6.55 msgid "\"%s\" package is already installed." 6.56 msgstr "Pakiet \"%s\" już jest zainstalowany." 6.57 6.58 -#: modules/install:577 6.59 +#: modules/install:592 6.60 msgid "You can use the --forced option to force installation." 6.61 msgstr "" 6.62 "Można użyć opcji --forced aby wymusić instalację, albo usunąć\n"
7.1 --- a/po/pt_BR.po Mon Oct 05 03:53:47 2015 +0300 7.2 +++ b/po/pt_BR.po Tue Oct 06 15:46:41 2015 +0300 7.3 @@ -7,7 +7,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: TazPkg 5.1\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 7.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 7.9 "PO-Revision-Date: 2014-03-06 22:34-0300\n" 7.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 7.11 "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n" 7.12 @@ -727,7 +727,8 @@ 7.13 msgstr "Deixando dependências para %s não resolvidas." 7.14 7.15 #: modules/install:180 7.16 -msgid "The package is installed but will probably not work." 7.17 +#, fuzzy 7.18 +msgid "The package will be installed but will probably not work." 7.19 msgstr "O pacote está instalado mas provavelmente não funcionará." 7.20 7.21 #: modules/install:251 7.22 @@ -762,33 +763,33 @@ 7.23 msgid "Saving configuration files..." 7.24 msgstr "Salvando arquivos de configuração..." 7.25 7.26 -#: modules/install:460 7.27 +#: modules/install:461 7.28 msgid "Installing package..." 7.29 msgstr "Instalando..." 7.30 7.31 -#: modules/install:466 7.32 +#: modules/install:481 7.33 #, fuzzy 7.34 msgid "Removing old files..." 7.35 msgstr "Removendo todos os arquivos temporários..." 7.36 7.37 -#: modules/install:483 7.38 +#: modules/install:498 7.39 msgid "Removing all tmp files..." 7.40 msgstr "Removendo todos os arquivos temporários..." 7.41 7.42 -#: modules/install:508 7.43 +#: modules/install:523 7.44 #, fuzzy 7.45 msgid "Update system databases..." 7.46 msgstr "Removendo todos os arquivos temporários..." 7.47 7.48 -#: modules/install:546 7.49 +#: modules/install:561 7.50 msgid "Package \"%s\" (%s) is installed." 7.51 msgstr "Pacote %s (%s) está instalado." 7.52 7.53 -#: modules/install:576 7.54 +#: modules/install:591 7.55 msgid "\"%s\" package is already installed." 7.56 msgstr "O pacote \"%s\" já está instalado." 7.57 7.58 -#: modules/install:577 7.59 +#: modules/install:592 7.60 msgid "You can use the --forced option to force installation." 7.61 msgstr "Você pode usar a opção --forced para forçar a instalação." 7.62
8.1 --- a/po/ru.po Mon Oct 05 03:53:47 2015 +0300 8.2 +++ b/po/ru.po Tue Oct 06 15:46:41 2015 +0300 8.3 @@ -7,7 +7,7 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: TazPkg 5.1\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 8.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 8.9 "PO-Revision-Date: 2015-10-05 03:50+0300\n" 8.10 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 8.11 "Language-Team: Russian\n" 8.12 @@ -714,8 +714,8 @@ 8.13 msgstr "Зависимости пакета «%s» оставлены нерешенными." 8.14 8.15 #: modules/install:180 8.16 -msgid "The package is installed but will probably not work." 8.17 -msgstr "Пакет установлен, но, возможно, не будет работать." 8.18 +msgid "The package will be installed but will probably not work." 8.19 +msgstr "Пакет будет установлен, но, возможно, не будет работать." 8.20 8.21 #: modules/install:251 8.22 msgid "Execute pre-install commands..." 8.23 @@ -745,31 +745,31 @@ 8.24 msgid "Saving configuration files..." 8.25 msgstr "Сохранение конфигурационных файлов…" 8.26 8.27 -#: modules/install:460 8.28 +#: modules/install:461 8.29 msgid "Installing package..." 8.30 msgstr "Установка пакета…" 8.31 8.32 -#: modules/install:466 8.33 +#: modules/install:481 8.34 msgid "Removing old files..." 8.35 msgstr "Удаление устаревших файлов…" 8.36 8.37 -#: modules/install:483 8.38 +#: modules/install:498 8.39 msgid "Removing all tmp files..." 8.40 msgstr "Удаление всех временных файлов…" 8.41 8.42 -#: modules/install:508 8.43 +#: modules/install:523 8.44 msgid "Update system databases..." 8.45 msgstr "Обновление системных баз данных…" 8.46 8.47 -#: modules/install:546 8.48 +#: modules/install:561 8.49 msgid "Package \"%s\" (%s) is installed." 8.50 msgstr "Пакет «%s» (%s) установлен." 8.51 8.52 -#: modules/install:576 8.53 +#: modules/install:591 8.54 msgid "\"%s\" package is already installed." 8.55 msgstr "Пакет «%s» уже был установлен." 8.56 8.57 -#: modules/install:577 8.58 +#: modules/install:592 8.59 msgid "You can use the --forced option to force installation." 8.60 msgstr "Используйте опцию --forced, чтобы принудительно установить пакет." 8.61
9.1 --- a/po/sv.po Mon Oct 05 03:53:47 2015 +0300 9.2 +++ b/po/sv.po Tue Oct 06 15:46:41 2015 +0300 9.3 @@ -7,7 +7,7 @@ 9.4 msgstr "" 9.5 "Project-Id-Version: TazPkg 5.1\n" 9.6 "Report-Msgid-Bugs-To: \n" 9.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 9.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 9.9 "PO-Revision-Date: 2012-07-11 11:33-0000\n" 9.10 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n" 9.11 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" 9.12 @@ -737,7 +737,7 @@ 9.13 msgstr "" 9.14 9.15 #: modules/install:180 9.16 -msgid "The package is installed but will probably not work." 9.17 +msgid "The package will be installed but will probably not work." 9.18 msgstr "" 9.19 9.20 #: modules/install:251 9.21 @@ -770,33 +770,33 @@ 9.22 msgid "Saving configuration files..." 9.23 msgstr "" 9.24 9.25 -#: modules/install:460 9.26 +#: modules/install:461 9.27 msgid "Installing package..." 9.28 msgstr "" 9.29 9.30 -#: modules/install:466 9.31 +#: modules/install:481 9.32 #, fuzzy 9.33 msgid "Removing old files..." 9.34 msgstr "Listar relaterade paket..." 9.35 9.36 -#: modules/install:483 9.37 +#: modules/install:498 9.38 msgid "Removing all tmp files..." 9.39 msgstr "" 9.40 9.41 -#: modules/install:508 9.42 +#: modules/install:523 9.43 #, fuzzy 9.44 msgid "Update system databases..." 9.45 msgstr "Listar relaterade paket..." 9.46 9.47 -#: modules/install:546 9.48 +#: modules/install:561 9.49 msgid "Package \"%s\" (%s) is installed." 9.50 msgstr "" 9.51 9.52 -#: modules/install:576 9.53 +#: modules/install:591 9.54 msgid "\"%s\" package is already installed." 9.55 msgstr "" 9.56 9.57 -#: modules/install:577 9.58 +#: modules/install:592 9.59 msgid "You can use the --forced option to force installation." 9.60 msgstr "" 9.61
10.1 --- a/po/tazpkg.pot Mon Oct 05 03:53:47 2015 +0300 10.2 +++ b/po/tazpkg.pot Tue Oct 06 15:46:41 2015 +0300 10.3 @@ -8,7 +8,7 @@ 10.4 msgstr "" 10.5 "Project-Id-Version: TazPkg 5.0\n" 10.6 "Report-Msgid-Bugs-To: \n" 10.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 10.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 10.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 10.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 10.11 "Language-Team: LANGUAGE <LL@li.org>\n" 10.12 @@ -697,7 +697,7 @@ 10.13 msgstr "" 10.14 10.15 #: modules/install:180 10.16 -msgid "The package is installed but will probably not work." 10.17 +msgid "The package will be installed but will probably not work." 10.18 msgstr "" 10.19 10.20 #: modules/install:251 10.21 @@ -728,31 +728,31 @@ 10.22 msgid "Saving configuration files..." 10.23 msgstr "" 10.24 10.25 -#: modules/install:460 10.26 +#: modules/install:461 10.27 msgid "Installing package..." 10.28 msgstr "" 10.29 10.30 -#: modules/install:466 10.31 +#: modules/install:481 10.32 msgid "Removing old files..." 10.33 msgstr "" 10.34 10.35 -#: modules/install:483 10.36 +#: modules/install:498 10.37 msgid "Removing all tmp files..." 10.38 msgstr "" 10.39 10.40 -#: modules/install:508 10.41 +#: modules/install:523 10.42 msgid "Update system databases..." 10.43 msgstr "" 10.44 10.45 -#: modules/install:546 10.46 +#: modules/install:561 10.47 msgid "Package \"%s\" (%s) is installed." 10.48 msgstr "" 10.49 10.50 -#: modules/install:576 10.51 +#: modules/install:591 10.52 msgid "\"%s\" package is already installed." 10.53 msgstr "" 10.54 10.55 -#: modules/install:577 10.56 +#: modules/install:592 10.57 msgid "You can use the --forced option to force installation." 10.58 msgstr "" 10.59
11.1 --- a/po/zh_CN.po Mon Oct 05 03:53:47 2015 +0300 11.2 +++ b/po/zh_CN.po Tue Oct 06 15:46:41 2015 +0300 11.3 @@ -7,7 +7,7 @@ 11.4 msgstr "" 11.5 "Project-Id-Version: TazPkg 5.2\n" 11.6 "Report-Msgid-Bugs-To: \n" 11.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 11.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 11.9 "PO-Revision-Date: 2015-07-24 19:08+0800\n" 11.10 "Last-Translator: Wenyu Zhang <jame987165702@gmail.com>\n" 11.11 "Language-Team: rhsky <rhsky@qq.com>\n" 11.12 @@ -715,7 +715,8 @@ 11.13 msgstr "放任 %s 依赖软件包不管。" 11.14 11.15 #: modules/install:180 11.16 -msgid "The package is installed but will probably not work." 11.17 +#, fuzzy 11.18 +msgid "The package will be installed but will probably not work." 11.19 msgstr "软件会被安装但是可能不会正常运行。" 11.20 11.21 #: modules/install:251 11.22 @@ -749,33 +750,33 @@ 11.23 msgid "Saving configuration files..." 11.24 msgstr "正在储存 的配置文件" 11.25 11.26 -#: modules/install:460 11.27 +#: modules/install:461 11.28 msgid "Installing package..." 11.29 msgstr "正在安装..." 11.30 11.31 -#: modules/install:466 11.32 +#: modules/install:481 11.33 #, fuzzy 11.34 msgid "Removing old files..." 11.35 msgstr "正在移除所有暂存文件..." 11.36 11.37 -#: modules/install:483 11.38 +#: modules/install:498 11.39 msgid "Removing all tmp files..." 11.40 msgstr "正在移除所有暂存文件..." 11.41 11.42 -#: modules/install:508 11.43 +#: modules/install:523 11.44 #, fuzzy 11.45 msgid "Update system databases..." 11.46 msgstr "还原数据库文件..." 11.47 11.48 -#: modules/install:546 11.49 +#: modules/install:561 11.50 msgid "Package \"%s\" (%s) is installed." 11.51 msgstr "软件包%s (%s) 软件包已安装。" 11.52 11.53 -#: modules/install:576 11.54 +#: modules/install:591 11.55 msgid "\"%s\" package is already installed." 11.56 msgstr "\"%s\" 软件包已经被安装" 11.57 11.58 -#: modules/install:577 11.59 +#: modules/install:592 11.60 msgid "You can use the --forced option to force installation." 11.61 msgstr "你可以用 --forced 选项强制安装" 11.62
12.1 --- a/po/zh_TW.po Mon Oct 05 03:53:47 2015 +0300 12.2 +++ b/po/zh_TW.po Tue Oct 06 15:46:41 2015 +0300 12.3 @@ -7,7 +7,7 @@ 12.4 msgstr "" 12.5 "Project-Id-Version: TazPkg 5.2\n" 12.6 "Report-Msgid-Bugs-To: \n" 12.7 -"POT-Creation-Date: 2015-10-05 03:48+0300\n" 12.8 +"POT-Creation-Date: 2015-10-06 15:41+0300\n" 12.9 "PO-Revision-Date: 2014-06-07 22:55+0800\n" 12.10 "Last-Translator: lunglungyu <lunglungyu2004@gmail.com>\n" 12.11 "Language-Team: \n" 12.12 @@ -720,7 +720,8 @@ 12.13 msgstr "%s 有未解決包依賴." 12.14 12.15 #: modules/install:180 12.16 -msgid "The package is installed but will probably not work." 12.17 +#, fuzzy 12.18 +msgid "The package will be installed but will probably not work." 12.19 msgstr "包已安裝但可能無法正常工作." 12.20 12.21 #: modules/install:251 12.22 @@ -755,33 +756,33 @@ 12.23 msgid "Saving configuration files..." 12.24 msgstr "正在儲存 的配置文件" 12.25 12.26 -#: modules/install:460 12.27 +#: modules/install:461 12.28 msgid "Installing package..." 12.29 msgstr "正在安裝..." 12.30 12.31 -#: modules/install:466 12.32 +#: modules/install:481 12.33 #, fuzzy 12.34 msgid "Removing old files..." 12.35 msgstr "正在移除所有暫存文件..." 12.36 12.37 -#: modules/install:483 12.38 +#: modules/install:498 12.39 msgid "Removing all tmp files..." 12.40 msgstr "正在移除所有暫存文件..." 12.41 12.42 -#: modules/install:508 12.43 +#: modules/install:523 12.44 #, fuzzy 12.45 msgid "Update system databases..." 12.46 msgstr "正在移除所有暫存文件..." 12.47 12.48 -#: modules/install:546 12.49 +#: modules/install:561 12.50 msgid "Package \"%s\" (%s) is installed." 12.51 msgstr "%s (%s) 包未被安裝" 12.52 12.53 -#: modules/install:576 12.54 +#: modules/install:591 12.55 msgid "\"%s\" package is already installed." 12.56 msgstr "包已經被安裝" 12.57 12.58 -#: modules/install:577 12.59 +#: modules/install:592 12.60 msgid "You can use the --forced option to force installation." 12.61 msgstr "你可以用 --forced 選項強制安裝" 12.62