[pacman-dev] [PATCH 2/2] s/removing (all|old)/Removing \1/
More consistent capitalisation. Note that capitalisation for languages other than English have NOT been modified in any way as they would need to be done manually. Signed-off-by: Brendan Hide <brendan@swiftspirit.co.za> --- lib/libalpm/add.c | 2 +- po/cs.po | 4 ++-- po/de.po | 4 ++-- po/en_GB.po | 8 ++++---- po/es.po | 4 ++-- po/fr.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 4 ++-- po/pacman.pot | 4 ++-- po/pl.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 4 ++-- po/zh_CN.po | 4 ++-- src/pacman/sync.c | 4 ++-- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6eb2085..0931cd5 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -192,7 +192,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm ALPM_LOG_FUNC; - _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", + _alpm_log(PM_LOG_DEBUG, "Removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); if(!tr) { diff --git a/po/cs.po b/po/cs.po index cfbaf4c..a95bc11 100644 --- a/po/cs.po +++ b/po/cs.po @@ -719,7 +719,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Chcete odstranit staré balíčky z cache?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "odstraňují se staré balíčky z cache... " #, c-format @@ -735,7 +735,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Chcete odstranit VŠECHNY balíčky z cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "odstraňují se všechny balíčky z cache... " #, c-format diff --git a/po/de.po b/po/de.po index 5fdabdc..e78c3ae 100644 --- a/po/de.po +++ b/po/de.po @@ -748,7 +748,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Möchten Sie veraltete Pakete aus dem Puffer entfernen?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "Entferne alte Pakete aus dem Puffer... " #, c-format @@ -764,7 +764,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Möchten Sie ALLE Pakete aus dem Puffer entfernen? " #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "Entferne alle Pakete aus dem Puffer... " #, c-format diff --git a/po/en_GB.po b/po/en_GB.po index 74a74d9..af58c8d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -714,8 +714,8 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Do you want to remove outdated packages from cache?" #, c-format -msgid "removing old packages from cache... " -msgstr "removing old packages from cache... " +msgid "Removing old packages from cache... " +msgstr "Removing old packages from cache... " #, c-format msgid "could not access cache directory\n" @@ -730,8 +730,8 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Do you want to remove ALL packages from cache?" #, c-format -msgid "removing all packages from cache... " -msgstr "removing all packages from cache... " +msgid "Removing all packages from cache... " +msgstr "Removing all packages from cache... " #, c-format msgid "could not remove cache directory\n" diff --git a/po/es.po b/po/es.po index aa3e7eb..d385b0f 100644 --- a/po/es.po +++ b/po/es.po @@ -767,7 +767,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Desea borrar todos los paquetes desactualizados de la cache? " #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "quitando paquetes antiguos de la cache..." #, c-format @@ -783,7 +783,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Desea quitar TODOS los paquetes de la cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "quitando todos los paquetes de la cache... " #, c-format diff --git a/po/fr.po b/po/fr.po index eb69b94..2d2d17d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -773,7 +773,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Voulez-vous supprimer tous les paquets non installés du cache?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "Suppression du cache des paquets obsolètes... " #, c-format @@ -790,7 +790,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Voulez vous supprimer TOUS les paquets du cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "Suppression du cache de tous les paquets... " #, c-format diff --git a/po/hu.po b/po/hu.po index 743f333..a9b18c3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -723,7 +723,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Törölni kívánja az elavult csomagokat a gyorsítótárból?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "a régi csomagok törlése a gyorsítótárból... " #, c-format @@ -739,7 +739,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Törölni kívánja az ÖSSZES csomagot a gyorsítótárból?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "az összes csomag törlése a gyorsítótárból... " #, c-format diff --git a/po/it.po b/po/it.po index fd74bfb..5f0950d 100644 --- a/po/it.po +++ b/po/it.po @@ -734,7 +734,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Vuoi rimuovere dalla cache i pacchetti non aggiornati?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "rimozione dei vecchi pacchetti dalla cache in corso... " #, c-format @@ -750,7 +750,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Vuoi rimuovere dalla cache TUTTI i pacchetti?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "rimozione di tutti i pacchetti dalla cache in corso... " #, c-format diff --git a/po/pacman.pot b/po/pacman.pot index f4cc3e1..b6dbb3d 100644 --- a/po/pacman.pot +++ b/po/pacman.pot @@ -685,7 +685,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "" #, c-format @@ -701,7 +701,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "" #, c-format diff --git a/po/pl.po b/po/pl.po index cf027ac..fbedd33 100644 --- a/po/pl.po +++ b/po/pl.po @@ -739,7 +739,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Czy chcesz usunąć odinstalowane pakiety z pamięci podręcznej?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "usuwanie starych pakietów z pamięci podręcznej... " #, c-format @@ -755,7 +755,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Czy chcesz usunąć WSZYSTKIE pakiety z pamięci podręcznej?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "usuwanie wszystkich pakietów z pamięci podręcznej... " #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index c540aaf..55e93d1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -756,7 +756,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Deseja remover os pacotes desatualizados do cache?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "removendo pacotes antigos do cache... " #, c-format @@ -772,7 +772,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Deseja remover TODOS os pacotes do cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "removendo todos os pacotes do cache... " #, c-format diff --git a/po/ru.po b/po/ru.po index 067f739..8efaa59 100644 --- a/po/ru.po +++ b/po/ru.po @@ -728,7 +728,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Хотите удалить устаревшие пакеты из кэша?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "удаляю старые пакеты из кэша... " #, c-format @@ -744,7 +744,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Хотите удалить ВСЕ пакеты из кэша?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "удаляю все пакеты из кэша... " #, c-format diff --git a/po/tr.po b/po/tr.po index 07d877a..9d9dce9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -722,7 +722,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Kaldırılan paketleri önbellekten silmek istiyor musunuz?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "önbellekteki eski paketler siliniyor... " #, c-format @@ -738,7 +738,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Önbellekteki TÜM paketleri silmek istiyor musunuz?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "önbellekteki tüm paketler siliniyor... " #, c-format diff --git a/po/uk.po b/po/uk.po index ffd22a0..d472f53 100644 --- a/po/uk.po +++ b/po/uk.po @@ -732,7 +732,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Ви хочете видалити старі пакунки з кешу?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "видалення старих пакунків з кешу... " #, c-format @@ -748,7 +748,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Ви хочете видалити ВСІ пакунки з кешу?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "видалення всіх пакунків з кешу... " #, c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 8727aad..f2cb240 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -673,7 +673,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "打算从缓存中删除过期的软件包吗？" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "正在从缓存中删除旧软件包..." #, c-format @@ -689,7 +689,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "打算从缓存中删除所有软件包吗？" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "正在从缓存中删除所有软件包..." #, c-format diff --git a/src/pacman/sync.c b/src/pacman/sync.c index d8a6348..261f2d1 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -148,7 +148,7 @@ static int sync_cleancache(int level) /* this should not happen : the config parsing doesn't set any other value */ return(1); } - printf(_("removing old packages from cache... ")); + printf(_("Removing old packages from cache... ")); dir = opendir(cachedir); if(dir == NULL) { @@ -218,7 +218,7 @@ static int sync_cleancache(int level) if(!noyes(_("Do you want to remove ALL packages from cache?"))) { return(0); } - printf(_("removing all packages from cache... ")); + printf(_("Removing all packages from cache... ")); if(rmrf(cachedir)) { pm_fprintf(stderr, PM_LOG_ERROR, _("could not remove cache directory\n")); -- 1.6.3.1
On Wed, May 20, 2009 at 2:37 PM, Brendan Hide<brendan@swiftspirit.co.za> wrote:
More consistent capitalisation. Note that capitalisation for languages other than English have NOT been modified in any way as they would need to be done manually.
Signed-off-by: Brendan Hide <brendan@swiftspirit.co.za>
Ugh, I'm late on this obviously. Being a debug message, this seems a bit far out? -Dan
On Wed, Jul 1, 2009 at 12:08 AM, Dan McGee<dpmcgee@gmail.com> wrote:
On Wed, May 20, 2009 at 2:37 PM, Brendan Hide<brendan@swiftspirit.co.za> wrote:
More consistent capitalisation. Note that capitalisation for languages other than English have NOT been modified in any way as they would need to be done manually.
Signed-off-by: Brendan Hide <brendan@swiftspirit.co.za>
Ugh, I'm late on this obviously.
Being a debug message, this seems a bit far out?
Oh!! Now I see the message change buried at the very end. However, I'm not sure what the consistency is with. For most informative messages, we always start with lowercase, e.g. sudo ./src/pacman/pacman -Syu Password: :: Synchronizing package databases... pacman-git-64 is up to date multilib is up to date testing 23.4K 231.4K/s 00:00:00 [####################################################################################] 100% core 33.2K 162.2K/s 00:00:00 [####################################################################################] 100% extra 376.3K 163.4K/s 00:00:02 [####################################################################################] 100% community is up to date :: Starting full system upgrade... warning: qscintilla: local (2.4.0-1) is newer than extra (2.3.2-2) resolving dependencies... looking for inter-conflicts... Targets (6): ati-dri-7.4.4-1 bash-completion-1.0-2 boost-1.39.0-1 glib2-2.20.4-1 iso-codes-3.10.1-1 smc-1.8-2 Total Download Size: 96.64 MB Total Installed Size: 242.35 MB A hot tip for everyone- ***do not change the po files*** in patches. It is pointless, as they are auto-generated and we only worry about updates when we do releases and it just hides the real meat of a patch. -Dan
Dan McGee wrote:
Oh!! Now I see the message change buried at the very end.
However, I'm not sure what the consistency is with. For most informative messages, we always start with lowercase, e.g.
...
You thought *you* were late. pah! See Allan's suggestion during our discussion of the "noconfirm trivial bug" (Wed, 20 May 2009 22:24:54 +1000) - *seemed* easy enough at the time so I went right ahead.
A hot tip for everyone- ***do not change the po files*** in patches. It is pointless, as they are auto-generated and we only worry about updates when we do releases and it just hides the real meat of a patch. Oops. Where should it be done?
__________ Brendan Hide
On Mon, Aug 31, 2009 at 4:24 PM, Brendan Hide<brendan@swiftspirit.co.za> wrote:
Dan McGee wrote:
Oh!! Now I see the message change buried at the very end.
However, I'm not sure what the consistency is with. For most informative messages, we always start with lowercase, e.g.
...
You thought *you* were late. pah! See Allan's suggestion during our discussion of the "noconfirm trivial bug" (Wed, 20 May 2009 22:24:54 +1000) - *seemed* easy enough at the time so I went right ahead.
that's indeed a very late answer (for a very minor problem :)) we are running in circles here. Allan pointed out this message was not consistent with the rest for one operation Dan pointed out this message was consistent in other (more common?) operation. also it's better to give a link rather than date/name of a message : http://www.mail-archive.com/pacman-dev@archlinux.org/msg02503.html What about ignoring that issue, and focusing on the billion of much more important problems we have :)
A hot tip for everyone- ***do not change the po files*** in patches. It is pointless, as they are auto-generated and we only worry about updates when we do releases and it just hides the real meat of a patch.
Oops. Where should it be done?
only in the source code files. .pot and .po are generated from that. PS : if this mail sounds harsh, don't take it seriously, it's nothing personal (maybe I am just in a bad mood :))
participants (3)
-
Brendan Hide
-
Dan McGee
-
Xavier