diff options
| author | Dart Raiden <wowemuh@gmail.com> | 2015-04-14 01:46:55 +0000 |
|---|---|---|
| committer | Dart Raiden <wowemuh@gmail.com> | 2015-04-14 01:46:55 +0000 |
| commit | 3cf1535bcc79216f406045763516da6d44e100b5 (patch) | |
| tree | 50be7eb3d2b4644f4d981249dc2fdcdeb2e96928 /langpacks/polish/Plugins/Dropbox.txt | |
| parent | c2fa679c885cf49bed863220087bb33a0f8f5d7d (diff) | |
langpacks: update according to [12777], [12791]
git-svn-id: http://svn.miranda-ng.org/main/trunk@12800 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/polish/Plugins/Dropbox.txt')
| -rw-r--r-- | langpacks/polish/Plugins/Dropbox.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/langpacks/polish/Plugins/Dropbox.txt b/langpacks/polish/Plugins/Dropbox.txt index 72edcdd462..af021f402f 100644 --- a/langpacks/polish/Plugins/Dropbox.txt +++ b/langpacks/polish/Plugins/Dropbox.txt @@ -39,13 +39,8 @@ 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:
|