Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNextcloud bot <bot@nextcloud.com>2021-07-02 06:53:06 +0300
committerNextcloud bot <bot@nextcloud.com>2021-07-02 06:53:06 +0300
commitc31020528eec65f26e2c0f71668a55d76ad393f7 (patch)
tree442c3c744e93c9d83996706352db5d2da2dc7666 /translations/client_nb_NO.ts
parentd625f3fc309baeb43cf488716f2abf58367d9c09 (diff)
[tx-robot] updated from transifex
Diffstat (limited to 'translations/client_nb_NO.ts')
-rw-r--r--translations/client_nb_NO.ts11
1 files changed, 8 insertions, 3 deletions
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index f2976a465..b00687693 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -3100,13 +3100,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="924"/>
+ <location filename="../src/libsync/discovery.cpp" line="939"/>
+ <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="952"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="930"/>
- <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source>
+ <location filename="../src/libsync/discovery.cpp" line="955"/>
+ <source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>