<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39725 >

Committed S2_1 revision 14019, revised from S2_2 -- does not make most
changes in keys, but propagating one simple key fix.

As committed:

Index: po/cs.po
===================================================================
--- po/cs.po    (revision 14018)
+++ po/cs.po    (working copy)
@@ -7395,7 +7395,7 @@
 msgstr "Nepodařilo se inicializovat žádný ze zvukových subsystémů!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Je možné, že příčinou je špatná konfigurace nebo oprávnění"
 
 #: client/audio.c:282
Index: po/pt_BR.po
===================================================================
--- po/pt_BR.po (revision 14018)
+++ po/pt_BR.po (working copy)
@@ -7124,7 +7124,7 @@
 
 #: client/audio.c:259
 #, fuzzy
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Talvez exista uma configuração incorrecta ou falta de permissões"
 
 #: client/audio.c:282
Index: po/es.po
===================================================================
--- po/es.po    (revision 14018)
+++ po/es.po    (working copy)
@@ -7554,7 +7554,7 @@
 msgstr "¡No se ha ponido inicializar ningún sistema de sonido!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Quizá sea un problema de permisos o haya algo mal configurado"
 
 #: client/audio.c:282
Index: po/ko.po
===================================================================
--- po/ko.po    (revision 14018)
+++ po/ko.po    (working copy)
@@ -6691,7 +6691,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 
 #: client/audio.c:282
Index: po/en_GB.po
===================================================================
--- po/en_GB.po (revision 14018)
+++ po/en_GB.po (working copy)
@@ -6702,7 +6702,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 
 #: client/audio.c:282
Index: po/no.po
===================================================================
--- po/no.po    (revision 14018)
+++ po/no.po    (working copy)
@@ -7370,7 +7370,7 @@
 msgstr "Ingen lydsystemer klarte å starte!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Kanskje det er feil ved konfigurasjonen"
 
 #: client/audio.c:282
Index: po/hu.po
===================================================================
--- po/hu.po    (revision 14018)
+++ po/hu.po    (working copy)
@@ -7409,7 +7409,7 @@
 msgstr "Nem sikerült inicializálni egyetlen valódi hang-alrendszert sem!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 "Lehet hogy valami rosszul van beállítva, vagy nem megfelelõek a jogosultságok"
 
Index: po/uk.po
===================================================================
--- po/uk.po    (revision 14018)
+++ po/uk.po    (working copy)
@@ -7272,7 +7272,7 @@
 msgstr "îÅÍÁ¤ real audio ЦÄÓÉÓÔÅÍÉ ÄÌÑ ¦Î¦Ã¦Á̦ÚÁæ§!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "ú ÐÒÉÞÉÎÉ ÎÅצÒÎϧ ËÏÎƦÇÕÒÁæ§ ÁÂÏ ÎÅצÒÎÉÈ ÐÒÁ× ÄÏÓÔÕÐÕ"
 
 #: client/audio.c:282
Index: po/ro.po
===================================================================
--- po/ro.po    (revision 14018)
+++ po/ro.po    (working copy)
@@ -7531,7 +7531,7 @@
 msgstr "Nici un sistem audio real nu a fost iniţializat cu succes!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Este posibil să fie o eroare de configurare sau permisiuni greşite"
 
 #: client/audio.c:282
Index: po/ru.po
===================================================================
--- po/ru.po    (revision 14018)
+++ po/ru.po    (working copy)
@@ -7519,7 +7519,7 @@
 msgstr "Ни одна реальная аудио-подсистема не 
смогла инициализироваться!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Возможна неверная конфигурация или 
неправильные права доступа"
 
 #: client/audio.c:282
Index: po/el.po
===================================================================
--- po/el.po    (revision 14018)
+++ po/el.po    (working copy)
@@ -7179,7 +7179,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 
 #: client/audio.c:282
Index: po/ar.po
===================================================================
--- po/ar.po    (revision 14018)
+++ po/ar.po    (working copy)
@@ -7103,7 +7103,7 @@
 msgstr "لا يوجد نظام صوت فرعي حقيقي لبدء 
تشغيله!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "ربما يوجد خطأ في التعريف أو صلاحيات 
خاطئة"
 
 #: client/audio.c:282
Index: po/fr.po
===================================================================
--- po/fr.po    (revision 14018)
+++ po/fr.po    (working copy)
@@ -7579,7 +7579,7 @@
 msgstr "Aucun vrai sous-système audio n'a pu être initialisé !"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 "Il y a peut-être une mauvaise configuration ou des permissions incorrectes"
 
