sup rev 21
Small typo and up a bit of the french translation (to test i18n functions)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Sun Feb 26 21:20:25 2017 +0100 (2017-02-26) |
| parents | c0a780b534c2 |
| children | 361b8459a302 |
| files | Makefile libsup.sh po/clients/fr.po po/clients/sup-clients.pot sup |
line diff
1.1 --- a/Makefile Sun Feb 26 21:05:33 2017 +0100 1.2 +++ b/Makefile Sun Feb 26 21:20:25 2017 +0100 1.3 @@ -12,7 +12,7 @@ 1.4 1.5 pot: 1.6 xgettext -o po/clients/sup-clients.pot -L Shell \ 1.7 - --package-name="Sup Clients" \ 1.8 + --package-name="SUP Clients" \ 1.9 ./sup ./libsup.sh 1.10 1.11 msgmerge:
2.1 --- a/libsup.sh Sun Feb 26 21:05:33 2017 +0100 2.2 +++ b/libsup.sh Sun Feb 26 21:20:25 2017 +0100 2.3 @@ -112,11 +112,11 @@ 2.4 echo "sup_size=\"$(du -sh files | cut -d " " -f 1)\"" >> receip 2.5 2.6 # Now we need a place to store package data and set $sup_size 2.7 - 2.8 gettext "Installing files:" 2.9 echo -n "$(colorize 35 " $(wc -l files.list | cut -d " " -f 1)")" 2.10 data="${installed}/${PACKAGE}" 2.11 mkdir -p ${data} 2.12 + 2.13 for file in receip README files.list; do 2.14 [ -f "$file" ] && cp -f ${file} ${data} 2.15 done
3.1 --- a/po/clients/fr.po Sun Feb 26 21:05:33 2017 +0100 3.2 +++ b/po/clients/fr.po Sun Feb 26 21:20:25 2017 +0100 3.3 @@ -7,8 +7,8 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: Sup Clients\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2017-02-26 19:19+0100\n" 3.8 -"PO-Revision-Date: 2017-02-23 14:15+0100\n" 3.9 +"POT-Creation-Date: 2017-02-26 21:09+0100\n" 3.10 +"PO-Revision-Date: 2017-02-26 21:15+0100\n" 3.11 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 3.12 "Language-Team: French\n" 3.13 "Language: fr\n" 3.14 @@ -29,135 +29,169 @@ 3.15 3.16 #: sup:31 3.17 msgid "Commands:" 3.18 -msgstr "" 3.19 +msgstr "Commandes:" 3.20 3.21 #: sup:32 3.22 msgid "Cook a package from the wok" 3.23 -msgstr "" 3.24 +msgstr "Cuire un paquet depuis le wok" 3.25 3.26 #: sup:33 3.27 msgid "Extract a package to current dir" 3.28 msgstr "" 3.29 3.30 #: sup:34 3.31 -#, fuzzy 3.32 msgid "Install a sup package" 3.33 -msgstr "Installation de:" 3.34 +msgstr "Installe un paquet sup" 3.35 3.36 #: sup:35 3.37 +msgid "Remove package files" 3.38 +msgstr "Supprime un paquet et ses fichiers" 3.39 + 3.40 +#: sup:36 3.41 msgid "List installed packages and your wok" 3.42 msgstr "" 3.43 3.44 -#: sup:37 3.45 +#: sup:38 3.46 msgid "Options:" 3.47 msgstr "" 3.48 3.49 -#: sup:38 3.50 +#: sup:39 3.51 msgid "Initialize sup cook environment" 3.52 msgstr "" 3.53 3.54 -#: sup:39 3.55 +#: sup:40 3.56 msgid "Display more output messages" 3.57 msgstr "" 3.58 3.59 -#: sup:91 3.60 +#: sup:92 3.61 msgid "Initializing sup cook environment..." 3.62 msgstr "" 3.63 3.64 -#: sup:98 3.65 +#: sup:99 3.66 msgid "You must specify a package to cook:" 3.67 msgstr "" 3.68 3.69 -#: sup:102 3.70 +#: sup:103 3.71 msgid "Can't find receip in wok for:" 3.72 msgstr "" 3.73 3.74 -#: sup:107 3.75 +#: sup:108 3.76 msgid "Building package:" 3.77 msgstr "" 3.78 3.79 -#: sup:112 3.80 +#: sup:113 3.81 msgid "Checking receip variables..." 3.82 msgstr "" 3.83 3.84 -#: sup:120 sup:125 3.85 +#: sup:121 sup:126 3.86 msgid "Empty variable:" 3.87 msgstr "" 3.88 3.89 -#: sup:126 3.90 +#: sup:127 3.91 msgid "You can use:" 3.92 msgstr "" 3.93 3.94 -#: sup:147 3.95 +#: sup:148 3.96 msgid "Creating compressed archive..." 3.97 msgstr "" 3.98 3.99 -#: sup:154 sup:177 3.100 +#: sup:155 sup:178 3.101 msgid "Packages:" 3.102 msgstr "" 3.103 3.104 -#: sup:164 sup:185 3.105 -msgid "Missing package in argument:" 3.106 +#: sup:165 3.107 +msgid "Missing package file in argument:" 3.108 msgstr "" 3.109 3.110 -#: sup:168 3.111 +#: sup:169 3.112 msgid "Can't find package file:" 3.113 msgstr "" 3.114 3.115 -#: sup:172 3.116 +#: sup:173 3.117 msgid "Extract package:" 3.118 msgstr "" 3.119 3.120 -#: sup:205 3.121 +#: sup:186 3.122 +msgid "Missing package name or file in argument:" 3.123 +msgstr "" 3.124 + 3.125 +#: sup:206 3.126 msgid "Can't find sup package:" 3.127 msgstr "" 3.128 3.129 -#: sup:210 3.130 +#: sup:213 3.131 +msgid "Missing package name in argument:" 3.132 +msgstr "" 3.133 + 3.134 +#: sup:220 sup:265 3.135 +msgid "Can't find installed package:" 3.136 +msgstr "" 3.137 + 3.138 +#: sup:227 3.139 msgid "Installed sup packages:" 3.140 msgstr "" 3.141 3.142 -#: sup:218 3.143 +#: sup:235 3.144 msgid "No sup packages installed" 3.145 msgstr "" 3.146 3.147 -#: sup:222 3.148 +#: sup:239 3.149 msgid "Sup packages in your wok:" 3.150 msgstr "" 3.151 3.152 -#: sup:240 3.153 -#, fuzzy 3.154 +#: sup:257 3.155 msgid "Installed package:" 3.156 -msgstr "Installation de:" 3.157 +msgstr "Paquet installé:" 3.158 3.159 -#: sup:249 3.160 -msgid "Can't find installed package:" 3.161 -msgstr "" 3.162 +#: sup:261 3.163 +msgid "Installed files:" 3.164 +msgstr "Fichers installés:" 3.165 3.166 -#: libsup.sh:38 3.167 +#: libsup.sh:45 3.168 msgid "Uncompressing package tree..." 3.169 msgstr "" 3.170 3.171 -#: libsup.sh:64 3.172 +#: libsup.sh:71 3.173 msgid "Checking dependencies for" 3.174 msgstr "" 3.175 3.176 -#: libsup.sh:78 libsup.sh:79 3.177 +#: libsup.sh:85 libsup.sh:86 3.178 #, fuzzy 3.179 msgid "Installing package:" 3.180 msgstr "Installation de:" 3.181 3.182 -#: libsup.sh:90 3.183 +#: libsup.sh:96 3.184 msgid "Executing install function:" 3.185 msgstr "" 3.186 3.187 -#: libsup.sh:97 3.188 +#: libsup.sh:103 3.189 msgid "Creating the list of installed files..." 3.190 msgstr "" 3.191 3.192 -#: libsup.sh:119 3.193 +#: libsup.sh:115 3.194 #, fuzzy 3.195 -msgid "Installed files:" 3.196 +msgid "Installing files:" 3.197 msgstr "Installation de:" 3.198 3.199 +#: libsup.sh:136 libsup.sh:137 3.200 +msgid "Removing package:" 3.201 +msgstr "Suppression du paquet:" 3.202 + 3.203 +#: libsup.sh:140 3.204 +msgid "Files to remove :" 3.205 +msgstr "Fichiers à supprimer :" 3.206 + 3.207 +#: libsup.sh:149 3.208 +msgid "Removing file :" 3.209 +msgstr "" 3.210 + 3.211 +#: libsup.sh:154 3.212 +msgid "Removing folder :" 3.213 +msgstr "" 3.214 + 3.215 +#: libsup.sh:165 3.216 +msgid "Removing packages from local database..." 3.217 +msgstr "" 3.218 + 3.219 #~ msgid "Missing HOME path!" 3.220 #~ msgstr "HOME est manquant!"
4.1 --- a/po/clients/sup-clients.pot Sun Feb 26 21:05:33 2017 +0100 4.2 +++ b/po/clients/sup-clients.pot Sun Feb 26 21:20:25 2017 +0100 4.3 @@ -6,9 +6,9 @@ 4.4 #, fuzzy 4.5 msgid "" 4.6 msgstr "" 4.7 -"Project-Id-Version: Sup Clients\n" 4.8 +"Project-Id-Version: SUP Clients\n" 4.9 "Report-Msgid-Bugs-To: \n" 4.10 -"POT-Creation-Date: 2017-02-26 19:19+0100\n" 4.11 +"POT-Creation-Date: 2017-02-26 21:09+0100\n" 4.12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 4.13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 4.14 "Language-Team: LANGUAGE <LL@li.org>\n" 4.15 @@ -42,113 +42,149 @@ 4.16 msgstr "" 4.17 4.18 #: sup:35 4.19 +msgid "Remove package files" 4.20 +msgstr "" 4.21 + 4.22 +#: sup:36 4.23 msgid "List installed packages and your wok" 4.24 msgstr "" 4.25 4.26 -#: sup:37 4.27 +#: sup:38 4.28 msgid "Options:" 4.29 msgstr "" 4.30 4.31 -#: sup:38 4.32 +#: sup:39 4.33 msgid "Initialize sup cook environment" 4.34 msgstr "" 4.35 4.36 -#: sup:39 4.37 +#: sup:40 4.38 msgid "Display more output messages" 4.39 msgstr "" 4.40 4.41 -#: sup:91 4.42 +#: sup:92 4.43 msgid "Initializing sup cook environment..." 4.44 msgstr "" 4.45 4.46 -#: sup:98 4.47 +#: sup:99 4.48 msgid "You must specify a package to cook:" 4.49 msgstr "" 4.50 4.51 -#: sup:102 4.52 +#: sup:103 4.53 msgid "Can't find receip in wok for:" 4.54 msgstr "" 4.55 4.56 -#: sup:107 4.57 +#: sup:108 4.58 msgid "Building package:" 4.59 msgstr "" 4.60 4.61 -#: sup:112 4.62 +#: sup:113 4.63 msgid "Checking receip variables..." 4.64 msgstr "" 4.65 4.66 -#: sup:120 sup:125 4.67 +#: sup:121 sup:126 4.68 msgid "Empty variable:" 4.69 msgstr "" 4.70 4.71 -#: sup:126 4.72 +#: sup:127 4.73 msgid "You can use:" 4.74 msgstr "" 4.75 4.76 -#: sup:147 4.77 +#: sup:148 4.78 msgid "Creating compressed archive..." 4.79 msgstr "" 4.80 4.81 -#: sup:154 sup:177 4.82 +#: sup:155 sup:178 4.83 msgid "Packages:" 4.84 msgstr "" 4.85 4.86 -#: sup:164 sup:185 4.87 -msgid "Missing package in argument:" 4.88 +#: sup:165 4.89 +msgid "Missing package file in argument:" 4.90 msgstr "" 4.91 4.92 -#: sup:168 4.93 +#: sup:169 4.94 msgid "Can't find package file:" 4.95 msgstr "" 4.96 4.97 -#: sup:172 4.98 +#: sup:173 4.99 msgid "Extract package:" 4.100 msgstr "" 4.101 4.102 -#: sup:205 4.103 +#: sup:186 4.104 +msgid "Missing package name or file in argument:" 4.105 +msgstr "" 4.106 + 4.107 +#: sup:206 4.108 msgid "Can't find sup package:" 4.109 msgstr "" 4.110 4.111 -#: sup:210 4.112 +#: sup:213 4.113 +msgid "Missing package name in argument:" 4.114 +msgstr "" 4.115 + 4.116 +#: sup:220 sup:265 4.117 +msgid "Can't find installed package:" 4.118 +msgstr "" 4.119 + 4.120 +#: sup:227 4.121 msgid "Installed sup packages:" 4.122 msgstr "" 4.123 4.124 -#: sup:218 4.125 +#: sup:235 4.126 msgid "No sup packages installed" 4.127 msgstr "" 4.128 4.129 -#: sup:222 4.130 +#: sup:239 4.131 msgid "Sup packages in your wok:" 4.132 msgstr "" 4.133 4.134 -#: sup:240 4.135 +#: sup:257 4.136 msgid "Installed package:" 4.137 msgstr "" 4.138 4.139 -#: sup:249 4.140 -msgid "Can't find installed package:" 4.141 +#: sup:261 4.142 +msgid "Installed files:" 4.143 msgstr "" 4.144 4.145 -#: libsup.sh:38 4.146 +#: libsup.sh:45 4.147 msgid "Uncompressing package tree..." 4.148 msgstr "" 4.149 4.150 -#: libsup.sh:64 4.151 +#: libsup.sh:71 4.152 msgid "Checking dependencies for" 4.153 msgstr "" 4.154 4.155 -#: libsup.sh:78 libsup.sh:79 4.156 +#: libsup.sh:85 libsup.sh:86 4.157 msgid "Installing package:" 4.158 msgstr "" 4.159 4.160 -#: libsup.sh:90 4.161 +#: libsup.sh:96 4.162 msgid "Executing install function:" 4.163 msgstr "" 4.164 4.165 -#: libsup.sh:97 4.166 +#: libsup.sh:103 4.167 msgid "Creating the list of installed files..." 4.168 msgstr "" 4.169 4.170 -#: libsup.sh:119 4.171 -msgid "Installed files:" 4.172 +#: libsup.sh:115 4.173 +msgid "Installing files:" 4.174 msgstr "" 4.175 + 4.176 +#: libsup.sh:136 libsup.sh:137 4.177 +msgid "Removing package:" 4.178 +msgstr "" 4.179 + 4.180 +#: libsup.sh:140 4.181 +msgid "Files to remove :" 4.182 +msgstr "" 4.183 + 4.184 +#: libsup.sh:149 4.185 +msgid "Removing file :" 4.186 +msgstr "" 4.187 + 4.188 +#: libsup.sh:154 4.189 +msgid "Removing folder :" 4.190 +msgstr "" 4.191 + 4.192 +#: libsup.sh:165 4.193 +msgid "Removing packages from local database..." 4.194 +msgstr ""
5.1 --- a/sup Sun Feb 26 21:05:33 2017 +0100 5.2 +++ b/sup Sun Feb 26 21:20:25 2017 +0100 5.3 @@ -32,7 +32,7 @@ 5.4 -c cook $(gettext "Cook a package from the wok") 5.5 -e extract $(gettext "Extract a package to current dir") 5.6 -i install $(gettext "Install a sup package") 5.7 - -r remove $(gettext "Install a sup package") 5.8 + -r remove $(gettext "Remove package files") 5.9 -l list $(gettext "List installed packages and your wok") 5.10 5.11 $(boldify $(gettext "Options:"))