Skip to content

Commit 6fcfb67

Browse files
committed
Better translation for trPackageMembers
- renaming original trPackageMembers to trPackageFunctions - renaming trStaticPackageMembers to trStaticPackageFunctions - introducing new function trPackageMembers with best / educated guess for the translation. (based on comment with #9192 / #9197)
1 parent adddb82 commit 6fcfb67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+259
-93
lines changed

src/context.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ class TranslateContext::Private
676676
{
677677
if (m_javaOpt || m_vhdlOpt)
678678
{
679-
return theTranslator->trPackageMembers();
679+
return theTranslator->trPackageFunctions();
680680
}
681681
else if (m_fortranOpt || m_sliceOpt)
682682
{
@@ -2091,11 +2091,11 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
20912091
}
20922092
TemplateVariant createPackageMethods() const
20932093
{
2094-
return createMemberList(MemberListType_pacMethods,theTranslator->trPackageMembers());
2094+
return createMemberList(MemberListType_pacMethods,theTranslator->trPackageFunctions());
20952095
}
20962096
TemplateVariant createPackageStaticMethods() const
20972097
{
2098-
return createMemberList(MemberListType_pacStaticMethods,theTranslator->trStaticPackageMembers());
2098+
return createMemberList(MemberListType_pacStaticMethods,theTranslator->trStaticPackageFunctions());
20992099
}
21002100
TemplateVariant createPackageAttributes() const
21012101
{
@@ -2248,8 +2248,8 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
22482248
ctx->addMemberList(m_classDef,MemberListType_proAttribs,theTranslator->trProtectedAttribs());
22492249
ctx->addMemberList(m_classDef,MemberListType_proStaticAttribs,theTranslator->trStaticProtectedAttribs());
22502250
ctx->addMemberList(m_classDef,MemberListType_pacTypes,theTranslator->trPackageTypes());
2251-
ctx->addMemberList(m_classDef,MemberListType_pacMethods,theTranslator->trPackageMembers());
2252-
ctx->addMemberList(m_classDef,MemberListType_pacStaticMethods,theTranslator->trStaticPackageMembers());
2251+
ctx->addMemberList(m_classDef,MemberListType_pacMethods,theTranslator->trPackageFunctions());
2252+
ctx->addMemberList(m_classDef,MemberListType_pacStaticMethods,theTranslator->trStaticPackageFunctions());
22532253
ctx->addMemberList(m_classDef,MemberListType_pacAttribs,theTranslator->trPackageAttribs());
22542254
ctx->addMemberList(m_classDef,MemberListType_pacStaticAttribs,theTranslator->trStaticPackageAttribs());
22552255
ctx->addMemberList(m_classDef,MemberListType_properties,theTranslator->trProperties());

src/layout.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -890,11 +890,11 @@ static const std::map< std::string, ElementCallbacks > g_elementHandlers =
890890
endCb()
891891
} },
892892
{ "class/memberdecl/packagemethods", { startCb(&LayoutParser::startMemberDeclEntry, MemberListType_pacMethods,
893-
[]() { return compileOptions(theTranslator->trPackageMembers()); }),
893+
[]() { return compileOptions(theTranslator->trPackageFunctions()); }),
894894
endCb()
895895
} },
896896
{ "class/memberdecl/packagestaticmethods", { startCb(&LayoutParser::startMemberDeclEntry, MemberListType_pacStaticMethods,
897-
[]() { return compileOptions(theTranslator->trStaticPackageMembers()); }),
897+
[]() { return compileOptions(theTranslator->trStaticPackageFunctions()); }),
898898
endCb()
899899
} },
900900
{ "class/memberdecl/packageattributes", { startCb(&LayoutParser::startMemberDeclEntry, MemberListType_pacAttribs,

src/translator.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,9 @@ class Translator
507507
//////////////////////////////////////////////////////////////////////////
508508

509509
virtual QCString trPackageTypes() = 0;
510+
virtual QCString trPackageFunctions() = 0;
510511
virtual QCString trPackageMembers() = 0;
511-
virtual QCString trStaticPackageMembers() = 0;
512+
virtual QCString trStaticPackageFunctions() = 0;
512513
virtual QCString trPackageAttribs() = 0;
513514
virtual QCString trStaticPackageAttribs() = 0;
514515

src/translator_am.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1309,14 +1309,18 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
13091309
/*! Used as a heading for a list of Java class functions with package
13101310
* scope.
13111311
*/
1312-
virtual QCString trPackageMembers()
1312+
virtual QCString trPackageFunctions()
13131313
{
13141314
return "Փաթեթի ֆունկցիաներ";
13151315
}
1316+
virtual QCString trPackageMembers()
1317+
{
1318+
return "Փաթեթի անդամներ";
1319+
}
13161320
/*! Used as a heading for a list of static Java class functions with
13171321
* package scope.
13181322
*/
1319-
virtual QCString trStaticPackageMembers()
1323+
virtual QCString trStaticPackageFunctions()
13201324
{
13211325
return "Փաթեթի ստատիկ ֆունկցիաներ";
13221326
}

src/translator_ar.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1356,14 +1356,18 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
13561356
/*! Used as a heading for a list of Java class functions with package
13571357
* scope.
13581358
*/
1359-
virtual QCString trPackageMembers()
1359+
virtual QCString trPackageFunctions()
13601360
{
13611361
return "دوال الحزمة";
13621362
}
1363+
virtual QCString trPackageMembers()
1364+
{
1365+
return "أعضاء الحزمة";
1366+
}
13631367
/*! Used as a heading for a list of static Java class functions with
13641368
* package scope.
13651369
*/
1366-
virtual QCString trStaticPackageMembers()
1370+
virtual QCString trStaticPackageFunctions()
13671371
{
13681372
return "دوال ساكنة للحزمة";
13691373
}

src/translator_bg.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1377,14 +1377,18 @@ class TranslatorBulgarian : public Translator
13771377
/*! Used as a heading for a list of Java class functions with package
13781378
* scope.
13791379
*/
1380-
virtual QCString trPackageMembers()
1380+
virtual QCString trPackageFunctions()
13811381
{
13821382
return "Функции с област на видимост пакет";
13831383
}
1384+
virtual QCString trPackageMembers()
1385+
{
1386+
return "Членове с област на видимост пакет";
1387+
}
13841388
/*! Used as a heading for a list of static Java class functions with
13851389
* package scope.
13861390
*/
1387-
virtual QCString trStaticPackageMembers()
1391+
virtual QCString trStaticPackageFunctions()
13881392
{
13891393
return "Статични функции с област на видимост пакет";
13901394
}

src/translator_br.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1434,14 +1434,18 @@ class TranslatorBrazilian : public Translator
14341434
/*! Used as a heading for a list of Java class functions with package
14351435
* scope.
14361436
*/
1437-
virtual QCString trPackageMembers()
1437+
virtual QCString trPackageFunctions()
14381438
{
14391439
return "Funções do Pacote";
14401440
}
1441+
virtual QCString trPackageMembers()
1442+
{
1443+
return "Membros do Pacote";
1444+
}
14411445
/*! Used as a heading for a list of static Java class functions with
14421446
* package scope.
14431447
*/
1444-
virtual QCString trStaticPackageMembers()
1448+
virtual QCString trStaticPackageFunctions()
14451449
{
14461450
return "Funções Estáticas do Pacote";
14471451
}

src/translator_ca.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1359,14 +1359,18 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0
13591359
/*! Used as a heading for a list of Java class functions with package
13601360
* scope.
13611361
*/
1362-
virtual QCString trPackageMembers()
1362+
virtual QCString trPackageFunctions()
13631363
{
13641364
return "Funcions de Paquet";
13651365
}
1366+
virtual QCString trPackageMembers()
1367+
{
1368+
return "Membres de Paquet";
1369+
}
13661370
/*! Used as a heading for a list of static Java class functions with
13671371
* package scope.
13681372
*/
1369-
virtual QCString trStaticPackageMembers()
1373+
virtual QCString trStaticPackageFunctions()
13701374
{
13711375
return "Funcions Estàtiques de Paquet";
13721376
}

src/translator_cn.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1303,15 +1303,19 @@ class TranslatorChinese : public Translator
13031303
/*! Used as a heading for a list of Java class functions with package
13041304
* scope.
13051305
*/
1306-
virtual QCString trPackageMembers()
1306+
virtual QCString trPackageFunctions()
13071307
{
13081308
return "包函数";
13091309
}
1310+
virtual QCString trPackageMembers()
1311+
{
1312+
return "包成员";
1313+
}
13101314

13111315
/*! Used as a heading for a list of static Java class functions with
13121316
* package scope.
13131317
*/
1314-
virtual QCString trStaticPackageMembers()
1318+
virtual QCString trStaticPackageFunctions()
13151319
{
13161320
return "静态包函数";
13171321
}

src/translator_cz.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1440,14 +1440,18 @@ class TranslatorCzech : public Translator
14401440
/*! Used as a heading for a list of Java class functions with package
14411441
* scope.
14421442
*/
1443-
virtual QCString trPackageMembers()
1443+
virtual QCString trPackageFunctions()
14441444
{
14451445
return "Funkce v balíku";
14461446
}
1447+
virtual QCString trPackageMembers()
1448+
{
1449+
return "Členy v balíku";
1450+
}
14471451
/*! Used as a heading for a list of static Java class functions with
14481452
* package scope.
14491453
*/
1450-
virtual QCString trStaticPackageMembers()
1454+
virtual QCString trStaticPackageFunctions()
14511455
{
14521456
return "Statické funkce v balíku";
14531457
}

src/translator_de.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1492,15 +1492,19 @@ class TranslatorGerman : public TranslatorAdapter_1_8_15
14921492
/*! Used as a heading for a list of Java class functions with package
14931493
* scope.
14941494
*/
1495-
virtual QCString trPackageMembers()
1495+
virtual QCString trPackageFunctions()
14961496
{
14971497
return "Paketfunktionen";
14981498
}
1499+
virtual QCString trPackageMembers()
1500+
{
1501+
return "Paketelemente";
1502+
}
14991503

15001504
/*! Used as a heading for a list of static Java class functions with
15011505
* package scope.
15021506
*/
1503-
virtual QCString trStaticPackageMembers()
1507+
virtual QCString trStaticPackageFunctions()
15041508
{
15051509
return "Statische Paketfunktionen";
15061510
}

src/translator_dk.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -1300,9 +1300,11 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0
13001300
/* Java: Entities with package scope... */
13011301
virtual QCString trPackageTypes()
13021302
{ return "Typer med pakke-scope"; }
1303-
virtual QCString trPackageMembers()
1303+
virtual QCString trPackageFunctions()
13041304
{ return "Metoder med pakke-scope"; }
1305-
virtual QCString trStaticPackageMembers()
1305+
virtual QCString trPackageMembers()
1306+
{ return "Medlemmer med pakke-scope"; }
1307+
virtual QCString trStaticPackageFunctions()
13061308
{ return "Statiske metoder med pakke-scope"; }
13071309
virtual QCString trPackageAttribs()
13081310
{ return "Attributter med pakke-scope"; }

src/translator_en.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1371,14 +1371,18 @@ class TranslatorEnglish : public Translator
13711371
/*! Used as a heading for a list of Java class functions with package
13721372
* scope.
13731373
*/
1374-
virtual QCString trPackageMembers()
1374+
virtual QCString trPackageFunctions()
13751375
{
13761376
return "Package Functions";
13771377
}
1378+
virtual QCString trPackageMembers()
1379+
{
1380+
return "Package Members";
1381+
}
13781382
/*! Used as a heading for a list of static Java class functions with
13791383
* package scope.
13801384
*/
1381-
virtual QCString trStaticPackageMembers()
1385+
virtual QCString trStaticPackageFunctions()
13821386
{
13831387
return "Static Package Functions";
13841388
}

src/translator_eo.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1363,14 +1363,18 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4
13631363
/*! Used as a heading for a list of Java class functions with package
13641364
* scope.
13651365
*/
1366-
virtual QCString trPackageMembers()
1366+
virtual QCString trPackageFunctions()
13671367
{
13681368
return "Pakaĵaj Funkcioj";
13691369
}
1370+
virtual QCString trPackageMembers()
1371+
{
1372+
return "Pakaĵaj Membroj";
1373+
}
13701374
/*! Used as a heading for a list of static Java class functions with
13711375
* package scope.
13721376
*/
1373-
virtual QCString trStaticPackageMembers()
1377+
virtual QCString trStaticPackageFunctions()
13741378
{
13751379
return "Statikaj Pakaĵaj Funkcioj";
13761380
}

src/translator_es.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1404,15 +1404,19 @@ class TranslatorSpanish : public TranslatorAdapter_1_8_15
14041404
/*! Used as a heading for a list of Java class functions with package
14051405
* scope.
14061406
*/
1407-
virtual QCString trPackageMembers()
1407+
virtual QCString trPackageFunctions()
14081408
{
14091409
return "Funciones del 'package'";
14101410
}
1411+
virtual QCString trPackageMembers()
1412+
{
1413+
return "Miembros del 'package'";
1414+
}
14111415

14121416
/*! Used as a heading for a list of static Java class functions with
14131417
* package scope.
14141418
*/
1415-
virtual QCString trStaticPackageMembers()
1419+
virtual QCString trStaticPackageFunctions()
14161420
{
14171421
return "Funciones estáticas del 'package'";
14181422
}

src/translator_fa.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1356,14 +1356,18 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
13561356
/*! Used as a heading for a list of Java class functions with package
13571357
* scope.
13581358
*/
1359-
virtual QCString trPackageMembers()
1359+
virtual QCString trPackageFunctions()
13601360
{
13611361
return "توابع بسته ها";
13621362
}
1363+
virtual QCString trPackageMembers()
1364+
{
1365+
return "عضوها بسته ها";
1366+
}
13631367
/*! Used as a heading for a list of static Java class functions with
13641368
* package scope.
13651369
*/
1366-
virtual QCString trStaticPackageMembers()
1370+
virtual QCString trStaticPackageFunctions()
13671371
{
13681372
return "Static Package Functions";
13691373
}

src/translator_fi.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1467,14 +1467,18 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0
14671467
/*! Used as a heading for a list of Java class functions with package
14681468
* scope.
14691469
*/
1470-
virtual QCString trPackageMembers()
1470+
virtual QCString trPackageFunctions()
14711471
{
14721472
return "Paketin funktiot"; // "Package Functions"
14731473
}
1474+
virtual QCString trPackageMembers()
1475+
{
1476+
return "Paketin jäsenet"; // "Package Members"
1477+
}
14741478
/*! Used as a heading for a list of static Java class functions with
14751479
* package scope.
14761480
*/
1477-
virtual QCString trStaticPackageMembers()
1481+
virtual QCString trStaticPackageFunctions()
14781482
{
14791483
return "Paketin staattiset funktiot"; // "Static Package Functions"
14801484
}

src/translator_fr.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1432,14 +1432,18 @@ class TranslatorFrench : public TranslatorAdapter_1_8_15
14321432
/*! Used as a heading for a list of Java class functions with package
14331433
* scope.
14341434
*/
1435-
virtual QCString trPackageMembers()
1435+
virtual QCString trPackageFunctions()
14361436
{
14371437
return "Fonctions de paquetage";
14381438
}
1439+
virtual QCString trPackageMembers()
1440+
{
1441+
return "Membres de paquetage";
1442+
}
14391443
/*! Used as a heading for a list of static Java class functions with
14401444
* package scope.
14411445
*/
1442-
virtual QCString trStaticPackageMembers()
1446+
virtual QCString trStaticPackageFunctions()
14431447
{
14441448
return "Fonctions statiques de paquetage";
14451449
}

src/translator_gr.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -1377,14 +1377,18 @@ class TranslatorGreek : public Translator
13771377
/*! Used as a heading for a list of Java class functions with package
13781378
* scope.
13791379
*/
1380-
virtual QCString trPackageMembers()
1380+
virtual QCString trPackageFunctions()
13811381
{
13821382
return "Συναρτήσεις Πακέτου";
13831383
}
1384+
virtual QCString trPackageMembers()
1385+
{
1386+
return "Μέλη Πακέτου";
1387+
}
13841388
/*! Used as a heading for a list of static Java class functions with
13851389
* package scope.
13861390
*/
1387-
virtual QCString trStaticPackageMembers()
1391+
virtual QCString trStaticPackageFunctions()
13881392
{
13891393
return "Στατικές Συναρτήσεις Πακέτου";
13901394
}

0 commit comments

Comments
 (0)