Index: po/et.po
===================================================================
--- po/et.po    (revision 14018)
+++ po/et.po    (working copy)
@@ -7317,7 +7317,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Võibolla on asi vigastes seadetes või valedes pääsuõigustes"
 
 #: client/audio.c:282
Index: po/nl.po
===================================================================
--- po/nl.po    (revision 14018)
+++ po/nl.po    (working copy)
@@ -7416,7 +7416,7 @@
 msgstr "Geen enkel audio-subsysteem lukte het te initialiseren!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Misschien is er sprake van misconfiguratie of verkeerde permissies"
 
 #: client/audio.c:282
Index: po/pl.po
===================================================================
--- po/pl.po    (revision 14018)
+++ po/pl.po    (working copy)
@@ -7526,7 +7526,7 @@
 msgstr "Nie udało się zainicjalizować zwyczajnego systemu dźwięku!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 "Prawdopodobnie wystąpił błąd w konfiguracji lub nie masz odpowiednich "
 "uprawnień"
Index: po/it.po
===================================================================
--- po/it.po    (revision 14018)
+++ po/it.po    (working copy)
@@ -7584,7 +7584,7 @@
 msgstr "Nessun reale sottosistema audio da inizializzare"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Forse i permessi sono errati o c'è qualche configurazione errata"
 
 #: client/audio.c:282
Index: po/lt.po
===================================================================
--- po/lt.po    (revision 14018)
+++ po/lt.po    (working copy)
@@ -6528,7 +6528,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Galbūt kalta bloga konfigūracija arba uždrausta prieiga"
 
 #: client/audio.c:282
Index: po/pt.po
===================================================================
--- po/pt.po    (revision 14018)
+++ po/pt.po    (working copy)
@@ -7310,7 +7310,7 @@
 msgstr "Não foi possível inicializar um subsistema de audio!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Talvez exista uma configuração incorrecta ou falta de permissões"
 
 #: client/audio.c:282
Index: po/ca.po
===================================================================
--- po/ca.po    (revision 14018)
+++ po/ca.po    (working copy)
@@ -7472,7 +7472,7 @@
 msgstr "No s'ha aconseguit inicialitzar cap subsistema de so !"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Potser hi ha quelcom mal configurat o permisos incorrectes"
 
 #: client/audio.c:282
Index: po/da.po
===================================================================
--- po/da.po    (revision 14018)
+++ po/da.po    (working copy)
@@ -7406,7 +7406,7 @@
 msgstr "Ingen lydsystemer kunne initialiseres!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "MÃ¥ske er der fejl ved konfigurationen"
 
 #: client/audio.c:282
Index: po/tr.po
===================================================================
--- po/tr.po    (revision 14018)
+++ po/tr.po    (working copy)
@@ -7237,7 +7237,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 
 #: client/audio.c:282
Index: po/fa.po
===================================================================
--- po/fa.po    (revision 14018)
+++ po/fa.po    (working copy)
@@ -6703,7 +6703,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 
 #: client/audio.c:282
Index: po/de.po
===================================================================
--- po/de.po    (revision 14018)
+++ po/de.po    (working copy)
@@ -7519,7 +7519,7 @@
 msgstr "Es konnte kein Audiosystem gestartet werden!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 "Vielleicht ist etwas falsch konfiguriert oder mit falschen Zugriffsrechten "
 "versehen."
Index: po/sv.po
===================================================================
--- po/sv.po    (revision 14018)
+++ po/sv.po    (working copy)
@@ -7428,7 +7428,7 @@
 msgstr "Inget ljudsystem kunde köras!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Någonting kanske är felinställt eller har felaktiga rättigheter"
 
 #: client/audio.c:282
Index: po/ja.po
===================================================================
--- po/ja.po    (revision 14018)
+++ po/ja.po    (working copy)
@@ -7894,7 +7894,7 @@
 
 # clefs
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "設定かパーミションに何か間違いはありませんか?"
 
 #: client/audio.c:282
Index: po/he.po
===================================================================
--- po/he.po    (revision 14018)
+++ po/he.po    (working copy)
@@ -6712,7 +6712,7 @@
 msgstr ""
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr ""
 
 #: client/audio.c:282
Index: po/fi.po
===================================================================
--- po/fi.po    (revision 14018)
+++ po/fi.po    (working copy)
@@ -7558,7 +7558,7 @@
 msgstr "'Real audio' -alijärjestelmät epäonnistuivat valmisteluissaan!"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "Kenties asetuksissa tai käyttöoikeuksissa on vikaa"
 
 #: client/audio.c:282
