[haiku-commits] r34735 - in haiku/trunk: data/catalogs/preferences/cpufrequency src/preferences/appearance src/preferences/cpufrequency
- From: pulkomandy@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 21 Dec 2009 20:59:14 +0100 (CET)
Author: pulkomandy
Date: 2009-12-21 20:59:13 +0100 (Mon, 21 Dec 2009)
New Revision: 34735
Changeset: http://dev.haiku-os.org/changeset/34735/haiku
Modified:
haiku/trunk/data/catalogs/preferences/cpufrequency/bg.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/de.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/fi.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/fr.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/it.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/lt.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/ru.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/sv.catkeys
haiku/trunk/data/catalogs/preferences/cpufrequency/uk.catkeys
haiku/trunk/src/preferences/appearance/Jamfile
haiku/trunk/src/preferences/cpufrequency/StatusView.cpp
Log:
Fix cpufrequency catalogs build and update them.
This clean up the add-on from hand-made translation mess.
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/bg.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/bg.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/bg.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 Време на
интеграция [мс]:
+CPU frequency status view CPU Frequency View Статус на CPU
честотата
+Set state Status view Изберете състояние
+Defaults Pref Window По подразбиране
+Quit Status view Quit
High performance Status view Висока производителност
-Defaults Pref Window По подразбиране
-CPU frequency status view CPU Frequency View Статус на CPU
честотата
+Stepping policy CPU Frequency View Постъпково изменение на
частотата на CPU
Dynamic performance Status view Динамична производителност
-Step up by CPU usage: Color Step View Стъпка на производителност на
CPU:
-Stepping policy CPU Frequency View Постъпково изменение на
частотата на CPU
+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 Отвори постъпковите
настройки
-Set state Status view Изберете състояние
+Revert Pref Window Върни
+Low energy 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 Върни
-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
-
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/de.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/de.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/de.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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]:
+CPU frequency status view CPU Frequency View CPU-Takt-Anzeige
+Set state Status view Fester Takt
+Defaults Pref Window Standardwerte
+Quit Status view Quit
High performance Status view Hohe Leistung
-Defaults Pref Window Standardwerte
-CPU frequency status view CPU Frequency View CPU-Takt-Anzeige
+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:
-Stepping policy CPU Frequency View Taktungsrichtlinie
+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…
-Set state Status view Fester Takt
+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:
-Install Replicant into Deskbar CPU Frequency View Replikanten in
Deskbar installieren
-Low energy Status view Geringer Energieverbrauch
-Revert Pref Window Zurücknehmen
-Dynamic stepping CPU Frequency View Dynamische Taktung
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
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/fi.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/fi.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/fi.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 @@
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
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/fr.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/fr.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/fr.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 @@
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
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/it.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/it.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/it.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 @@
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
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/lt.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/lt.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/lt.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 @@
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
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/ru.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/ru.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/ru.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 @@
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
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/sv.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/sv.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/sv.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 @@
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
Modified: haiku/trunk/data/catalogs/preferences/cpufrequency/uk.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/cpufrequency/uk.catkeys
2009-12-21 19:39:24 UTC (rev 34734)
+++ haiku/trunk/data/catalogs/preferences/cpufrequency/uk.catkeys
2009-12-21 19:59:13 UTC (rev 34735)
@@ -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 Відкриття покрокової
настройки
Modified: haiku/trunk/src/preferences/appearance/Jamfile
===================================================================
--- haiku/trunk/src/preferences/appearance/Jamfile 2009-12-21 19:39:24 UTC
(rev 34734)
+++ haiku/trunk/src/preferences/appearance/Jamfile 2009-12-21 19:59:13 UTC
(rev 34735)
@@ -36,7 +36,8 @@
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
;
Modified: haiku/trunk/src/preferences/cpufrequency/StatusView.cpp
===================================================================
--- haiku/trunk/src/preferences/cpufrequency/StatusView.cpp 2009-12-21
19:39:24 UTC (rev 34734)
+++ haiku/trunk/src/preferences/cpufrequency/StatusView.cpp 2009-12-21
19:59:13 UTC (rev 34735)
@@ -14,6 +14,7 @@
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
+#include <CatalogInAddOn.h>
#include <Deskbar.h>
#include <GroupLayout.h>
#include <Locale.h>
@@ -195,21 +196,20 @@
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 @@
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 @@
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 @@
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);
Other related posts:
