Ticket #5399: AboutSystem-trim-whitespace-from-B_TRANSLATE.patch

File AboutSystem-trim-whitespace-from-B_TRANSLATE.patch, 5.8 KB (added by mmadia, 13 years ago)

patched against hrev39395

  • src/apps/aboutsystem/AboutSystem.cpp

     
    875875    font.SetSize(font.Size() + 4);
    876876
    877877    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuGreen);
    878     fCreditsView->Insert("Haiku\n");
     878    fCreditsView->Insert("Haiku");
     879    fCreditsView->Insert("\n");
    879880
    880881    char string[1024];
    881882    time_t time = ::time(NULL);
    … …  
    893894    fCreditsView->Insert(B_TRANSLATE("The copyright to the Haiku code is "
    894895        "property of Haiku, Inc. or of the respective authors where expressly "
    895896        "noted in the source. Haiku and the Haiku logo are trademarks of "
    896         "Haiku, Inc."
    897         "\n\n"));
     897        "Haiku, Inc."));
     898    fCreditsView->Insert("\n\n");
    898899
    899900    fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kLinkBlue);
    900901    fCreditsView->InsertHyperText("http://www.haiku-os.org",
    … …  
    905906    font.SetFace(B_BOLD_FACE | B_ITALIC_FACE);
    906907
    907908    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
    908     fCreditsView->Insert(B_TRANSLATE("Current maintainers:\n"));
     909    fCreditsView->Insert(B_TRANSLATE("Current maintainers:"));
     910    fCreditsView->Insert("\n");
    909911
    910912    fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
    911913    fCreditsView->Insert(
    … …  
    952954        "\n");
    953955
    954956    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
    955     fCreditsView->Insert(B_TRANSLATE("Past maintainers:\n"));
     957    fCreditsView->Insert(B_TRANSLATE("Past maintainers:"));
     958    fCreditsView->Insert("\n");
    956959
    957960    fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
    958961    fCreditsView->Insert(
    … …  
    979982        "\n");
    980983
    981984    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
    982     fCreditsView->Insert(B_TRANSLATE("Website, marketing & documentation:\n"));
     985    fCreditsView->Insert(B_TRANSLATE("Website, marketing & documentation:"));
     986    fCreditsView->Insert("\n");
    983987
    984988    fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
    985989    fCreditsView->Insert(
    … …  
    992996        "\n");
    993997
    994998    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
    995     fCreditsView->Insert(B_TRANSLATE("Contributors:\n"));
     999    fCreditsView->Insert(B_TRANSLATE("Contributors:"));
     1000    fCreditsView->Insert("\n");
    9961001
    9971002    fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
    9981003    fCreditsView->Insert(
    … …  
    10841089        "Zhao Shuai\n");
    10851090    fCreditsView->Insert(
    10861091        B_TRANSLATE("\n" B_UTF8_ELLIPSIS
    1087             " and probably some more we forgot to mention (sorry!)"
    1088             "\n\n"));
     1092            " and probably some more we forgot to mention (sorry!)"));
     1093    fCreditsView->Insert("\n\n");
    10891094
    10901095    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
    1091     fCreditsView->Insert(B_TRANSLATE("Translations:\n"));
     1096    fCreditsView->Insert(B_TRANSLATE("Translations:"));
     1097    fCreditsView->Insert("\n");
    10921098
    10931099    BLanguage* lang;
    10941100    BString langName;
    … …  
    11241130    }
    11251131
    11261132    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
    1127     fCreditsView->Insert(B_TRANSLATE("\n\nSpecial thanks to:\n"));
     1133    fCreditsView->Insert("\n\n");
     1134    fCreditsView->Insert(B_TRANSLATE("Special thanks to:"));
     1135    fCreditsView->Insert("\n");
    11281136
    11291137    fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
    11301138    fCreditsView->Insert(
    1131         B_TRANSLATE("Travis Geiselbrecht (and his NewOS kernel)\n"));
     1139        B_TRANSLATE("Travis Geiselbrecht (and his NewOS kernel)"));
     1140    fCreditsView->Insert("\n");
    11321141    fCreditsView->Insert(
    1133         B_TRANSLATE("Michael Phipps (project founder)\n\n"));
     1142        B_TRANSLATE("Michael Phipps (project founder)"));
     1143    fCreditsView->Insert("\n");
    11341144    fCreditsView->Insert(
    1135         B_TRANSLATE("The Haiku-Ports team\n"));
     1145        B_TRANSLATE("The Haiku-Ports team"));
     1146    fCreditsView->Insert("\n");
    11361147    fCreditsView->Insert(
    1137         B_TRANSLATE("The Haikuware team and their bounty program\n"));
     1148        B_TRANSLATE("The Haikuware team and their bounty program"));
     1149    fCreditsView->Insert("\n");
    11381150    fCreditsView->Insert(
    1139         B_TRANSLATE("The BeGeistert team\n"));
     1151        B_TRANSLATE("The BeGeistert team"));
     1152    fCreditsView->Insert("\n");
    11401153    fCreditsView->Insert(
    1141         B_TRANSLATE("Google & their Google Summer of Code program\n"));
     1154        B_TRANSLATE("Google & their Google Summer of Code program"));
     1155    fCreditsView->Insert("\n");
    11421156    fCreditsView->Insert(
    1143         B_TRANSLATE("The University of Auckland and Christof Lutteroth\n\n"));
     1157        B_TRANSLATE("The University of Auckland and Christof Lutteroth"));
     1158    fCreditsView->Insert("\n\n");
    11441159    fCreditsView->Insert(
    1145         B_TRANSLATE("... and the many people making donations!\n\n"));
     1160        B_TRANSLATE("... and the many people making donations!"));
     1161    fCreditsView->Insert("\n");
    11461162
    11471163    // copyrights for various projects we use
    11481164
    … …  
    11521168    font.SetSize(be_bold_font->Size() + 4);
    11531169    font.SetFace(B_BOLD_FACE);
    11541170    fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuGreen);
    1155     fCreditsView->Insert(B_TRANSLATE("\nCopyrights\n\n"));
     1171    fCreditsView->Insert("\n");
     1172    fCreditsView->Insert(B_TRANSLATE("Copyrights"));
     1173    fCreditsView->Insert("\n\n");
    11561174
    11571175    fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
    11581176    fCreditsView->Insert(B_TRANSLATE("[Click a license name to read the "
    1159         "respective license.]\n\n"));
     1177        "respective license.]"));
     1178    fCreditsView->Insert("\n\n");
    11601179
    11611180    // Haiku license
    11621181    BString haikuLicence = B_TRANSLATE("The code that is unique to Haiku, "
    11631182        "especially the kernel and all code that applications may link "
    11641183        "against, is distributed under the terms of the %MIT licence%. "
    11651184        "Some system libraries contain third party code distributed under the "
    1166         "LGPL license. You can find the copyrights to third party code below.\n"
    1167         "\n");
     1185        "LGPL license. You can find the copyrights to third party code below."
     1186        );
     1187    fCreditsView->Insert("\n\n");
    11681188    int32 licencePart1 = haikuLicence.FindFirst("%");
    11691189    int32 licencePart2 = haikuLicence.FindLast("%");
    11701190    BString part;