Index: po/zh_CN.po
===================================================================
--- po/zh_CN.po (revision 14018)
+++ po/zh_CN.po (working copy)
@@ -7092,7 +7092,7 @@
 msgstr "δÄܳõʼ»¯ÈκÎʵ¼ÊµÄÉùÒô×Óϵͳ£¡"
 
 #: client/audio.c:259
-msgid "Perhaps there is some misconfigurationg or bad permissions"
+msgid "Perhaps there is some misconfiguration or bad permissions"
 msgstr "¿ÉÄÜÓÐһЩ´íÎóÅäÖûò´íÎóµÄÐí¿ÉȨÏÞ"
 
 #: client/audio.c:282
Index: client/gui-sdl/gui_string.c
===================================================================
--- client/gui-sdl/gui_string.c (revision 14018)
+++ client/gui-sdl/gui_string.c (working copy)
@@ -170,7 +170,7 @@
   }
   
   if ((str->font = load_font(str->ptsize)) == NULL) {
-    freelog(LOG_ERROR, _("Error in create_string16: Aborting ..."));
+    freelog(LOG_ERROR, "create_string16: load_font failed");
     FC_FREE(str);
     return str;
   }
@@ -222,7 +222,7 @@
   SDL_Surface *pText = create_text_surf_from_str16(pString);
 
   if (alphablit(pText, NULL, pDest, &dst_rect) < 0) {
-    freelog(LOG_ERROR, _("Couldn't blit text to display: %s"),
+    freelog(LOG_ERROR, "write_text16: couldn't blit text to display: %s",
            SDL_GetError());
     FREESURFACE(pText);
     return -1;
@@ -260,8 +260,8 @@
 
     if ((pText = SDL_DisplayFormat(pTmp)) == NULL) {
       freelog(LOG_ERROR,
-             _("Error in SDL_create_str16_surf: Couldn't convert text "
-               "to display format: %s"), SDL_GetError());
+             "SDL_create_str16_surf: couldn't convert text "
+             "to display format: %s", SDL_GetError());
       pText = pTmp;
     } else {
       FREESURFACE( pTmp );
@@ -277,9 +277,9 @@
 
   if (pText != NULL) {
     freelog(LOG_DEBUG,
-            _("SDL_create_str16_surf: Font is generally %d big, and "
-              "string is %hd big"), TTF_FontHeight(pString->font), pText->h);
-    freelog(LOG_DEBUG, _("SDL_create_str16_surf: String is %d lenght"),
+            "SDL_create_str16_surf: Font is generally %d big, and "
+              "string is %hd big", TTF_FontHeight(pString->font), pText->h);
+    freelog(LOG_DEBUG, "SDL_create_str16_surf: String is %d length",
             pText->w);
   } else {
     freelog(LOG_DEBUG, "SDL_create_str16_surf: pText NULL");
@@ -569,7 +569,7 @@
   }
   
   if ((pBuf = load_font(new_ptsize)) == NULL) {
-    freelog(LOG_ERROR, _("Error in change_ptsize: Change ptsize failed"));
+    freelog(LOG_ERROR, "change_ptsize: load_font failed");
     return;
   }
 
@@ -617,7 +617,7 @@
   /* Load Font */
   if ((font_tmp = TTF_OpenFont(pFont_with_FullPath, ptsize)) == NULL) {
     freelog(LOG_ERROR,
-           _("Error in load_font: Couldn't load %d pt font from %s: %s"),
+           "load_font: Couldn't load %d pt font from %s: %s",
            ptsize, pFont_with_FullPath, SDL_GetError());
     return font_tmp;
   }
@@ -658,7 +658,7 @@
 
   if (Sizeof_Font_TAB == 0) {
     freelog(LOG_ERROR,
-        _("Error in unload_font: Trying unload from empty Font ARRAY"));
+           "unload_font: Trying unload from empty Font ARRAY");
     return;
   }
 
@@ -672,8 +672,8 @@
 
   if (index == Sizeof_Font_TAB) {
     freelog(LOG_ERROR,
-           _("Error in unload_font: Trying unload Font which is "
-             "not include in Font ARRAY"));
+           "unload_font: Trying unload Font which is "
+           "not included in Font ARRAY");
     return;
   }
 
Index: client/audio.c
===================================================================
--- client/audio.c      (revision 14018)
+++ client/audio.c      (working copy)
@@ -127,7 +127,7 @@
   }
 
   selected_plugin = i;
