summaryrefslogtreecommitdiff
path: root/langpacks/polish/Plugins/Dropbox.txt
diff options
context:
space:
mode:
authorPaweł Masarczyk <pawelmasarczyk@gmail.com>2015-04-13 21:47:43 +0000
committerPaweł Masarczyk <pawelmasarczyk@gmail.com>2015-04-13 21:47:43 +0000
commit8b12e667cc9e03da710c4174242ac2d3fecae2f8 (patch)
tree0804391e2d9366a7cd34917758b7fcd6875a8006 /langpacks/polish/Plugins/Dropbox.txt
parentd4dee7be1d5eab19b2cee2d94bd1671abd3446a3 (diff)
Langpacks\Polish:update
git-svn-id: http://svn.miranda-ng.org/main/trunk@12798 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/polish/Plugins/Dropbox.txt')
-rw-r--r--langpacks/polish/Plugins/Dropbox.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/langpacks/polish/Plugins/Dropbox.txt b/langpacks/polish/Plugins/Dropbox.txt
index af021f402f..72edcdd462 100644
--- a/langpacks/polish/Plugins/Dropbox.txt
+++ b/langpacks/polish/Plugins/Dropbox.txt
@@ -39,8 +39,13 @@ Kopiuj link do pobrania do schowka
w toku...
[you have been authorized]
zostałeś zautoryzowany
+<<<<<<< .mine
+[server does not respond]
+Serwer nie odpowiada
+=======
[server does not respond]
serwer nie odpowiada
+>>>>>>> .r8577
;file \plugins\Dropbox\src\dropbox_commands.cpp
[Dropbox supports the following commands:]
Dropbox obsługuje następujące polecenia: