Skip to content

Commit 99dd292

Browse files
authored
[CHARMAP] Functionality Improvements and Bug Fixes (reactos#2560)
- Resize the window slightly when compiled with REMOVE_ADVANCED to avoid deadspace at the bottom of the window. - Skip over the non-printable characters by starting with character ' ' + 1. - Instead of iterating over every cell, simply compute the cell x and y using the CellSize. - Modify behaviour of charmap to allow large character render on mouse move, only hiding the larger character on double click. - Simplify math for moving window to be on desktop. Added FIXME to highlight this doesn't work well on multi-monitor setups. Changed xPos and yPos to LONG since negative numbers are valid on multi-monitor setups. - Do not draw invalid glyphs on the map (can happen when switching fonts or filtering existing font). - Do not allow mouse-over of invalid glyphs. - Fix bug that caused the Help button to remain enabled as it was being modified before it was even created. - Do a better job at finding the correct glyph under the mouse. - Ensure the active cell is cleared correctly. - Invalidate the rect around the previously active cell to ensure it gets redrawn as inactive. - Fix bug from CORE-10518 (initial active cell was not being invalidated on scroll). - Do not try to copy a character to the output if there is no active cell selected. - Populate the advanced portion of the screen with several built-in code pages (the list is hardcoded so that we don't enumerate everything). - Add functionality to filter the character map by a code page (called a character set in this program). - Some fonts list 0x0000 as drawable, even when it isn't, so ignore any valid glyphs that contain it.
1 parent 31e0014 commit 99dd292

32 files changed

+242
-21
lines changed

base/applications/charmap/charmap.c

Lines changed: 84 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <richedit.h>
1414
#include <winnls.h>
1515

16-
#define REMOVE_ADVANCED
16+
//#define REMOVE_ADVANCED
1717

1818
#define ID_ABOUT 0x1
1919

@@ -25,6 +25,55 @@ HICON hSmIcon;
2525
HICON hBgIcon;
2626
SETTINGS Settings;
2727

28+
static
29+
VOID
30+
FillCharacterSetComboList(HWND hwndCombo)
31+
{
32+
WCHAR szCharSetText[256];
33+
LPWSTR trimmedName;
34+
CPINFOEXW cpInfo;
35+
INT i;
36+
37+
if (LoadStringW(hInstance, IDS_UNICODE, szCharSetText, SIZEOF(szCharSetText)))
38+
{
39+
SendMessageW(hwndCombo,
40+
CB_ADDSTRING,
41+
0,
42+
(LPARAM)szCharSetText);
43+
}
44+
45+
for (i = 0; i < SIZEOF(codePages); i++)
46+
{
47+
if (GetCPInfoExW(codePages[i], 0, &cpInfo))
48+
{
49+
trimmedName = wcschr(cpInfo.CodePageName, L'(');
50+
if (!trimmedName)
51+
trimmedName = cpInfo.CodePageName;
52+
53+
SendMessageW(hwndCombo,
54+
CB_ADDSTRING,
55+
0,
56+
(LPARAM)trimmedName);
57+
}
58+
}
59+
60+
SendMessageW(hwndCombo, CB_SETCURSEL, 0, 0);
61+
}
62+
63+
static
64+
VOID
65+
FillGroupByComboList(HWND hwndCombo)
66+
{
67+
WCHAR szAllText[256];
68+
69+
if (LoadStringW(hInstance, IDS_ALL, szAllText, SIZEOF(szAllText)))
70+
{
71+
SendMessageW(hwndCombo, CB_ADDSTRING, 0, (LPARAM)szAllText);
72+
}
73+
74+
SendMessageW(hwndCombo, CB_SETCURSEL, 0, 0);
75+
}
76+
2877
/* Font-enumeration callback */
2978
static
3079
int
@@ -283,7 +332,7 @@ ChangeView(HWND hWnd)
283332
RECT rcPanelInt;
284333
RECT rcStatus;
285334
UINT DeX, DeY;
286-
UINT xPos, yPos;
335+
LONG xPos, yPos;
287336
UINT Width, Height;
288337
UINT DeskTopWidth, DeskTopHeight;
289338
#ifdef REMOVE_ADVANCED
@@ -325,11 +374,12 @@ ChangeView(HWND hWnd)
325374
Shrink the window height a bit here to accomodate for that lost control. */
326375
Height = rcCharmap.bottom + rcCopy.bottom + 10;
327376
#endif
377+
// FIXME: This fails on multi monitor setups
328378
if ((xPos + Width) > DeskTopWidth)
329-
xPos += DeskTopWidth - (xPos + Width);
379+
xPos = DeskTopWidth - Width;
330380

