From e6b8b7b12e4959903225dd7ebffa66d87cb08c1d Mon Sep 17 00:00:00 2001 From: mazze Date: Wed, 30 Mar 2016 16:21:07 +0000 Subject: [PATCH] Bumped required version to 3. Build only catalogs which don't cause warning. Minor fixes to Czech and French CT. German CT updated. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@52450 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/prefs/wanderer/catalogs/czech.ct | 20 ++++----- workbench/prefs/wanderer/catalogs/french.ct | 12 +++--- workbench/prefs/wanderer/catalogs/german.ct | 54 ++++++++++++++++++++++++- workbench/prefs/wanderer/catalogs/mmakefile.src | 6 ++- workbench/prefs/wanderer/locale.c | 6 +-- 5 files changed, 77 insertions(+), 21 deletions(-) diff --git a/workbench/prefs/wanderer/catalogs/czech.ct b/workbench/prefs/wanderer/catalogs/czech.ct index 8dc745e258..c7597a3003 100644 --- a/workbench/prefs/wanderer/catalogs/czech.ct +++ b/workbench/prefs/wanderer/catalogs/czech.ct @@ -1,4 +1,4 @@ -## version $VER: Wanderer.catalog 2.2 (7.2.2012) +## version $VER: Wanderer.catalog 3.0 (30.03.2016) ## language czech ## codeset 5 ; @@ -150,11 +150,11 @@ Odstup svisle: ; Y Offset : ; MSG_ICONLABELFONT -Písmo pro popis +Písmo pro popis... ; Icon Label Font... ; MSG_ICONINFOFONT -Písmo pro informace +Písmo pro informace... ; Icon Info Font... ; MSG_HORIZSPACINGICON @@ -202,7 +202,7 @@ Pevn ; Fixed ; MSG_LABELLINELENGTH -Max. délka popisu +Max. délka popisu... ; Max. Label line length... ; MSG_USEMULTILINELABELS @@ -214,23 +214,23 @@ Zobrazit pouze vybran ; Only show for Focus(ed) Icon ; MSG_NDISPLAYLINES -Poèet zobrazených øádkù +Poèet zobrazených øádkù... ; No. of lines to display... ; MSG_TILEMODEOPTIONS -Mo¾nosti +Mo¾nosti... ; Tile Mode Options... ; MSG_SCALEMODEOPTIONS -Mo¾nosti +Mo¾nosti... ; Scale Mode Options... ; MSG_ADVANCEDOPTIONS -Pøehled vlastností +Pøehled vlastností... ; Advanced Options... ; MSG_BACKGROUNDOPTIONS -Pozadí na plo¹e +Pozadí na plo¹e... ; Background Options... ; MSG_DRAWMODE @@ -254,7 +254,7 @@ Titulek obrazovky ; Wanderer ScreenTitle ; MSG_ADVANCED -Vlastnosti... +Vlastnosti ; Advanced ; MSG_USE diff --git a/workbench/prefs/wanderer/catalogs/french.ct b/workbench/prefs/wanderer/catalogs/french.ct index 9a969b80e2..25bb9d8938 100644 --- a/workbench/prefs/wanderer/catalogs/french.ct +++ b/workbench/prefs/wanderer/catalogs/french.ct @@ -1,4 +1,4 @@ -## version $VER: wanderer.catalog 2.1 (05.01.2012) +## version $VER: wanderer.catalog 3.0 (30.03.2016) ## language français ## codeset 0 ; @@ -202,7 +202,7 @@ Fixe ; Fixed ; MSG_LABELLINELENGTH -Longueur maximale d'une ligne +Longueur maximale d'une ligne... ; Max. Label line length... ; MSG_USEMULTILINELABELS @@ -214,11 +214,11 @@ Ne montrer que l'icone active ; Only show for Focus(ed) Icon ; MSG_NDISPLAYLINES -Nombre de lignes à afficher +Nombre de lignes à afficher... ; No. of lines to display... ; MSG_TILEMODEOPTIONS -Options de grille +Options de grille... ; Tile Mode Options... ; MSG_SCALEMODEOPTIONS @@ -226,11 +226,11 @@ Options de mise ; Scale Mode Options... ; MSG_ADVANCEDOPTIONS -Options avancées +Options avancées... ; Advanced Options... ; MSG_BACKGROUNDOPTIONS -Options de fond +Options de fond... ; Background Options... ; MSG_DRAWMODE diff --git a/workbench/prefs/wanderer/catalogs/german.ct b/workbench/prefs/wanderer/catalogs/german.ct index 9e31f81882..8c16c3c86e 100644 --- a/workbench/prefs/wanderer/catalogs/german.ct +++ b/workbench/prefs/wanderer/catalogs/german.ct @@ -1,4 +1,4 @@ -## version $VER: wanderer.catalog 2.0 (24.09.2010) +## version $VER: wanderer.catalog 3.0 (30.03.2016) ## language deutsch ## codeset 0 ; @@ -265,3 +265,55 @@ MSG_CANCEL _Abbrechen ; C_ancel ; +MSG_LABELSPREFS +Verhalten der Beschriftungen +; Labels look and feel +; +MSG_ADVANCEDBACKGROUND +Hintergrund +; Background +; +MSG_ADVANCEDICONS +Piktogramme +; Icons +; +MSG_ADVANCEDLABELS +Beschriftungen +; Labels +; +MSG_ICONSORTMODE_BYNAME +Nach Name +; By name +; +MSG_ICONSORTMODE_BYDATE +Nach Datum +; By date +; +MSG_ICONSORTMODE_BYSIZE +Nach Größe +; By size +; +MSG_DEFAULT_ICONSORTMODE +Voreingestellte Sortierreihenfolge +; Default sort order +; +MSG_ICON_AUTOSORT_ENABLED +Automatische Sortierung eingestellt +; Autosorting enabled +; +MSG_ICON_DRAG_TRANSPARENT +Verwende Transparenz beim Verschieben von Piktogrammen +; Use transparency when draging icons +; +MSG_DEFAULT_ICONVIEWMODE +Voreingestellter Anzeigemodus +; Default view mode +; +MSG_ICONVIEWMODE_ALL +Alle Dateien +; All files +; +MSG_ICONVIEWMODE_ICONS +Nur Piktogramme +; Icons only +; diff --git a/workbench/prefs/wanderer/catalogs/mmakefile.src b/workbench/prefs/wanderer/catalogs/mmakefile.src index bd2f2c86bf..52d175ea81 100644 --- a/workbench/prefs/wanderer/catalogs/mmakefile.src +++ b/workbench/prefs/wanderer/catalogs/mmakefile.src @@ -3,5 +3,9 @@ include $(SRCDIR)/config/aros.cfg +CATALOGS:=czech french german +# other catalogs need update to version 3 + %build_catalogs mmake=workbench-prefs-wanderer-catalogs \ - name=Wanderer subdir=System/Prefs + catalogs=$(CATALOGS) \ + name=Wanderer subdir=System/Prefs diff --git a/workbench/prefs/wanderer/locale.c b/workbench/prefs/wanderer/locale.c index cfd395f6ca..535c235005 100644 --- a/workbench/prefs/wanderer/locale.c +++ b/workbench/prefs/wanderer/locale.c @@ -13,7 +13,7 @@ #include "strings.h" #define CATALOG_NAME "System/Prefs/Wanderer.catalog" -#define CATALOG_VERSION 2 +#define CATALOG_VERSION 3 /*** Variables **************************************************************/ struct Catalog *catalog; @@ -25,11 +25,11 @@ CONST_STRPTR _(ULONG id) { if (LocaleBase != NULL && catalog != NULL) { - return GetCatalogStr(catalog, id, CatCompArray[id].cca_Str); + return GetCatalogStr(catalog, id, CatCompArray[id].cca_Str); } else { - return CatCompArray[id].cca_Str; + return CatCompArray[id].cca_Str; } } -- 2.11.4.GIT