change strings to Bitcoin (uppercase), where it is used as a noun and up... #1289

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:Bitcoin_as_noun changing 12 files +30 −31

Diapolo commented at 2:10 PM on May 13, 2012: none
...date strings to use "Qt" (and not qt or QT)
- update initialisation of notificator to use qApp->applicationName() instead of a static string
See #1276 for informations!
sipa commented at 2:13 PM on May 13, 2012: member

I don't think this will cause many conflicts, so I don't mind merging. One thing I'm not sure about is "bitcoin address" or "Bitcoin address". It could be interpreted both as referring the the currency or to the system.
Diapolo commented at 2:29 PM on May 13, 2012: none

For me such an address is a Bitcoin (system) address used to transfer bitcoins :). But we should hear others, too.
burger2 commented at 3:12 PM on May 14, 2012: contributor

Just take a look at http://en.wikipedia.org/wiki/Bitcoin There they write Bitcoin address
Diapolo commented at 4:34 PM on May 14, 2012: none

I'm not sure about Wikipedia beeing a general reference, but they use it the same way I would use it. @sipa What you say?
Diapolo commented at 9:38 PM on May 14, 2012: none

Can we please decide to get this in quick? I want to create the next version of the en translation master file, so that we have enough time for such things to mature!
sipa commented at 9:44 PM on May 14, 2012: member

ACK
Diapolo commented at 8:12 AM on May 17, 2012: none

Final merge-request ;).
in src/qt/bitcoingui.cpp:None in c2800b9011 outdated
```
 425 | @@ -426,7 +426,7 @@ void BitcoinGUI::createTrayIcon()
 426 |      trayIconMenu->addAction(quitAction);
 427 |  #endif
 428 |  
 429 | -    notificator = new Notificator(tr("bitcoin-qt"), trayIcon);
 430 | +    notificator = new Notificator(tr("Bitcoin-Qt"), trayIcon);
```
luke-jr commented at 6:33 PM on May 18, 2012:

Can someone confirm changing this won't have any unexpected side effects?

Diapolo commented at 8:55 PM on May 18, 2012:

I took a look through the Notificator class and it is used as programName in args.append(programName); It this is the case we should perhaps remove the tr() for this and I change it back to lower-case?`@laanwj Can you help here?

Diapolo commented at 9:09 PM on May 18, 2012:

I think we should just use qApp->applicationName() instead of tr("bitcoin-qt"). We use app.setApplicationName("Bitcoin-Qt"); to set the name, so it should be fine to query it via applicationName()...
change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string ff0ee876bb

in src/qt/bitcoingui.cpp:None in ff0ee876bb

 425 | @@ -426,7 +426,7 @@ void BitcoinGUI::createTrayIcon()
 426 |      trayIconMenu->addAction(quitAction);
 427 |  #endif
 428 |  
 429 | -    notificator = new Notificator(tr("bitcoin-qt"), trayIcon);
 430 | +    notificator = new Notificator(qApp->applicationName(), trayIcon);

Diapolo commented at 9:15 PM on May 18, 2012:

Updated to use the dynamic solution in favor of a static string as app-name.

laanwj commented at 9:22 PM on May 18, 2012: member

I am not sure what the 'appname' in freedesktop notifications is actually used for. The specification is unclear on this: http://developer.gnome.org/notification-spec/

Using qApp name sounds like a good idea. There's no need to translate it.
gavinandresen referenced this in commit 23e5c5b11a on May 19, 2012
gavinandresen merged this on May 19, 2012
gavinandresen closed this on May 19, 2012
coblee referenced this in commit 5e3d48d0b0 on Jul 17, 2012
lateminer referenced this in commit 4c39ad1ec6 on May 6, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Linked (view graph)

#1276 general question @all devs: use Bitcoin as proper noun?#31238 fuzz: Limit wallet_notifications iterations