331381
if ((yPos + Height) > DeskTopHeight)
332-
yPos += DeskTopHeight - (yPos + Height);
382+
yPos = DeskTopHeight - Height;
333383

334384
MoveWindow(hWnd,
335385
xPos, yPos,
@@ -438,6 +488,26 @@ AdvancedDlgProc(HWND hDlg,
438488
case WM_INITDIALOG:
439489
return TRUE;
440490

491+
case WM_COMMAND:
492+
{
493+
switch (LOWORD(wParam))
494+
{
495+
case IDC_COMBO_CHARSET:
496+
if (HIWORD(wParam) == CBN_SELCHANGE)
497+
{
498+
INT idx = (INT)SendMessageW((HWND)lParam,
499+
CB_GETCURSEL,
500+
0, 0);
501+
SendMessageW(GetDlgItem(hCharmapDlg, IDC_FONTMAP),
502+
FM_SETCHARMAP,
503+
idx, 0);
504+
505+
EnableWindow(GetDlgItem(hAdvancedDlg, IDC_EDIT_UNICODE), idx == 0);
506+
}
507+
break;
508+
}
509+
}
510+
441511
default:
442512
return FALSE;
443513
}
@@ -456,11 +526,21 @@ PanelOnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
456526
MAKEINTRESOURCE(IDD_CHARMAP),
457527
hWnd,
458528
CharMapDlgProc);
529+
530+
// For now, the Help push button is disabled because of lacking of HTML Help support
531+
EnableWindow(GetDlgItem(hCharmapDlg, IDC_CMHELP), FALSE);
532+
459533
#ifndef REMOVE_ADVANCED
460534
hAdvancedDlg = CreateDialog(hInstance,
461535
MAKEINTRESOURCE(IDD_ADVANCED),
462536
hWnd,
463537
AdvancedDlgProc);
538+
539+
FillCharacterSetComboList(GetDlgItem(hAdvancedDlg, IDC_COMBO_CHARSET));
540+
541+
FillGroupByComboList(GetDlgItem(hAdvancedDlg, IDC_COMBO_GROUPBY));
542+
EnableWindow(GetDlgItem(hAdvancedDlg, IDC_COMBO_GROUPBY), FALSE); // FIXME: Implement
543+
EnableWindow(GetDlgItem(hAdvancedDlg, IDC_BUTTON_SEARCH), FALSE); // FIXME: Implement
464544
#endif
465545
hStatusWnd = CreateWindow(STATUSCLASSNAME,
466546
NULL,
@@ -495,8 +575,6 @@ PanelWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
495575
{
496576
switch (msg) {
497577
case WM_CREATE:
498-
// For now, the Help push button is disabled because of lacking of HTML Help support
499-
EnableWindow(GetDlgItem(hWnd, IDC_CMHELP), FALSE);
500578
return PanelOnCreate(hWnd, wParam, lParam);
501579

502580
case WM_CLOSE:

base/applications/charmap/lang/bg-BG.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,6 @@ BEGIN
5454
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5555
IDS_ABOUT "&За..."
5656
IDS_TITLE "Character Map"
57+
IDS_UNICODE "Unicode"
58+
IDS_ALL "All"
5759
END

base/applications/charmap/lang/ca-ES.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "&En quant a..."
5353
IDS_TITLE "Character Map"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/cs-CZ.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,6 @@ BEGIN
5656
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5757
IDS_ABOUT "&O programu..."
5858
IDS_TITLE "Mapa znaků"
59+
IDS_UNICODE "Unicode"
60+
IDS_ALL "All"
5961
END

base/applications/charmap/lang/de-DE.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "Ü&ber..."
5353
IDS_TITLE "Zeichentabelle"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/el-GR.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "&Πληροφορίες..."
5353
IDS_TITLE "Character Map"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/en-US.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "A&bout..."
5353
IDS_TITLE "Character Map"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/es-ES.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,6 @@ BEGIN
5454
IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como se publica por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más información lee la GNU General Public License.\r\n\r\nDeberías de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU."
5555
IDS_ABOUT "&Acerca de ..."
5656
IDS_TITLE "Mapa de caracteres"
57+
IDS_UNICODE "Unicode"
58+
IDS_ALL "All"
5759
END

base/applications/charmap/lang/et-EE.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "T&eave..."
5353
IDS_TITLE "Märgistik"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/fr-FR.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. \r\n\r\nVoir la Licence Publique Générale GNU pour plus de détails. Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "À propos..."
5353
IDS_TITLE "Table des Caractères"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "Tous"
5456
END

base/applications/charmap/lang/he-IL.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,6 @@ BEGIN
5555
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5656
IDS_ABOUT "&אודות..."
5757
IDS_TITLE "מפת תווים"
58+
IDS_UNICODE "Unicode"
59+
IDS_ALL "All"
5860
END

base/applications/charmap/lang/id-ID.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "Te&ntang..."
5353
IDS_TITLE "Character Map"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/it-IT.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "Questo programma è software libero; può redistribuirlo e/o modificarlo sotto\ni termini della licenza pubblica GNU come pubblicata dalla Free Software Foundation; sia la versione 2 sia una versione successiva (a sua scelta).\r\n\r\nQuesto programma è distribuito\nnella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neanche la garanzia implicita\ndi NEGOZIABILITA' o APPLICABILITA' per un particolare scopo. Si veda la licenza generale pubblica GNU per maggiori dettagli.\r\n\r\nDovrebbe aver ricevuto una copia assieme a questo programma; se così non fosse, scriva alla Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "&Informazioni su..."
5353
IDS_TITLE "Mappa caratteri"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/ja-JP.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "バージョン情報(&B)..."
5353
IDS_TITLE "Character Map"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/ko-KR.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,6 @@ BEGIN
5555
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5656
IDS_ABOUT "정보(&A)"
5757
IDS_TITLE "Character Map"
58+
IDS_UNICODE "Unicode"
59+
IDS_ALL "All"
5860
END

base/applications/charmap/lang/lt-LT.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ BEGIN
6060
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
6161
IDS_ABOUT "&Apie..."
6262
IDS_TITLE "Character Map"
63+
IDS_UNICODE "Unicode"
64+
IDS_ALL "All"
6365
END

base/applications/charmap/lang/nl-NL.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "Over..."
5353
IDS_TITLE "Character Map"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/no-NO.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ BEGIN
5151
IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
5252
IDS_ABOUT "O&m..."
5353
IDS_TITLE "Character Map"
54+
IDS_UNICODE "Unicode"
55+
IDS_ALL "All"
5456
END

base/applications/charmap/lang/pl-PL.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ BEGIN
6060
IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 tej Licencji lub (według twojego wyboru) którejś z późniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKRESLONYCH ZASTOSOWAŃ. W celu uzyskania bliższych informacji sięgnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewnością wraz z niniejszym programem otrzymałeś też egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
6161
IDS_ABOUT "&O programie..."
6262
IDS_TITLE "Tablica znaków"
63+
IDS_UNICODE "Unicode"
64+
IDS_ALL "All"
6365
END

0 commit comments

Comments
 (0)