-  freelog(LOG_VERBOSE, _("Plugin '%s' is now selected"),
+  freelog(LOG_VERBOSE, "Plugin '%s' is now selected",
          plugins[selected_plugin].name);
   return TRUE;
 }
@@ -188,18 +188,16 @@
 
   if (strcmp(prefered_plugin_name, "none") == 0) {
     /* We explicitly choose none plugin, silently skip the code below */
-    freelog(LOG_VERBOSE, _("Proceeding with sound support disabled"));
+    freelog(LOG_VERBOSE, "Proceeding with sound support disabled");
     tagfile = NULL;
     return;
   }
   if (num_plugins_used == 1) {
     /* We only have the dummy plugin, skip the code but issue an advertise */
-    freelog(LOG_NORMAL, _("No real audio plugin present, "
-      "proceeding with sound support disabled"));
-    freelog(LOG_NORMAL,
-      _("For sound support, install SDL_mixer"));
-    freelog(LOG_NORMAL, _("http://www.libsdl.org/";
-      "projects/SDL_mixer/index.html"));
+    freelog(LOG_NORMAL, _("No real audio plugin present."));
+    freelog(LOG_NORMAL, _("Proceeding with sound support disabled"));
+    freelog(LOG_NORMAL, _("For sound support, install SDL_mixer"));
+    freelog(LOG_NORMAL, "http://www.libsdl.org/projects/SDL_mixer/index.html";);
     tagfile = NULL;
     return;
   }
@@ -211,10 +209,10 @@
   filename = soundspec_fullname(spec_name);
   if (!filename) {
     freelog(LOG_ERROR, _("Cannot find sound spec-file \"%s\"."), spec_name);
-    freelog(LOG_ERROR, _("To get sound you need to download a sound set!"));
-    freelog(LOG_ERROR, _("Get sound sets from <%s>."),
+    freelog(LOG_NORMAL, _("To get sound you need to download a sound set!"));
+    freelog(LOG_NORMAL, _("Get sound sets from <%s>."),
            "ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets";);
-    freelog(LOG_ERROR, _("Will continue with disabled sounds."));
+    freelog(LOG_NORMAL, _("Proceeding with sound support disabled"));
     tagfile = NULL;
     return;
   }
@@ -225,18 +223,18 @@
 
   file_capstr = secfile_lookup_str(tagfile, "soundspec.options");
   if (!has_capabilities(us_capstr, file_capstr)) {
-    freelog(LOG_FATAL, _("sound spec-file appears incompatible:"));
-    freelog(LOG_FATAL, _("file: \"%s\""), filename);
-    freelog(LOG_FATAL, _("file options: %s"), file_capstr);
-    freelog(LOG_FATAL, _("supported options: %s"), us_capstr);
+    freelog(LOG_FATAL, "sound spec-file appears incompatible:");
+    freelog(LOG_FATAL, "  file: \"%s\"", filename);
+    freelog(LOG_FATAL, "  file options: %s", file_capstr);
+    freelog(LOG_FATAL, "  supported options: %s", us_capstr);
     exit(EXIT_FAILURE);
   }
   if (!has_capabilities(file_capstr, us_capstr)) {
-    freelog(LOG_FATAL, _("sound spec-file claims required option(s)"
-                        " which we don't support:"));
-    freelog(LOG_FATAL, _("file: \"%s\""), filename);
-    freelog(LOG_FATAL, _("file options: %s"), file_capstr);
-    freelog(LOG_FATAL, _("supported options: %s"), us_capstr);
+    freelog(LOG_FATAL, "sound spec-file claims required option(s)"
+                        " which we don't support:");
+    freelog(LOG_FATAL, "  file: \"%s\"", filename);
+    freelog(LOG_FATAL, "  file options: %s", file_capstr);
+    freelog(LOG_FATAL, "  supported options: %s", us_capstr);
     exit(EXIT_FAILURE);
   }
 
@@ -253,10 +251,10 @@
 #ifdef AUDIO_SDL
   if (audio_select_plugin("sdl")) return; 
 #endif
-  freelog(LOG_ERROR,
+  freelog(LOG_NORMAL,
     _("No real audio subsystem managed to initialize!"));
-  freelog(LOG_ERROR,
-    _("Perhaps there is some misconfigurationg or bad permissions"));
+  freelog(LOG_NORMAL,
+    _("Perhaps there is some misconfiguration or bad permissions"));
   freelog(LOG_NORMAL, _("Proceeding with sound support disabled"));
 }
 
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to