Permalink
Comparing changes
Open a pull request
- 2 commits
- 9 files changed
- 0 commit comments
- 2 contributors
Commits on Mar 13, 2018
* Sentence casing * Use B_UTF8_ELLIPSIS * Use B_TRANSLATE_COMMENT where needed * Re-use B_TRANSLATION_CONTEXT to avoid duplicated strings
Unified
Split
Showing
with
37 additions
and 27 deletions.
- +5 −4 sources-experimental/BPSettingsWindow.cpp
- +1 −1 sources-experimental/DownloadListView.cpp
- +1 −1 sources-experimental/EpisodeListView.cpp
- +8 −3 sources-experimental/IABPChannel.cpp
- +8 −8 sources-experimental/IABPDownload.cpp
- +2 −1 sources-experimental/IABPItem.cpp
- +3 −1 sources-experimental/MainController.cpp
- +8 −7 sources-experimental/MainWindow.cpp
- +1 −1 sources-experimental/TheApp.cpp
| @@ -55,7 +55,7 @@ BPSettingsWindow::CreateGeneralBox(BMessage data){ | ||
| BMessage num_download; | ||
| num_download.AddString("name","starton_workspace"); | ||
| num_download.AddString("description", B_TRANSLATE("Max downloads")); | ||
| num_download.AddString("description", B_TRANSLATE("Max. downloads:")); | ||
| num_download.AddInt32("type",B_INT32_TYPE); | ||
| num_download.AddInt32("valid_value",1); | ||
| num_download.AddInt32("valid_value",2); | ||
| @@ -80,7 +80,7 @@ BPSettingsWindow::CreateDownloadBox(BMessage data){ | ||
|
|
||
| BMessage num_download; | ||
| num_download.AddString("name","max_downloads"); | ||
| num_download.AddString("description", B_TRANSLATE("Max downloads")); | ||
| num_download.AddString("description", B_TRANSLATE("Max. downloads:")); | ||
| num_download.AddInt32("type",B_INT32_TYPE); | ||
| num_download.AddInt32("valid_value",1); | ||
| num_download.AddInt32("valid_value",2); | ||
| @@ -128,7 +128,7 @@ BPSettingsWindow::CreateFileTypeBox(BMessage data){ | ||
| main_msg.AddMessage("setting", &setting); | ||
| main_msg.AddMessage("setting", &setting2); | ||
|
|
||
| main_msg.AddString("name",B_TRANSLATE("FileType")); | ||
| main_msg.AddString("name",B_TRANSLATE("Filetype")); | ||
|
|
||
|
|
||
| PBox *proxy=new PBox(BRect(0,0,0,0),main_msg,data,SETTINGS_FILETYPE); | ||
| @@ -145,7 +145,8 @@ BPSettingsWindow::CreateChannelsBox(BMessage data){ | ||
|
|
||
| BMessage setting2; | ||
| setting2.AddString("name","check_time"); | ||
| setting2.AddString("description", B_TRANSLATE("Check the channel every")); | ||
| setting2.AddString("description", B_TRANSLATE_COMMENT("Check the channel every:", | ||
| "After 'every:' follows a popup menu to choose a time intervall")); | ||
| setting2.AddInt32("type",B_STRING_TYPE); | ||
| setting2.AddString("valid_value",B_TRANSLATE("never")); | ||
| setting2.AddString("valid_value",B_TRANSLATE("5 minutes")); | ||
| @@ -14,7 +14,7 @@ | ||
|
|
||
|
|
||
| #undef B_TRANSLATION_CONTEXT | ||
| #define B_TRANSLATION_CONTEXT "DownloadListView" | ||
| #define B_TRANSLATION_CONTEXT "DL-Episode-ListView" | ||
|
|
||
| DownloadListView::DownloadListView(BRect r): | ||
| BColumnListView(r,"DownloadListView",B_FOLLOW_ALL, B_WILL_DRAW|B_NAVIGABLE,B_FANCY_BORDER,true) | ||
| @@ -22,7 +22,7 @@ class StatusView : public BView { | ||
| }; | ||
|
|
||
| #undef B_TRANSLATION_CONTEXT | ||
| #define B_TRANSLATION_CONTEXT "EpisodeListView" | ||
| #define B_TRANSLATION_CONTEXT "DL-Episode-ListView" | ||
|
|
||
|
|
||
| StatusView::StatusView(BRect r):BView(r,NULL,B_FOLLOW_BOTTOM | B_FOLLOW_LEFT,B_WILL_DRAW){ | ||
| @@ -100,7 +100,9 @@ IABPChannelRemove::Perform(BMessage*){ | ||
| fController->ArchiveChannel(row->fRef); | ||
| else | ||
| if(result==0){ | ||
| BPAlert* wait = new BPAlert("Remove a channel", "\nRemoving..",NULL,NULL,NULL,B_WIDTH_AS_USUAL,LoadIcon("delete-channel-file.png")); | ||
| BPAlert* wait = new BPAlert(B_TRANSLATE("Remove a channel"), | ||
| B_TRANSLATE("\nRemoving" B_UTF8_ELLIPSIS),NULL,NULL,NULL, | ||
| B_WIDTH_AS_USUAL,LoadIcon("delete-channel-file.png")); | ||
| fView->UpdateIfNeeded(); | ||
| wait->Go(NULL); | ||
|
|
||
| @@ -109,8 +111,11 @@ IABPChannelRemove::Perform(BMessage*){ | ||
| wait->PostMessage(B_QUIT_REQUESTED); | ||
|
|
||
| if(result !=B_OK){ | ||
| wait = new BPAlert("Remove a channel", "\nAn error occured while removing!",B_TRANSLATE("Ok"),NULL,NULL,B_WIDTH_AS_USUAL,LoadIcon("delete-channel-file.png")); | ||
|
|
||
| wait = new BPAlert(B_TRANSLATE("Remove a channel"), | ||
| B_TRANSLATE("\nAn error occured while removing!"), | ||
| B_TRANSLATE("OK"),NULL,NULL,B_WIDTH_AS_USUAL, | ||
| LoadIcon("delete-channel-file.png")); | ||
|
|
||
| wait->Go(); | ||
| } | ||
|
|
||
| @@ -29,7 +29,7 @@ IABPDownloadRemove::IABPDownloadRemove(MainController* controller,MainWindow* vi | ||
|
|
||
| BString | ||
| IABPDownloadRemove::GetDescription(){ | ||
| return B_TRANSLATE(""); | ||
| return (""); | ||
| } | ||
|
|
||
|
|
||
| @@ -169,18 +169,18 @@ IABPDownloadPlay::Shortcut(uint32 *modifiers) const { | ||
| //------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| IABPDownloadFindItem::IABPDownloadFindItem(MainController* controller,MainWindow* view):IActionBP(controller,view){ | ||
| SetIcon(IAction::SIZE_16,LoadIcon("emblem-jump.png")); | ||
| //SetIcon(IAction::SIZE_48,LoadIcon("www-channel-file.png")); | ||
| //SetIcon(IAction::SIZE_48_PRESSED,LoadIcon("www-channel-file-down.png")); | ||
| SetLabel(B_TRANSLATE("Find this Item")); | ||
|
|
||
| SetIcon(IAction::SIZE_16,LoadIcon("emblem-jump.png")); | ||
| //SetIcon(IAction::SIZE_48,LoadIcon("www-channel-file.png")); | ||
| //SetIcon(IAction::SIZE_48_PRESSED,LoadIcon("www-channel-file-down.png")); | ||
|
|
||
| SetLabel(B_TRANSLATE("Find this item")); | ||
|
|
||
| } | ||
|
|
||
| BString | ||
| IABPDownloadFindItem::GetDescription(){ | ||
| return B_TRANSLATE(""); | ||
| return (""); | ||
| } | ||
|
|
||
|
|
||
| @@ -51,7 +51,8 @@ IABPItemRemove::Perform(BMessage*){ | ||
|
|
||
|
|
||
| BString text; | ||
| text << B_TRANSLATE("\nYou are going to remove the selected item.\n\nAre you sure?\n(you will lost the enclosure file if any)"); | ||
| text << B_TRANSLATE("\nYou are going to remove the selected item.\n\n" | ||
| "Are you sure?\n(You will lose any enclosed file if there are any.)"); | ||
| if(selection.CountItems() == 1) | ||
| text << "\n\n" << firstTitle << "\n"; | ||
| else | ||
| @@ -1168,7 +1168,9 @@ MainController::OpenFile(const char* filename,BString filetype){ | ||
| b = FindBestApplication(&ref,alert); | ||
|
|
||
| if(alert != "") { | ||
| BPAlert *pop= new BPAlert("BePodder", alert.String() ,B_TRANSLATE("Ok"),NULL,NULL,B_WIDTH_AS_USUAL,LoadIcon("logo-64.png")); | ||
| BPAlert *pop= new BPAlert("BePodder", alert.String(), | ||
| B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, | ||
| LoadIcon("logo-64.png")); | ||
| pop->Go(); | ||
| } | ||
| } | ||
| @@ -418,9 +418,9 @@ MainWindow::CreateMenuBar(){ | ||
| BMenu *podderfile = new BMenu(B_TRANSLATE("File"),B_ITEMS_IN_COLUMN); | ||
| poddermenubar->AddItem(podderfile); | ||
|
|
||
| podderfile->AddItem(new BMenuItem(B_TRANSLATE("Import OPML...") , new BMessage(IMPORT_OPML), 0, 0)); | ||
| podderfile->AddItem(new BMenuItem(B_TRANSLATE("Export OPML...") , new BMessage(EXPORT_OPML), 0, 0)); | ||
| BMenuItem *podderaboutitem = new BMenuItem(B_TRANSLATE("About..."),new BMessage(B_ABOUT_REQUESTED),0,0); | ||
| podderfile->AddItem(new BMenuItem(B_TRANSLATE("Import OPML" B_UTF8_ELLIPSIS) , new BMessage(IMPORT_OPML), 0, 0)); | ||
| podderfile->AddItem(new BMenuItem(B_TRANSLATE("Export OPML" B_UTF8_ELLIPSIS) , new BMessage(EXPORT_OPML), 0, 0)); | ||
| BMenuItem *podderaboutitem = new BMenuItem(B_TRANSLATE("About BePodder"),new BMessage(B_ABOUT_REQUESTED),0,0); | ||
| podderaboutitem->SetTarget(be_app); | ||
| podderfile->AddItem(podderaboutitem); | ||
|
|
||
| @@ -431,7 +431,7 @@ MainWindow::CreateMenuBar(){ | ||
| BMenu *settingsfile = new BMenu(B_TRANSLATE("Settings"),B_ITEMS_IN_COLUMN); | ||
| poddermenubar->AddItem(settingsfile); | ||
|
|
||
| BMenuItem *podderpreferencesitem = new BMenuItem(B_TRANSLATE("Preferences..."),new BMessage(SHOW_SETTINGS),'P',0); | ||
| BMenuItem *podderpreferencesitem = new BMenuItem(B_TRANSLATE("Preferences" B_UTF8_ELLIPSIS),new BMessage(SHOW_SETTINGS),'P',0); | ||
| settingsfile->AddItem(podderpreferencesitem); | ||
|
|
||
| groups = new BMenu(B_TRANSLATE("Groups"),B_ITEMS_IN_COLUMN); | ||
| @@ -485,7 +485,8 @@ MainWindow::CreateMenuBar(){ | ||
| //-------------------------------------------------------------------------------------------------------------- | ||
|
|
||
|
|
||
| setworkspace= new BMenu(B_TRANSLATE("Move BePodder onto workspace:")); | ||
| setworkspace= new BMenu(B_TRANSLATE_COMMENT("Move BePodder to workspace", | ||
| "After 'workspace' follows a submenu to choose the workspace")); | ||
| podderview->AddItem(setworkspace); | ||
|
|
||
| for(int i=0;i<count_workspaces();i++){ | ||
| @@ -669,7 +670,7 @@ void MainWindow::MessageReceived(BMessage* msg) | ||
| case SHOW_HELP: | ||
| { | ||
|
|
||
| BPAlert *alert = new BPAlert("BePodder",B_TRANSLATE("Loading help..."),NULL,NULL,NULL,B_WIDTH_AS_USUAL, LoadIcon("enqueued-32.png")); | ||
| BPAlert *alert = new BPAlert("BePodder",B_TRANSLATE("Loading help" B_UTF8_ELLIPSIS),NULL,NULL,NULL,B_WIDTH_AS_USUAL, LoadIcon("enqueued-32.png")); | ||
| alert->Go(NULL); | ||
|
|
||
| HelpWindow *help1 = new HelpWindow(); | ||
| @@ -708,7 +709,7 @@ void MainWindow::MessageReceived(BMessage* msg) | ||
| case ARCHIVE_PARSE: | ||
| { | ||
| //show the alert | ||
| BPAlert *alert = new BPAlert("BePodder",B_TRANSLATE("\nParsing archive..."),NULL,NULL,NULL,B_WIDTH_AS_USUAL, LoadIcon("enqueued-32.png")); | ||
| BPAlert *alert = new BPAlert("BePodder",B_TRANSLATE("\nParsing archive" B_UTF8_ELLIPSIS),NULL,NULL,NULL,B_WIDTH_AS_USUAL, LoadIcon("enqueued-32.png")); | ||
| alert->Go(NULL); | ||
|
|
||
|
|
||
| @@ -138,7 +138,7 @@ TheApp::MessageReceived(BMessage* msg){ | ||
| case ARCHIVE_PARSE: | ||
| { | ||
| //show the alert | ||
| BPAlert *alert = new BPAlert("BePodder",B_TRANSLATE("\nParsing archive..."),NULL,NULL,NULL,B_WIDTH_AS_USUAL, LoadIcon("enqueued-32.png")); | ||
| BPAlert *alert = new BPAlert("BePodder",B_TRANSLATE("\nParsing archive" B_UTF8_ELLIPSIS),NULL,NULL,NULL,B_WIDTH_AS_USUAL, LoadIcon("enqueued-32.png")); | ||
| alert->Go(NULL); | ||
|
|
||
|
|
||