diff options
author | Goraf <goraf@miranda-ng.org> | 2015-06-22 16:26:39 +0000 |
---|---|---|
committer | Goraf <goraf@miranda-ng.org> | 2015-06-22 16:26:39 +0000 |
commit | 153afb6986158c2b470064596c2ea2fe6bced918 (patch) | |
tree | 53421d2efed82688a1f3a6850a5eeeb8a9787015 /langpacks/polish/Plugins/DbEditorPP.txt | |
parent | f84128a1886b1154beff66cf13314bdfc412bed0 (diff) |
langpacks/polish: minor update
git-svn-id: http://svn.miranda-ng.org/main/trunk@14330 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/polish/Plugins/DbEditorPP.txt')
-rw-r--r-- | langpacks/polish/Plugins/DbEditorPP.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/langpacks/polish/Plugins/DbEditorPP.txt b/langpacks/polish/Plugins/DbEditorPP.txt index f1c692e226..4a7204b52c 100644 --- a/langpacks/polish/Plugins/DbEditorPP.txt +++ b/langpacks/polish/Plugins/DbEditorPP.txt @@ -212,13 +212,8 @@ Na pewno chcesz usunąć moduł "%s"? Usuń moduł z bazy danych
[Delete module from database... Loading]
Usuń moduł z bazy danych... ładowanie
-<<<<<<< .mine
[Delete from all contacts (including Settings)]
Usuń ze wszystkich kontaktów (włączając w to ustawienia)
-=======
-[Delete from all contacts (including Settings)]
-Usuń ze wszystkich kontaktów (wraz z ustawieniami)
->>>>>>> .r14321
;file \plugins\DbEditorPP\src\exportimport.cpp
[INI Files]
Pliki INI
@@ -300,17 +295,10 @@ Otwórz w edytorze profilu ;file \plugins\DbEditorPP\src\main_window.cpp
[Are you sure you want to delete contact "%s"?]
Na pewno chcesz usunąć kontakt "%s"?
-<<<<<<< .mine
[Delete resident settings from database?]
Usunąć ustawienia rezydentne z bazy danych?
[%d orphaned items deleted.]
Usunięto %d porzuconych elementów.
-=======
-[Delete resident settings from database?]
-
-[%d orphaned items deleted.]
-
->>>>>>> .r14321
;file \plugins\DbEditorPP\src\modsettingenum.cpp
[Error loading module list]
Błąd ładowania listy modułów
|