From 25037a6c0606fd7fc8823cbeffdf617df680cf62 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 21 Dec 2009 19:59:13 +0000 Subject: [PATCH] Fix cpufrequency catalogs build and update them. This clean up the add-on from hand-made translation mess. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34735 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../preferences/cpufrequency/bg.catkeys | 28 +++++++++---------- .../preferences/cpufrequency/de.catkeys | 27 +++++++++--------- .../preferences/cpufrequency/fi.catkeys | 5 ++-- .../preferences/cpufrequency/fr.catkeys | 5 ++-- .../preferences/cpufrequency/it.catkeys | 5 ++-- .../preferences/cpufrequency/lt.catkeys | 6 ++-- .../preferences/cpufrequency/ru.catkeys | 6 ++-- .../preferences/cpufrequency/sv.catkeys | 5 ++-- .../preferences/cpufrequency/uk.catkeys | 5 ++-- src/preferences/appearance/Jamfile | 5 ++-- src/preferences/cpufrequency/StatusView.cpp | 26 ++++++++--------- 11 files changed, 65 insertions(+), 58 deletions(-) diff --git a/data/catalogs/preferences/cpufrequency/bg.catkeys b/data/catalogs/preferences/cpufrequency/bg.catkeys index 2f38b16214..b63e78ef4c 100644 --- a/data/catalogs/preferences/cpufrequency/bg.catkeys +++ b/data/catalogs/preferences/cpufrequency/bg.catkeys @@ -1,20 +1,20 @@ -1 Bulgarian x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 Bulgarian x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ок -Integration time [ms]: CPU Frequency View Време на интеграция [мс]: -High performance Status view Висока производителност -Defaults Pref Window По подразбиране CPU frequency status view CPU Frequency View Статус на CPU честотата -Dynamic performance Status view Динамична производителност -Step up by CPU usage: Color Step View Стъпка на производителност на CPU: -Stepping policy CPU Frequency View Постъпково изменение на частотата на CPU -Stepping policy: CPU Frequency View Постъпково изменение на частотата на CPU: -Open Speedstep preferences… Status view Отвори постъпковите настройки Set state Status view Изберете състояние -Launching the CPU frequency preflet failed.\n\nError: Status view Старта на CPU Frequency не се състоя.\n\nГрешка: -Install Replicant into Deskbar CPU Frequency View Инсталирай репликант в Deskbar -Low energy Status view Икономия на енергия -Revert Pref Window Върни +Defaults Pref Window По подразбиране +Quit Status view Quit +High performance Status view Висока производителност +Stepping policy CPU Frequency View Постъпково изменение на частотата на CPU +Dynamic performance Status view Динамична производителност +Step up by CPU usage Color Step View Стъпка на производителност на CPU: Dynamic stepping CPU Frequency View Динамично изменение +Stepping policy: CPU Frequency View Постъпково изменение на частотата на CPU: +Integration time [ms]: CPU Frequency View Време на интеграция [мс]: +Install Replicant into Deskbar CPU Frequency View Инсталирай репликант в Deskbar +Open Speedstep preferences… Status view Отвори постъпковите настройки +Revert Pref Window Върни +Low energy Status view Икономия на енергия +Launching the CPU frequency preflet failed.\n\nError: Status view Старта на CPU Frequency не се състоя.\n\nГрешка: CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view CPU Frequency\n\tе разработен от Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n CPU Frequency Main window CPU Frequency - diff --git a/data/catalogs/preferences/cpufrequency/de.catkeys b/data/catalogs/preferences/cpufrequency/de.catkeys index 927864c011..0e8d928cea 100644 --- a/data/catalogs/preferences/cpufrequency/de.catkeys +++ b/data/catalogs/preferences/cpufrequency/de.catkeys @@ -1,19 +1,20 @@ -1 german x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 german x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ok -Integration time [ms]: CPU Frequency View Bewertungszeitraum [ms]: -High performance Status view Hohe Leistung -Defaults Pref Window Standardwerte CPU frequency status view CPU Frequency View CPU-Takt-Anzeige -Dynamic performance Status view Dynamische Leistung -Step up by CPU usage: Color Step View Taktänderung ab CPU-Auslastung von: -Stepping policy CPU Frequency View Taktungsrichtlinie -Stepping policy: CPU Frequency View Taktungsrichtlinie: -Open Speedstep preferences… Status view Speedstep Einstellungen öffnen… Set state Status view Fester Takt -Launching the CPU frequency preflet failed.\n\nError: Status view Das CPU-Takt-Preflet konnte nicht gestartet werden.\n\nFehler: -Install Replicant into Deskbar CPU Frequency View Replikanten in Deskbar installieren -Low energy Status view Geringer Energieverbrauch -Revert Pref Window Zurücknehmen +Defaults Pref Window Standardwerte +Quit Status view Quit +High performance Status view Hohe Leistung +Stepping policy CPU Frequency View Taktungsrichtlinie +Dynamic performance Status view Dynamische Leistung +Step up by CPU usage Color Step View Taktänderung ab CPU-Auslastung von: Dynamic stepping CPU Frequency View Dynamische Taktung +Stepping policy: CPU Frequency View Taktungsrichtlinie: +Integration time [ms]: CPU Frequency View Bewertungszeitraum [ms]: +Install Replicant into Deskbar CPU Frequency View Replikanten in Deskbar installieren +Open Speedstep preferences… Status view Speedstep Einstellungen öffnen… +Revert Pref Window Zurücknehmen +Low energy Status view Geringer Energieverbrauch +Launching the CPU frequency preflet failed.\n\nError: Status view Das CPU-Takt-Preflet konnte nicht gestartet werden.\n\nFehler: CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view CPU-Takt\n\tGeschrieben von Clemens Zeidler.\n\tCopyright 2009, Haiku, Inc.\n CPU Frequency Main window CPU-Takt diff --git a/data/catalogs/preferences/cpufrequency/fi.catkeys b/data/catalogs/preferences/cpufrequency/fi.catkeys index 299bb2b177..68b9279116 100644 --- a/data/catalogs/preferences/cpufrequency/fi.catkeys +++ b/data/catalogs/preferences/cpufrequency/fi.catkeys @@ -1,11 +1,11 @@ -1 finnish x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 finnish x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ok Integration time [ms]: CPU Frequency View Integraatio Aika [ms]: High performance Status view Korkea Suorituskyky Defaults Pref Window Oletusasetukset CPU frequency status view CPU Frequency View CPU Taajuuden Tilanäkymä Dynamic performance Status view Dynaaminen Suorituskyky -Step up by CPU usage: Color Step View Muuta ylöspäin tämän CPU:n käyttömäärän kohdalla: +Step up by CPU usage Color Step View Muuta ylöspäin tämän CPU:n käyttömäärän kohdalla: Stepping policy CPU Frequency View Muutostapa Stepping policy: CPU Frequency View Muutostapa: Open Speedstep preferences… Status view Avaa Speedstep Valinnat... @@ -17,3 +17,4 @@ Revert Pref Window Palauta Dynamic stepping CPU Frequency View Dynaaminen Muutos CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view Prosessorin Kellotaajuus\n\ttekijä Clemens Zeidler\n\tTekijänoikeudet 2009, Haiku, Inc.\n CPU Frequency Main window CPU Taajuus +Quit Status view Quit diff --git a/data/catalogs/preferences/cpufrequency/fr.catkeys b/data/catalogs/preferences/cpufrequency/fr.catkeys index 3fbd87a4f7..69e79b1c6c 100644 --- a/data/catalogs/preferences/cpufrequency/fr.catkeys +++ b/data/catalogs/preferences/cpufrequency/fr.catkeys @@ -1,11 +1,11 @@ -1 french x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 french x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ok Integration time [ms]: CPU Frequency View Temps d'intégration [ms]: High performance Status view Haute performance Defaults Pref Window Défaire CPU frequency status view CPU Frequency View État de la fréquence du processeur Dynamic performance Status view performance dynamique -Step up by CPU usage: Color Step View Accélération par utilisation processeur: +Step up by CPU usage Color Step View Accélération par utilisation processeur: Stepping policy CPU Frequency View Attitude d'accélération Stepping policy: CPU Frequency View Attitude d'accélération: Open Speedstep preferences… Status view Ouvrir les préférences Speestep… @@ -17,3 +17,4 @@ Revert Pref Window Défaire Dynamic stepping CPU Frequency View Accélération dynamique CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view Fréquence du processeur\n\técrit par Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n CPU Frequency Main window Fréquence du processeur +Quit Status view Quitter diff --git a/data/catalogs/preferences/cpufrequency/it.catkeys b/data/catalogs/preferences/cpufrequency/it.catkeys index 6f8ec5f4bc..73af8bf1cd 100644 --- a/data/catalogs/preferences/cpufrequency/it.catkeys +++ b/data/catalogs/preferences/cpufrequency/it.catkeys @@ -1,11 +1,11 @@ -1 italiano x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 italiano x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ok Integration time [ms]: CPU Frequency View Tempo di intervento [ms]: High performance Status view Massima potenza Defaults Pref Window Predefinito CPU frequency status view CPU Frequency View Frequenza della CPU Dynamic performance Status view Potenza dinamica -Step up by CPU usage: Color Step View Variazione della potenza in base all'uso della CPU: +Step up by CPU usage Color Step View Variazione della potenza in base all'uso della CPU: Stepping policy CPU Frequency View Stepping policy CPU Frequency Stepping policy: CPU Frequency View Stepping policy CPU Frequency: Open Speedstep preferences… Status view Apri le preferenze di Speestep… @@ -17,3 +17,4 @@ Revert Pref Window Predefinito Dynamic stepping CPU Frequency View Accelerazione dinamica CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view CPU Frequency\n\tscritto da Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n CPU Frequency Main window Frequenza della CPU +Quit Status view Quit diff --git a/data/catalogs/preferences/cpufrequency/lt.catkeys b/data/catalogs/preferences/cpufrequency/lt.catkeys index 25976f157c..c43b9a646d 100644 --- a/data/catalogs/preferences/cpufrequency/lt.catkeys +++ b/data/catalogs/preferences/cpufrequency/lt.catkeys @@ -1,11 +1,11 @@ -1 Lithuanian x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 Lithuanian x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Gerai Integration time [ms]: CPU Frequency View Atsistatymo laikas [ms]: High performance Status view Prisitaikantis našumas Defaults Pref Window Įprastai CPU frequency status view CPU Frequency View CP dažnio rodymas Dynamic performance Status view Prisitaikantis našumas -Step up by CPU usage: Color Step View Daugiau CP našumo: +Step up by CPU usage Color Step View Daugiau CP našumo: Stepping policy CPU Frequency View Žingsniavimas Stepping policy: CPU Frequency View Žingsniavimas: Open Speedstep preferences… Status view Atidaryti žingsniavimo nustatymus… @@ -17,4 +17,4 @@ Revert Pref Window Grįžti Dynamic stepping CPU Frequency View Prisitaikantis žingsniavimas CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view CPU Frequency\n\tsukurtas Clemens'o Zeidler'io\n\tCopyright 2009, Haiku, Inc.\n CPU Frequency Main window CP dažnis - +Quit Status view Quit diff --git a/data/catalogs/preferences/cpufrequency/ru.catkeys b/data/catalogs/preferences/cpufrequency/ru.catkeys index fb901566f6..cf6de54b30 100644 --- a/data/catalogs/preferences/cpufrequency/ru.catkeys +++ b/data/catalogs/preferences/cpufrequency/ru.catkeys @@ -1,11 +1,11 @@ -1 Russian x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 Russian x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ок Integration time [ms]: CPU Frequency View Время интеграции [мс]: High performance Status view Высокая производительность Defaults Pref Window По умолчанию CPU frequency status view CPU Frequency View Представление состояния частоты ЦП Dynamic performance Status view Динамическая производительность -Step up by CPU usage: Color Step View Шаг вверх по производительности ЦП: +Step up by CPU usage Color Step View Шаг вверх по производительности ЦП: Stepping policy CPU Frequency View Пошаговое изменение частоты ЦП Stepping policy: CPU Frequency View Пошаговое изменение частоты ЦП: Open Speedstep preferences… Status view Открытые пошаговые настройки @@ -17,4 +17,4 @@ Revert Pref Window Вернуться Dynamic stepping CPU Frequency View Динамическое изменение CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view CPU Frequency\n\tразраьотан Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n CPU Frequency Main window CPU Frequency - +Quit Status view Quit diff --git a/data/catalogs/preferences/cpufrequency/sv.catkeys b/data/catalogs/preferences/cpufrequency/sv.catkeys index a9cdcc573f..f35b6aeb6b 100644 --- a/data/catalogs/preferences/cpufrequency/sv.catkeys +++ b/data/catalogs/preferences/cpufrequency/sv.catkeys @@ -1,11 +1,11 @@ -1 swedish x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 swedish x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ok Integration time [ms]: CPU Frequency View Integreringstid [ms]: High performance Status view Högprestanda Defaults Pref Window Förval CPU frequency status view CPU Frequency View Statusvy för processorfrekvens Dynamic performance Status view Dynamisk prestanda -Step up by CPU usage: Color Step View Öka med processoranvändande: +Step up by CPU usage Color Step View Öka med processoranvändande: Stepping policy CPU Frequency View Accelerationspolicy Stepping policy: CPU Frequency View Accelerationspolicy: Open Speedstep preferences… Status view Öppna inställningar för Speestep… @@ -17,3 +17,4 @@ Revert Pref Window Återgå Dynamic stepping CPU Frequency View Dynamisk acceleration CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view Processfrekvens\n\twkriven av Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n CPU Frequency Main window Processorfrekvens +Quit Status view Quit diff --git a/data/catalogs/preferences/cpufrequency/uk.catkeys b/data/catalogs/preferences/cpufrequency/uk.catkeys index 8cdeb72ff4..730171198f 100644 --- a/data/catalogs/preferences/cpufrequency/uk.catkeys +++ b/data/catalogs/preferences/cpufrequency/uk.catkeys @@ -1,11 +1,12 @@ -1 Ukrainian x-vnd.Haiku-CPUFrequencyPref 2623066734 +1 Ukrainian x-vnd.Haiku-CPUFrequencyPref 2670455659 Ok Status view Ok Integration time [ms]: CPU Frequency View Час інтеграції [ms]: High performance Status view Висока продуктивність Defaults Pref Window По замовчуванню +Quit Status view Quit CPU frequency status view CPU Frequency View Частота ЦПУ Dynamic performance Status view Динамічна продуктивність -Step up by CPU usage: Color Step View Крок вгору використання процесора: +Step up by CPU usage Color Step View Крок вгору використання процесора: Stepping policy CPU Frequency View Покрокова зміна Stepping policy: CPU Frequency View Покрокова зміна: Open Speedstep preferences… Status view Відкриття покрокової настройки diff --git a/src/preferences/appearance/Jamfile b/src/preferences/appearance/Jamfile index 5f8df65c7d..e24f0fd838 100644 --- a/src/preferences/appearance/Jamfile +++ b/src/preferences/appearance/Jamfile @@ -36,7 +36,8 @@ DoCatalogs Appearance : ColorWell.cpp ColorWhichItem.cpp : en.catalog - : bg.catkeys de.catkeys fi.catkeys fr.catkeys it.catkeys ja.catkeys - lt.catkeys ru.catkeys sv.catkeys uk.catkeys + : +# bg.catkeys de.catkeys fi.catkeys fr.catkeys it.catkeys ja.catkeys +# lt.catkeys ru.catkeys sv.catkeys uk.catkeys ; diff --git a/src/preferences/cpufrequency/StatusView.cpp b/src/preferences/cpufrequency/StatusView.cpp index 5297ac3d19..b4e4d5498e 100644 --- a/src/preferences/cpufrequency/StatusView.cpp +++ b/src/preferences/cpufrequency/StatusView.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -195,21 +196,20 @@ FrequencyMenu::FrequencyMenu(BMenu* menu, BHandler* target, fStorage(storage), fInterface(interface) { - BCatalog catalog("x-vnd.Haiku-CPUFrequencyPref"); fDynamicPerformance = new BMenuItem( - catalog.GetString("Dynamic performance",TR_CONTEXT), + TR("Dynamic performance"), new BMessage(kMsgPolicyDynamic)); fHighPerformance = new BMenuItem( - catalog.GetString("High performance",TR_CONTEXT), + TR("High performance"), new BMessage(kMsgPolicyPerformance)); - fLowEnergie = new BMenuItem(catalog.GetString("Low energy",TR_CONTEXT), + fLowEnergie = new BMenuItem(TR("Low energy"), new BMessage(kMsgPolicyLowEnergy)); menu->AddItem(fDynamicPerformance); menu->AddItem(fHighPerformance); menu->AddItem(fLowEnergie); - fCustomStateMenu = new BMenu(catalog.GetString("Set state",TR_CONTEXT)); + fCustomStateMenu = new BMenu(TR("Set state")); StateList* stateList = fInterface->GetCpuFrequencyStates(); for (int i = 0; i < stateList->CountItems(); i++) { @@ -353,9 +353,9 @@ StatusView::StatusView(BRect frame, bool inDeskbar, B_WILL_DRAW | B_FRAME_EVENTS), fInDeskbar(inDeskbar), fCurrentFrequency(NULL), - fDragger(NULL), - fCatalog("x-vnd.Haiku-CPUFrequencyPref") + fDragger(NULL) { + get_add_on_catalog(&fCatalog,"x-vnd.Haiku-CPUFrequencyPref"); if (!inDeskbar) { // we were obviously added to a standard window - let's add a dragger BRect bounds = Bounds(); @@ -407,10 +407,10 @@ StatusView::~StatusView() void StatusView::_AboutRequested() { - BAlert *alert = new BAlert("about", fCatalog.GetString("CPU Frequency\n" + BAlert *alert = new BAlert("about", TR("CPU Frequency\n" "\twritten by Clemens Zeidler\n" - "\tCopyright 2009, Haiku, Inc.\n", TR_CONTEXT), - fCatalog.GetString("Ok", TR_CONTEXT)); + "\tCopyright 2009, Haiku, Inc.\n"), + TR("Ok")); BTextView *view = alert->TextView(); BFont font; @@ -490,14 +490,14 @@ StatusView::AttachedToWindow() fPreferencesMenu->SetFont(be_plain_font); fPreferencesMenu->AddSeparatorItem(); - fOpenPrefItem = new BMenuItem(fCatalog.GetString( - "Open Speedstep preferences" B_UTF8_ELLIPSIS, TR_CONTEXT), + fOpenPrefItem = new BMenuItem(TR( + "Open Speedstep preferences" B_UTF8_ELLIPSIS), new BMessage(kMsgOpenSSPreferences)); fPreferencesMenu->AddItem(fOpenPrefItem); fOpenPrefItem->SetTarget(this); if (fInDeskbar) { - fQuitItem= new BMenuItem(fCatalog.GetString("Quit", TR_CONTEXT), + fQuitItem= new BMenuItem(TR("Quit"), new BMessage(B_QUIT_REQUESTED)); fPreferencesMenu->AddItem(fQuitItem); fQuitItem->SetTarget(this);