i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use resource definition files instead of DoCatalogs rule. Rename B_TRANSLATE_APP_NAME and related macros to the more generic B_TRANSLATE_SYSTEM_NAME, to also fits add-ons, folders, etc, and make 'System name' its standard context. Change CodyCam and PoorMan's app signatures to match the overall x-vnd.Haiku-App pattern. Some clean-up. Make SlideShowSaver build again.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41103 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström
2011-03-25 22:13:48 +00:00
parent c8cf09df90
commit 560ff4478d
672 changed files with 1387 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/locale/Catalog.h
+19 -19
View File
@@ -63,8 +63,8 @@ private:
};
#undef B_TRANSLATE_APP_NAME_CONTEXT
#define B_TRANSLATE_APP_NAME_CONTEXT "Application name"
#undef B_TRANSLATE_SYSTEM_NAME_CONTEXT
#define B_TRANSLATE_SYSTEM_NAME_CONTEXT "System name"
#ifndef B_COLLECTING_CATKEYS
@@ -118,11 +118,11 @@ private:
#define B_TRANSLATE_ID(id) \
BLocaleRoster::Default()->GetCatalog()->GetString((id))
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
#undef B_TRANSLATE_SYSTEM_NAME
#define B_TRANSLATE_SYSTEM_NAME(string) \
BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \
? BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_APP_NAME_CONTEXT) : (string)
B_TRANSLATE_SYSTEM_NAME_CONTEXT) : (string)
// Translation markers which can be used to mark static strings/IDs which
// are used as key for translation requests (at other places in the code):
@@ -163,9 +163,9 @@ private:
#define B_TRANSLATE_MARK_ID(id) \
BCatalogAddOn::MarkForTranslation((id))
#undef B_TRANSLATE_MARK_APP_NAME
#define B_TRANSLATE_MARK_APP_NAME(str) \
BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_APP_NAME_CONTEXT, "")
#undef B_TRANSLATE_MARK_SYSTEM_NAME
#define B_TRANSLATE_MARK_SYSTEM_NAME(str) \
BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
// Translation macros which do not let collectcatkeys try to collect the key
// (useful in combination with the marking macros above):
@@ -185,9 +185,9 @@ private:
#define B_TRANSLATE_NOCOLLECT_ID(id) \
B_TRANSLATE_ID(id)
#undef B_TRANSLATE_NOCOLLECT_APP_NAME
#define B_TRANSLATE_NOCOLLECT_APP_NAME(str) \
B_TRANSLATE_APP_NAME(str)
#undef B_TRANSLATE_NOCOLLECT_SYSTEM_NAME
#define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(str) \
B_TRANSLATE_SYSTEM_NAME(str)
#endif /* B_AVOID_TRANSLATION_MACROS */
@@ -220,9 +220,9 @@ private:
#define B_TRANSLATE_ID(id) \
B_CATKEY((id))
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
B_CATKEY((string), B_TRANSLATE_APP_NAME_CONTEXT)
#undef B_TRANSLATE_SYSTEM_NAME
#define B_TRANSLATE_SYSTEM_NAME(string) \
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT)
#undef B_TRANSLATE_MARK
#define B_TRANSLATE_MARK(str) \
@@ -240,9 +240,9 @@ private:
#define B_TRANSLATE_MARK_ID(id) \
B_CATKEY((id))
#undef B_TRANSLATE_MARK_APP_NAME
#define B_TRANSLATE_MARK_APP_NAME(str) \
B_CATKEY((str), B_TRANSLATE_APP_NAME_CONTEXT, "")
#undef B_TRANSLATE_MARK_SYSTEM_NAME
#define B_TRANSLATE_MARK_SYSTEM_NAME(str) \
B_CATKEY((str), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
#undef B_TRANSLATE_NOCOLLECT
#define B_TRANSLATE_NOCOLLECT(str) \
@@ -260,8 +260,8 @@ private:
#define B_TRANSLATE_NOCOLLECT_ID(id) \
(void)
#undef B_TRANSLATE_NOCOLLECT_APP_NAME
#define B_TRANSLATE_NOCOLLECT_APP_NAME(str) \
#undef B_TRANSLATE_NOCOLLECT_SYSTEM_NAME
#define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(str) \
(void)
#endif /* B_COLLECTING_CATKEYS */