From dfa5413b5bb73b9b63efd2716aea2b1e90c22a56 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 14 Aug 2013 06:16:18 +0200 Subject: [PATCH] Removed the word "Color" from the labels in the skin settings menu The labels were longer than the space before the RGBA controls and the fact that these are colors is already clear from the context (such as having an RGBA control after it ;). I tried to update the translated versions of these labels as well. However, since I don't speak most of these languages, it is possible the result is grammatically incorrect. If this is the case, please mail me a correction. --- data/translations/Basque | 6 +++--- data/translations/Catalan | 12 ++++++------ data/translations/Danish | 12 ++++++------ data/translations/Dutch | 6 +++--- data/translations/Finnish | 5 +++-- data/translations/French | 6 +++--- data/translations/German | 6 +++--- data/translations/Italian | 12 ++++++------ data/translations/Norwegian | 6 +++--- data/translations/Portuguese (Portugal) | 6 +++--- data/translations/Russian | 6 +++--- data/translations/Slovak | 12 ++++++------ data/translations/Spanish | 6 +++--- data/translations/Swedish | 6 +++--- data/translations/Turkish | 6 +++--- src/gmenu2x.cpp | 12 ++++++------ 16 files changed, 63 insertions(+), 62 deletions(-) diff --git a/data/translations/Basque b/data/translations/Basque index 47e6bcc..235981f 100644 --- a/data/translations/Basque +++ b/data/translations/Basque @@ -51,11 +51,11 @@ Number of columns=Zutabe zenbakia Set the number of columns of links to display on a page=Orri bakoitzeko erakutsiko diren zutabeak Number of rows=Ilara zenbakia Set the number of rows of links to display on a page=Orri bakoitzeko erakutsiko diren ilarak -Top Bar Color=Goiko barraren kolorea +Top Bar=Goiko barraren Color of the top bar=Goian dagoen barraren kolorea -Bottom Bar Color=Beheko barraren kolorea +Bottom Bar=Beheko barraren Color of the bottom bar=Behean dagoen barraren kolorea -Selection Color=aukeratutakoaren kolorea +Selection=Aukeratutakoaren Color of the selection and other interface details=Aukeratutako testuaren kolorea eta interfacearen beste aukera batzuk You should disable Usb Networking to do this.=Usb sarea desaktibatu beharko zenuke. Operation not permitted.=Baimendu gabeko operazioa. diff --git a/data/translations/Catalan b/data/translations/Catalan index 2650fcc..9fdc913 100644 --- a/data/translations/Catalan +++ b/data/translations/Catalan @@ -52,11 +52,11 @@ Number of columns=Número de columnes Set the number of columns of links to display on a page=Ajusta el número de columnes d'enllaços a mostrar per pàgina Number of rows=Número de línies Set the number of rows of links to display on a page=Ajusta el número de línies d'enllaços a mostrar per pàgina -Top Bar Color=Color de barra superior +Top Bar=Barra superior Color of the top bar=Color de la barra superior -Bottom Bar Color=Color de barra inferior +Bottom Bar=Barra inferior Color of the bottom bar=Color de la barra inferior -Selection Color=Color selecció +Selection=Selecció Color of the selection and other interface details=Color de la selecció i altres detalls de la interfície You should disable Usb Networking to do this.=Ha de desactivar la Xarxa per USB per fer això. Operation not permitted.=Operació no permesa. @@ -130,9 +130,9 @@ Gamma (default: 0)=Gamma (predeterminat: 0) Gamma value to set when launching this link=Valor de gamma que utilitzarà a l'executar aquest enllaç Wallpaper=Fons d'escriptori Configure skin=Configura el Tema -Message Box Color=Color de caixa de text -Message Box Border Color=Color de la vora de la caixa de text -Message Box Selection Color=Color de la selecció de la caixa de text +Message Box=Caixa de text +Message Box Border=Vora de la caixa de text +Message Box Selection=Selecció de la caixa de text Background color of the message box=Color de fons de la caixa de text Border color of the message box=Color de la vora de la caixa de text Color of the selection of the message box=Color de la selecció de la caixa de text diff --git a/data/translations/Danish b/data/translations/Danish index b0f1388..6ab9d6c 100644 --- a/data/translations/Danish +++ b/data/translations/Danish @@ -55,11 +55,11 @@ Number of columns=Antal spalter Set the number of columns of links to display on a page=Angiv antallet af spalter for genveje per side Number of rows=Antal rækker Set the number of rows of links to display on a page= Angiv antallet af rækker for genveje per side -Top Bar Color=Øverste bjælkes farve +Top Bar=Øverste bjælke Color of the top bar= Øverste bjælkes farve -Bottom Bar Color=Nederste bjælkes farve +Bottom Bar=Nederste bjælke Color of the bottom bar=Nederste bjælkes farve -Selection Color=Markørens farve +Selection=Markøren Color of the selection and other interface details= Markøren og grænseflades farve You should disable Usb Networking to do this.=Du bør fravælge USB netværket nå du vælger dette Operation not permitted.=Dette er ikke tilladt. @@ -122,9 +122,9 @@ Scroll=Rulle Untitled=Ikke navngivet Wallpaper=Baggrund Configure skin=Konfigurer tema -Message Box Color=Farve på Konfigurations vinduet -Message Box Border Color= Farve på Konfig vinduets kant -Message Box Selection Color=Konfig vinduets markør farve +Message Box=Konfigurations vinduet +Message Box Border=Konfig vinduets kant +Message Box Selection=Konfig vinduets markør Background color of the message box= Konfigurations vinduets baggrundsfarve Border color of the message box=Farve på Konfigurations vinduets kant Color of the selection of the message box=Farven på markøren i Konfigurations vinduet diff --git a/data/translations/Dutch b/data/translations/Dutch index ef4b91e..17dcf6a 100644 --- a/data/translations/Dutch +++ b/data/translations/Dutch @@ -52,11 +52,11 @@ Number of columns=Aantal kolommen Set the number of columns of links to display on a page=Stel het aantal getoonde pictogrammen in (horizontaal) Number of rows=Aantal rijen Set the number of rows of links to display on a page=Stel het aantal getoonde pictogrammen in (verticaal) -Top Bar Color=Kleur bovenste balk +Top Bar=Bovenste balk Color of the top bar=Kleur van de bovenste balk -Bottom Bar Color=Kleur onderste balk +Bottom Bar=Onderste balk Color of the bottom bar=Kleur van de onderste balk -Selection Color=Kleur selectie +Selection=Selectie Color of the selection and other interface details=Kleur van de selectie en andere interface details You should disable Usb Networking to do this.=Zet USB Netwerk uit om dit te gebruiken. Operation not permitted.=Handeling niet toegestaan. diff --git a/data/translations/Finnish b/data/translations/Finnish index 3ec4bd0..05d4f3e 100644 --- a/data/translations/Finnish +++ b/data/translations/Finnish @@ -52,10 +52,11 @@ Number of columns=Sarakkeiden lukum��r� Set the number of columns of links to display on a page=Aseta linkkisarakkeiden lukum��r� sivulla Number of rows=Rivien lukum��r� Set the number of rows of links to display on a page=Aseta linkkirivien lukum��r� sivulla -Top Bar Color=V�ri yl�palkille +Top Bar=Yl�palkille Color of the top bar=Yl�palkin v�ri +Bottom Bar=Alapalkin Color of the bottom bar=Alapalkin v�ri -Selection Color=Valinnan v�ri +Selection=Valinnan Color of the selection and other interface details=Valinnan ja muiden ykstiyiskohtien v�ri You should disable Usb Networking to do this.=Usb Networking:in pit�� olla poissa k�yt�st� jotta voit tehd� t�m�n. Operation not permitted.=Toiminto ei ole sallittu. diff --git a/data/translations/French b/data/translations/French index 53f907d..211881a 100644 --- a/data/translations/French +++ b/data/translations/French @@ -52,11 +52,11 @@ Number of columns=Nombre de colonnes Set the number of columns of links to display on a page=Définir le nombre de colonnes de liens à afficher sur une page Number of rows=Nombres de rangées Set the number of rows of links to display on a page=Définir le nombre de rangées de liens à afficher sur une page -Top Bar Color=Couleur de la bar supérieur +Top Bar=Bar supérieur Color of the top bar=Couleur de la bar supérieur -Bottom Bar Color=Couleur de la bar inférieur +Bottom Bar=Bar inférieur Color of the bottom bar=Couleur de la bar inférieur -Selection Color=Couleur de sélection +Selection=Sélection Color of the selection and other interface details=Couleur de la sélection et des autres détails de l'interface You should disable Usb Networking to do this.=Vous devez désactiver le réseau Usb pour faire ceci. Operation not permitted.=Opération non permise diff --git a/data/translations/German b/data/translations/German index 6880dfb..e372a57 100644 --- a/data/translations/German +++ b/data/translations/German @@ -52,11 +52,11 @@ Number of columns=Anzahl der Spalten Set the number of columns of links to display on a page=Anzahl der Spalten mit Links, pro Seite Number of rows=Anzahl der Zeilen Set the number of rows of links to display on a page=Anzahl der Zeilen mit Links, pro Seite -Top Bar Color=Farbe der Kopfleiste +Top Bar=Kopfleiste Color of the top bar= Stellt Farbe und Transparenz der oberen Menüleiste ein -Bottom Bar Color=Farbe der Fußleiste +Bottom Bar=Fußleiste Color of the bottom bar=Stellt Farbe und Transparenz der unteren Menüleiste ein -Selection Color=Farbe der Auswahl +Selection=Auswahl Color of the selection and other interface details=Farbe der Auswahl-Hervorhebung und anderer Interface-Details You should disable Usb Networking to do this.=Du solltest USB Networking deaktivieren um dies zu tun. Operation not permitted.=Operation nicht gestattet. diff --git a/data/translations/Italian b/data/translations/Italian index 0ca4dbb..da8400b 100644 --- a/data/translations/Italian +++ b/data/translations/Italian @@ -52,11 +52,11 @@ Number of columns=Numero di colonne Set the number of columns of links to display on a page=Imposta il numero di colonne di collegamenti da visualizzare in una pagina Number of rows=Numero di righe Set the number of rows of links to display on a page=Imposta il numero di righe di collegamenti da visualizzare in una pagina -Top Bar Color=Colore barra superiore +Top Bar=Barra superiore Color of the top bar=Colore della barra superiore -Bottom Bar Color=Colore barra inferiore +Bottom Bar=Barra inferiore Color of the bottom bar=Colore della barra inferiore -Selection Color=Colore selezione +Selection=Selezione Color of the selection and other interface details=Colore della selezione e altri dettagli dell'interfaccia You should disable Usb Networking to do this.=Dovresti disattivare le impostazioni di rete per farlo. Operation not permitted.=Operazione non consentita. @@ -130,9 +130,9 @@ Gamma (default: 0)=Gamma (predefinito: 0) Gamma value to set when launching this link=Valore di gamma da impostare quando si lancia questo collegamento Wallpaper=Sfondo Configure skin=Configura skin -Message Box Color=Colore Finestra Messaggi -Message Box Border Color=Colore Bordo Finestra Messaggi -Message Box Selection Color=Color Selezione Finestra Messaggi +Message Box=Finestra Messaggi +Message Box Border=Bordo Finestra Messaggi +Message Box Selection=Selezione Finestra Messaggi Background color of the message box=Colore di sfondo della finestra dei messaggi Border color of the message box=Colore del bordo della finestra dei messaggi Color of the selection of the message box=Colore della selezione della finestra dei messaggi diff --git a/data/translations/Norwegian b/data/translations/Norwegian index bfe63c3..2d56c40 100644 --- a/data/translations/Norwegian +++ b/data/translations/Norwegian @@ -52,11 +52,11 @@ Number of columns=Antall spalter Set the number of columns of links to display on a page=Velg antall spalter med linker som skal vises per side Number of rows=Antall rader Set the number of rows of links to display on a page=Velg antall rader med linker som skal vises per side -Top Bar Color=Øverste felts farge +Top Bar=Øverste felt Color of the top bar=Farge på det øverste feltet -Bottom Bar Color=Nederste felts farge +Bottom Bar=Nederste felt Color of the bottom bar=Färge på det nederste feltet -Selection Color=Markørfarge +Selection=Markør Color of the selection and other interface details=Farge på markøren og andre deler av grensesnittet You should disable Usb Networking to do this.=Du bør slå av USB-nettverket når du gjør dette. Operation not permitted.=Utillat operasjon. diff --git a/data/translations/Portuguese (Portugal) b/data/translations/Portuguese (Portugal) index b262d4d..48a4a1c 100644 --- a/data/translations/Portuguese (Portugal) +++ b/data/translations/Portuguese (Portugal) @@ -52,11 +52,11 @@ Number of columns=Número de colunas Set the number of columns of links to display on a page=Ajustar o número de colunas (de links) por página Number of rows=Número de filas Set the number of rows of links to display on a page=Ajustar o número de filas (de links) por página -Top Bar Color=Cor da barra superior +Top Bar=Barra superior Color of the top bar= Cor da barra superior -Bottom Bar Color= Cor da barra inferior +Bottom Bar=Barra inferior Color of the bottom bar= Cor da barra inferior -Selection Color=Cor da selecção +Selection=Selecção Color of the selection and other interface details=Cor da selecção e outros detalhes do interface You should disable Usb Networking to do this.=Deve desactivar a função Networking por USB para executar este comando. Operation not permitted.=Operação não permitida. diff --git a/data/translations/Russian b/data/translations/Russian index 6cced00..f055509 100644 --- a/data/translations/Russian +++ b/data/translations/Russian @@ -52,11 +52,11 @@ Number of columns=Количество столбцов Set the number of columns of links to display on a page=Установите количество столбцов для отображения на странице Number of rows=Количество колонок Set the number of rows of links to display on a page=Установите количество колонок для отображения на странице -Top Bar Color=Цвет панели сверху +Top Bar=Сверху Color of the top bar=Выберите цвет панели сверху -Bottom Bar Color=Цвет панели внизу +Bottom Bar=Внизу Color of the bottom bar= Выберите цвет панели внизу -Selection Color=Цвет панели выбора +Selection=Выбора Color of the selection and other interface details=Выберите цвет панели выбора You should disable Usb Networking to do this.=Вы должны выключить USB Networking чтобы сделать это. Operation not permitted.=Операция не разрешена. diff --git a/data/translations/Slovak b/data/translations/Slovak index 67e91ce..ce40490 100644 --- a/data/translations/Slovak +++ b/data/translations/Slovak @@ -52,11 +52,11 @@ Number of columns=Počet stĺpcov Set the number of columns of links to display on a page=Nastavte počet stĺpcov pre odkazy zobrazené na stránke Number of rows=Počet riadkov Set the number of rows of links to display on a page=Počet riadkov odkazov zobrazených na stránke -Top Bar Color=Farba hornej lišty +Top Bar=Hornej lišty Color of the top bar= Farba hornej lišty -Bottom Bar Color=Farba spodnej lišty +Bottom Bar=Spodnej lišty Color of the bottom bar=Farba spodnej lišty -Selection Color=Farba výberu +Selection=Výberu Color of the selection and other interface details=Farba výberu a iných detailov interfacu You should disable Usb Networking to do this.=Pre vykonanie tejto operácie by ste mali deaktivovať Usb sieťovanie. Operation not permitted.=Operácia nepovolená. @@ -130,9 +130,9 @@ Gamma (default: 0)=Gamma (implic: 0) Gamma value to set when launching this link=Hodnota gamma pri spúšťaní tohto odkazu Wallpaper=Pozadie Configure skin=Nastaviť skin -Message Box Color=Farba textového okna -Message Box Border Color=Farba okraja textového okna -Message Box Selection Color=Farba výberu textového okna +Message Box=Textového okna +Message Box Border=Okraja textového okna +Message Box Selection=Výberu textového okna Background color of the message box=Farba pozadia textového okna Border color of the message box=Farba okraja textového okna Color of the selection of the message box=Farba výberu textového okna diff --git a/data/translations/Spanish b/data/translations/Spanish index cf85758..be2f876 100644 --- a/data/translations/Spanish +++ b/data/translations/Spanish @@ -51,11 +51,11 @@ Number of columns=Número de columnas Set the number of columns of links to display on a page=Ajuste el número de columnas de enlaces que mostrar por página Number of rows=Número de líneas Set the number of rows of links to display on a page=Ajuste el número de líneas de enlaces que mostrar por página -Top Bar Color=Color de barra superior +Top Bar=Barra superior Color of the top bar=Color de la barra superior -Bottom Bar Color=Color de barra inferior +Bottom Bar=Barra inferior Color of the bottom bar=Color de la barra inferior -Selection Color=Color de selección +Selection=Selección Color of the selection and other interface details=Color de la selección y otros detalles del interfaz You should disable Usb Networking to do this.=Debe desactivar Red por USB para hacer esto. Operation not permitted.=Operación no permitida. diff --git a/data/translations/Swedish b/data/translations/Swedish index 66f4567..6ff5348 100644 --- a/data/translations/Swedish +++ b/data/translations/Swedish @@ -52,11 +52,11 @@ Number of columns=Antal spalter Set the number of columns of links to display on a page=Välj antal spalter med länkar som skall visas per sida Number of rows=Antal rader Set the number of rows of links to display on a page=Välj antal rader med länkar som skall visas per sida -Top Bar Color=Översta fältets färg +Top Bar=Översta fältet Color of the top bar=Färg på det översta fältet -Bottom Bar Color=Nedersta fältets färg +Bottom Bar=Nedersta fältet Color of the bottom bar=Färg på det nedersta fältet -Selection Color=Markörfärg +Selection=Markör Color of the selection and other interface details=Färg på markören och andra delar av gränssnittet You should disable Usb Networking to do this.=Du bör slå av usb-nätverket när du gör detta. Operation not permitted.=Otillåten användning. diff --git a/data/translations/Turkish b/data/translations/Turkish index d39be29..7740c6f 100644 --- a/data/translations/Turkish +++ b/data/translations/Turkish @@ -52,11 +52,11 @@ Number of columns=Sütun sayisi Set the number of columns of links to display on a page=Bir sayfada gösterilecek sütun sayisini belirleyin Number of rows=Satir sayisi Set the number of rows of links to display on a page=Bir sayfada gösterilecek satir sayisini belirleyin -Top Bar Color=Baslik çubugunun rengi +Top Bar=Baslik çubugunun Color of the top bar=Baslik çubugunun rengini ve saydamligini belirler -Bottom Bar Color=Statü çubugunun rengi +Bottom Bar=Statü çubugunun Color of the bottom bar=Statü çubugunun rengini ve saydamligini belirler -Selection Color=Seçim rengi +Selection=Seçim Color of the selection and other interface details=Seçim rengi ve baska arabirim detaylarinin rengi You should disable Usb Networking to do this.=Bunu yapmadan önce USB-Ag destegini kapatmalisiniz. Operation not permitted.=Isleme izin verilmedi. diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index 35c772b..fdd2202 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -737,12 +737,12 @@ void GMenu2X::skinMenu() { SettingsDialog sd(this, input, ts, tr["Skin"]); sd.addSetting(new MenuSettingMultiString(this, ts, tr["Skin"], tr["Set the skin used by GMenu2X"], &confStr["skin"], &fl_sk.getDirectories())); - sd.addSetting(new MenuSettingRGBA(this, ts, tr["Top Bar Color"], tr["Color of the top bar"], &skinConfColors[COLOR_TOP_BAR_BG])); - sd.addSetting(new MenuSettingRGBA(this, ts, tr["Bottom Bar Color"], tr["Color of the bottom bar"], &skinConfColors[COLOR_BOTTOM_BAR_BG])); - sd.addSetting(new MenuSettingRGBA(this, ts, tr["Selection Color"], tr["Color of the selection and other interface details"], &skinConfColors[COLOR_SELECTION_BG])); - sd.addSetting(new MenuSettingRGBA(this, ts, tr["Message Box Color"], tr["Background color of the message box"], &skinConfColors[COLOR_MESSAGE_BOX_BG])); - sd.addSetting(new MenuSettingRGBA(this, ts, tr["Message Box Border Color"], tr["Border color of the message box"], &skinConfColors[COLOR_MESSAGE_BOX_BORDER])); - sd.addSetting(new MenuSettingRGBA(this, ts, tr["Message Box Selection Color"], tr["Color of the selection of the message box"], &skinConfColors[COLOR_MESSAGE_BOX_SELECTION])); + sd.addSetting(new MenuSettingRGBA(this, ts, tr["Top Bar"], tr["Color of the top bar"], &skinConfColors[COLOR_TOP_BAR_BG])); + sd.addSetting(new MenuSettingRGBA(this, ts, tr["Bottom Bar"], tr["Color of the bottom bar"], &skinConfColors[COLOR_BOTTOM_BAR_BG])); + sd.addSetting(new MenuSettingRGBA(this, ts, tr["Selection"], tr["Color of the selection and other interface details"], &skinConfColors[COLOR_SELECTION_BG])); + sd.addSetting(new MenuSettingRGBA(this, ts, tr["Message Box"], tr["Background color of the message box"], &skinConfColors[COLOR_MESSAGE_BOX_BG])); + sd.addSetting(new MenuSettingRGBA(this, ts, tr["Message Box Border"], tr["Border color of the message box"], &skinConfColors[COLOR_MESSAGE_BOX_BORDER])); + sd.addSetting(new MenuSettingRGBA(this, ts, tr["Message Box Selection"], tr["Color of the selection of the message box"], &skinConfColors[COLOR_MESSAGE_BOX_SELECTION])); if (sd.exec() && sd.edited()) { if (curSkin != confStr["skin"]) {