Browse Source

add ability to change picture while import process

Syping 5 months ago
parent
commit
7b68bb10b5

+ 1
- 1
ImageEditorDialog.cpp View File

@@ -151,7 +151,7 @@ fileDialogPreOpen: //Work?
151 151
                 delete importImage;
152 152
                 goto fileDialogPreOpen;
153 153
             }
154
-            ImportDialog *importDialog = new ImportDialog(this);
154
+            ImportDialog *importDialog = new ImportDialog(profileName, this);
155 155
             importDialog->setImage(importImage);
156 156
             importDialog->setModal(true);
157 157
             importDialog->show();

+ 9
- 0
ImageEditorDialog.ui View File

@@ -55,6 +55,9 @@
55 55
        <layout class="QHBoxLayout" name="hlButtons">
56 56
         <item>
57 57
          <widget class="QPushButton" name="cmdReplace">
58
+          <property name="toolTip">
59
+           <string>Import picture</string>
60
+          </property>
58 61
           <property name="text">
59 62
            <string>&amp;Import...</string>
60 63
           </property>
@@ -75,6 +78,9 @@
75 78
         </item>
76 79
         <item>
77 80
          <widget class="QPushButton" name="cmdSave">
81
+          <property name="toolTip">
82
+           <string>Apply changes</string>
83
+          </property>
78 84
           <property name="text">
79 85
            <string>&amp;Overwrite</string>
80 86
           </property>
@@ -82,6 +88,9 @@
82 88
         </item>
83 89
         <item>
84 90
          <widget class="QPushButton" name="cmdClose">
91
+          <property name="toolTip">
92
+           <string>Discard changes</string>
93
+          </property>
85 94
           <property name="text">
86 95
            <string>&amp;Close</string>
87 96
           </property>

+ 86
- 3
ImportDialog.cpp View File

@@ -43,14 +43,16 @@
43 43
 #define snapmaticAvatarPlacementW 145
44 44
 #define snapmaticAvatarPlacementH 66
45 45
 
46
-ImportDialog::ImportDialog(QWidget *parent) :
47
-    QDialog(parent),
46
+ImportDialog::ImportDialog(QString profileName, QWidget *parent) :
47
+    QDialog(parent), profileName(profileName),
48 48
     ui(new Ui::ImportDialog)
49 49
 {
50 50
     // Set Window Flags
51 51
     setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
52 52
 
53 53
     ui->setupUi(this);
54
+    ui->cmdOK->setDefault(true);
55
+    ui->cmdOK->setFocus();
54 56
     importAgreed = false;
55 57
     watermarkAvatar = true;
56 58
     watermarkPicture = false;
@@ -103,6 +105,11 @@ ImportDialog::ImportDialog(QWidget *parent) :
103 105
     }
104 106
 #endif
105 107
 
108
+    // Options menu
109
+    optionsMenu = new QMenu(this);
110
+    optionsMenu->addAction(tr("&Import new Picture..."), this, SLOT(importNewPicture()));
111
+    ui->cmdOptions->setMenu(optionsMenu);
112
+
106 113
     setMaximumSize(sizeHint());
107 114
     setMinimumSize(sizeHint());
108 115
     setFixedSize(sizeHint());
@@ -110,6 +117,7 @@ ImportDialog::ImportDialog(QWidget *parent) :
110 117
 
111 118
 ImportDialog::~ImportDialog()
112 119
 {
120
+    delete optionsMenu;
113 121
     delete ui;
114 122
 }
115 123
 
@@ -247,6 +255,75 @@ void ImportDialog::processWatermark(QPainter *snapmaticPainter)
247 255
     snapmaticPainter->drawImage(0, 0, textWatermark);
248 256
 }
249 257
 
258
+void ImportDialog::importNewPicture()
259
+{
260
+    QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
261
+    settings.beginGroup("FileDialogs");
262
+    bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
263
+    settings.beginGroup("ImportCopy");
264
+
265
+fileDialogPreOpen: //Work?
266
+    QFileDialog fileDialog(this);
267
+    fileDialog.setFileMode(QFileDialog::ExistingFile);
268
+    fileDialog.setViewMode(QFileDialog::Detail);
269
+    fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
270
+    fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog);
271
+    fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
272
+    fileDialog.setWindowTitle(QApplication::translate("ProfileInterface", "Import..."));
273
+    fileDialog.setLabelText(QFileDialog::Accept, QApplication::translate("ProfileInterface", "Import"));
274
+
275
+    // Getting readable Image formats
276
+    QString imageFormatsStr = " ";
277
+    for (QByteArray imageFormat : QImageReader::supportedImageFormats())
278
+    {
279
+        imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " ";
280
+    }
281
+
282
+    QStringList filters;
283
+    filters << QApplication::translate("ProfileInterface", "All image files (%1)").arg(imageFormatsStr.trimmed());
284
+    filters << QApplication::translate("ProfileInterface", "All files (**)");
285
+    fileDialog.setNameFilters(filters);
286
+
287
+    QList<QUrl> sidebarUrls = SidebarGenerator::generateSidebarUrls(fileDialog.sidebarUrls());
288
+
289
+    fileDialog.setSidebarUrls(sidebarUrls);
290
+    fileDialog.setDirectory(settings.value(profileName % "+Directory", StandardPaths::documentsLocation()).toString());
291
+    fileDialog.restoreGeometry(settings.value(profileName % "+Geometry", "").toByteArray());
292
+
293
+    if (fileDialog.exec())
294
+    {
295
+        QStringList selectedFiles = fileDialog.selectedFiles();
296
+        if (selectedFiles.length() == 1)
297
+        {
298
+            QString selectedFile = selectedFiles.at(0);
299
+            QString selectedFileName = QFileInfo(selectedFile).fileName();
300
+
301
+            QFile snapmaticFile(selectedFile);
302
+            if (!snapmaticFile.open(QFile::ReadOnly))
303
+            {
304
+                QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be open").arg("\""+selectedFileName+"\""));
305
+                goto fileDialogPreOpen;
306
+            }
307
+            QImage *importImage = new QImage();
308
+            QImageReader snapmaticImageReader;
309
+            snapmaticImageReader.setDecideFormatFromContent(true);
310
+            snapmaticImageReader.setDevice(&snapmaticFile);
311
+            if (!snapmaticImageReader.read(importImage))
312
+            {
313
+                QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\""));
314
+                delete importImage;
315
+                goto fileDialogPreOpen;
316
+            }
317
+            setImage(importImage);
318
+        }
319
+    }
320
+
321
+    settings.setValue(profileName % "+Geometry", fileDialog.saveGeometry());
322
+    settings.setValue(profileName % "+Directory", fileDialog.directory().absolutePath());
323
+    settings.endGroup();
324
+    settings.endGroup();
325
+}
326
+
250 327
 QImage ImportDialog::image()
251 328
 {
252 329
     return newImage;
@@ -272,16 +349,22 @@ void ImportDialog::setImage(QImage *image_)
272 349
     }
273 350
     else if (image_->width() > snapmaticResolutionW && image_->width() > image_->height())
274 351
     {
352
+        insideAvatarZone = false;
353
+        ui->cbAvatar->setChecked(false);
275 354
         workImage = image_->scaledToWidth(snapmaticResolutionW, Qt::SmoothTransformation);
276 355
         delete image_;
277 356
     }
278 357
     else if (image_->height() > snapmaticResolutionH && image_->height() > image_->width())
279 358
     {
359
+        insideAvatarZone = false;
360
+        ui->cbAvatar->setChecked(false);
280 361
         workImage = image_->scaledToHeight(snapmaticResolutionH, Qt::SmoothTransformation);
281 362
         delete image_;
282 363
     }
283 364
     else
284 365
     {
366
+        insideAvatarZone = false;
367
+        ui->cbAvatar->setChecked(false);
285 368
         workImage = *image_;
286 369
         delete image_;
287 370
     }
@@ -306,7 +389,7 @@ void ImportDialog::on_cbIgnore_toggled(bool checked)
306 389
 
307 390
 void ImportDialog::on_cbAvatar_toggled(bool checked)
308 391
 {
309
-    if (workImage.width() == workImage.height() && !checked)
392
+    if (!workImage.isNull() && workImage.width() == workImage.height() && !checked)
310 393
     {
311 394
         if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No))
312 395
         {

+ 5
- 1
ImportDialog.h View File

@@ -20,6 +20,7 @@
20 20
 #define IMPORTDIALOG_H
21 21
 
22 22
 #include <QDialog>
23
+#include <QMenu>
23 24
 
24 25
 namespace Ui {
25 26
 class ImportDialog;
@@ -30,7 +31,7 @@ class ImportDialog : public QDialog
30 31
     Q_OBJECT
31 32
 
32 33
 public:
33
-    explicit ImportDialog(QWidget *parent = 0);
34
+    explicit ImportDialog(QString profileName, QWidget *parent = 0);
34 35
     ~ImportDialog();
35 36
     QImage image();
36 37
     QString getImageTitle();
@@ -39,6 +40,7 @@ public:
39 40
 
40 41
 private slots:
41 42
     void processImage();
43
+    void importNewPicture();
42 44
     void on_cbIgnore_toggled(bool checked);
43 45
     void on_cbAvatar_toggled(bool checked);
44 46
     void on_cmdCancel_clicked();
@@ -52,6 +54,7 @@ private slots:
52 54
     void on_cbWatermark_toggled(bool checked);
53 55
 
54 56
 private:
57
+    QString profileName;
55 58
     Ui::ImportDialog *ui;
56 59
     QImage avatarAreaImage;
57 60
     QString backgroundPath;
@@ -60,6 +63,7 @@ private:
60 63
     QImage workImage;
61 64
     QImage newImage;
62 65
     QColor selectedColour;
66
+    QMenu *optionsMenu;
63 67
     bool insideAvatarZone;
64 68
     bool watermarkPicture;
65 69
     bool watermarkAvatar;

+ 20
- 1
ImportDialog.ui View File

@@ -141,7 +141,7 @@
141 141
         </property>
142 142
         <layout class="QVBoxLayout" name="vlBackground">
143 143
          <item>
144
-          <layout class="QHBoxLayout" name="hlColor">
144
+          <layout class="QHBoxLayout" name="hlColour">
145 145
            <item>
146 146
             <layout class="QHBoxLayout" name="hlColourManage">
147 147
              <item>
@@ -170,6 +170,9 @@
170 170
                </property>
171 171
                <item>
172 172
                 <widget class="QToolButton" name="cmdColourChange">
173
+                 <property name="toolTip">
174
+                  <string>Select background colour</string>
175
+                 </property>
173 176
                  <property name="text">
174 177
                   <string>...</string>
175 178
                  </property>
@@ -220,6 +223,9 @@
220 223
                </property>
221 224
                <item>
222 225
                 <widget class="QToolButton" name="cmdBackgroundChange">
226
+                 <property name="toolTip">
227
+                  <string>Select background image</string>
228
+                 </property>
223 229
                  <property name="text">
224 230
                   <string>...</string>
225 231
                  </property>
@@ -227,6 +233,9 @@
227 233
                </item>
228 234
                <item>
229 235
                 <widget class="QToolButton" name="cmdBackgroundWipe">
236
+                 <property name="toolTip">
237
+                  <string>Remove background image</string>
238
+                 </property>
230 239
                  <property name="text">
231 240
                   <string>X</string>
232 241
                  </property>
@@ -290,6 +299,16 @@
290 299
       </item>
291 300
       <item>
292 301
        <layout class="QHBoxLayout" name="hlButtons">
302
+        <item>
303
+         <widget class="QPushButton" name="cmdOptions">
304
+          <property name="toolTip">
305
+           <string>Import options</string>
306
+          </property>
307
+          <property name="text">
308
+           <string>&amp;Options</string>
309
+          </property>
310
+         </widget>
311
+        </item>
293 312
         <item>
294 313
          <spacer name="hsButtons">
295 314
           <property name="orientation">

+ 6
- 0
JsonEditorDialog.ui View File

@@ -112,6 +112,9 @@
112 112
          <verstretch>0</verstretch>
113 113
         </sizepolicy>
114 114
        </property>
115
+       <property name="toolTip">
116
+        <string>Apply changes</string>
117
+       </property>
115 118
        <property name="text">
116 119
         <string>&amp;Save</string>
117 120
        </property>
@@ -125,6 +128,9 @@
125 128
          <verstretch>0</verstretch>
126 129
         </sizepolicy>
127 130
        </property>
131
+       <property name="toolTip">
132
+        <string>Discard changes</string>
133
+       </property>
128 134
        <property name="text">
129 135
         <string>&amp;Close</string>
130 136
        </property>

+ 16
- 1
MapLocationDialog.ui View File

@@ -134,6 +134,9 @@ color: rgb(255, 255, 255);
134 134
          <property name="focusPolicy">
135 135
           <enum>Qt::NoFocus</enum>
136 136
          </property>
137
+         <property name="toolTip">
138
+          <string>Close viewer</string>
139
+         </property>
137 140
          <property name="text">
138 141
           <string>&amp;Close</string>
139 142
          </property>
@@ -160,6 +163,9 @@ color: rgb(255, 255, 255);
160 163
          <property name="focusPolicy">
161 164
           <enum>Qt::NoFocus</enum>
162 165
          </property>
166
+         <property name="toolTip">
167
+          <string>Apply new position</string>
168
+         </property>
163 169
          <property name="text">
164 170
           <string>&amp;Apply</string>
165 171
          </property>
@@ -173,6 +179,9 @@ color: rgb(255, 255, 255);
173 179
          <property name="focusPolicy">
174 180
           <enum>Qt::NoFocus</enum>
175 181
          </property>
182
+         <property name="toolTip">
183
+          <string>Revert old position</string>
184
+         </property>
176 185
          <property name="text">
177 186
           <string>&amp;Revert</string>
178 187
          </property>
@@ -186,8 +195,11 @@ color: rgb(255, 255, 255);
186 195
          <property name="focusPolicy">
187 196
           <enum>Qt::NoFocus</enum>
188 197
          </property>
198
+         <property name="toolTip">
199
+          <string>Select new position</string>
200
+         </property>
189 201
          <property name="text">
190
-          <string>&amp;Set</string>
202
+          <string>&amp;Select</string>
191 203
          </property>
192 204
          <property name="autoDefault">
193 205
           <bool>false</bool>
@@ -199,6 +211,9 @@ color: rgb(255, 255, 255);
199 211
          <property name="focusPolicy">
200 212
           <enum>Qt::NoFocus</enum>
201 213
          </property>
214
+         <property name="toolTip">
215
+          <string>Quit select position</string>
216
+         </property>
202 217
          <property name="text">
203 218
           <string>&amp;Done</string>
204 219
          </property>

+ 2
- 2
ProfileInterface.cpp View File

@@ -737,7 +737,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime
737 737
                         delete picture;
738 738
                         return false;
739 739
                     }
740
-                    ImportDialog *importDialog = new ImportDialog(this);
740
+                    ImportDialog *importDialog = new ImportDialog(profileName, this);
741 741
                     importDialog->setImage(snapmaticImage);
742 742
                     importDialog->setModal(true);
743 743
                     importDialog->show();
@@ -922,7 +922,7 @@ bool ProfileInterface::importImage(QImage *snapmaticImage, QDateTime importDateT
922 922
     if (picture->readingPicture(true, false, true, false))
923 923
     {
924 924
         bool success = false;
925
-        ImportDialog *importDialog = new ImportDialog(this);
925
+        ImportDialog *importDialog = new ImportDialog(profileName, this);
926 926
         importDialog->setImage(snapmaticImage);
927 927
         importDialog->setModal(true);
928 928
         importDialog->show();

+ 124
- 36
res/gta5sync.ts View File

@@ -172,16 +172,31 @@ Pictures and Savegames</source>
172 172
     </message>
173 173
     <message>
174 174
         <location filename="../ImageEditorDialog.ui" line="59"/>
175
+        <source>Import picture</source>
176
+        <translation type="unfinished"></translation>
177
+    </message>
178
+    <message>
179
+        <location filename="../ImageEditorDialog.ui" line="62"/>
175 180
         <source>&amp;Import...</source>
176 181
         <translation type="unfinished"></translation>
177 182
     </message>
178 183
     <message>
179
-        <location filename="../ImageEditorDialog.ui" line="79"/>
184
+        <location filename="../ImageEditorDialog.ui" line="82"/>
185
+        <source>Apply changes</source>
186
+        <translation type="unfinished"></translation>
187
+    </message>
188
+    <message>
189
+        <location filename="../ImageEditorDialog.ui" line="85"/>
180 190
         <source>&amp;Overwrite</source>
181 191
         <translation type="unfinished"></translation>
182 192
     </message>
183 193
     <message>
184
-        <location filename="../ImageEditorDialog.ui" line="86"/>
194
+        <location filename="../ImageEditorDialog.ui" line="92"/>
195
+        <source>Discard changes</source>
196
+        <translation type="unfinished"></translation>
197
+    </message>
198
+    <message>
199
+        <location filename="../ImageEditorDialog.ui" line="95"/>
185 200
         <source>&amp;Close</source>
186 201
         <translation type="unfinished"></translation>
187 202
     </message>
@@ -221,7 +236,7 @@ Pictures and Savegames</source>
221 236
     </message>
222 237
     <message>
223 238
         <location filename="../ImportDialog.ui" line="111"/>
224
-        <location filename="../ImportDialog.ui" line="269"/>
239
+        <location filename="../ImportDialog.ui" line="278"/>
225 240
         <source>Ignore Aspect Ratio</source>
226 241
         <translation type="unfinished"></translation>
227 242
     </message>
@@ -237,91 +252,121 @@ Pictures and Savegames</source>
237 252
     </message>
238 253
     <message>
239 254
         <location filename="../ImportDialog.ui" line="150"/>
240
-        <location filename="../ImportDialog.cpp" line="82"/>
241
-        <location filename="../ImportDialog.cpp" line="364"/>
255
+        <location filename="../ImportDialog.cpp" line="84"/>
256
+        <location filename="../ImportDialog.cpp" line="447"/>
242 257
         <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
243 258
         <translation type="unfinished"></translation>
244 259
     </message>
245 260
     <message>
246 261
         <location filename="../ImportDialog.ui" line="174"/>
247
-        <location filename="../ImportDialog.ui" line="224"/>
262
+        <source>Select background colour</source>
263
+        <translation type="unfinished"></translation>
264
+    </message>
265
+    <message>
266
+        <location filename="../ImportDialog.ui" line="177"/>
267
+        <location filename="../ImportDialog.ui" line="230"/>
248 268
         <source>...</source>
249 269
         <translation type="unfinished"></translation>
250 270
     </message>
251 271
     <message>
252
-        <location filename="../ImportDialog.ui" line="200"/>
253
-        <location filename="../ImportDialog.cpp" line="83"/>
254
-        <location filename="../ImportDialog.cpp" line="444"/>
272
+        <location filename="../ImportDialog.ui" line="203"/>
273
+        <location filename="../ImportDialog.cpp" line="85"/>
274
+        <location filename="../ImportDialog.cpp" line="527"/>
255 275
         <source>Background Image:</source>
256 276
         <translation type="unfinished"></translation>
257 277
     </message>
258 278
     <message>
259
-        <location filename="../ImportDialog.ui" line="231"/>
279
+        <location filename="../ImportDialog.ui" line="227"/>
280
+        <source>Select background image</source>
281
+        <translation type="unfinished"></translation>
282
+    </message>
283
+    <message>
284
+        <location filename="../ImportDialog.ui" line="237"/>
285
+        <source>Remove background image</source>
286
+        <translation type="unfinished"></translation>
287
+    </message>
288
+    <message>
289
+        <location filename="../ImportDialog.ui" line="240"/>
260 290
         <source>X</source>
261 291
         <translation type="unfinished"></translation>
262 292
     </message>
263 293
     <message>
264
-        <location filename="../ImportDialog.ui" line="259"/>
294
+        <location filename="../ImportDialog.ui" line="268"/>
265 295
         <source>Force Colour in Avatar Zone</source>
266 296
         <translation type="unfinished"></translation>
267 297
     </message>
268 298
     <message>
269
-        <location filename="../ImportDialog.ui" line="315"/>
299
+        <location filename="../ImportDialog.ui" line="305"/>
300
+        <source>Import options</source>
301
+        <translation type="unfinished"></translation>
302
+    </message>
303
+    <message>
304
+        <location filename="../ImportDialog.ui" line="308"/>
305
+        <source>&amp;Options</source>
306
+        <translation type="unfinished"></translation>
307
+    </message>
308
+    <message>
309
+        <location filename="../ImportDialog.ui" line="334"/>
270 310
         <source>Import picture</source>
271 311
         <translation type="unfinished"></translation>
272 312
     </message>
273 313
     <message>
274
-        <location filename="../ImportDialog.ui" line="318"/>
314
+        <location filename="../ImportDialog.ui" line="337"/>
275 315
         <source>&amp;OK</source>
276 316
         <translation type="unfinished"></translation>
277 317
     </message>
278 318
     <message>
279
-        <location filename="../ImportDialog.ui" line="331"/>
319
+        <location filename="../ImportDialog.ui" line="350"/>
280 320
         <source>Discard picture</source>
281 321
         <translation type="unfinished"></translation>
282 322
     </message>
283 323
     <message>
284
-        <location filename="../ImportDialog.ui" line="334"/>
324
+        <location filename="../ImportDialog.ui" line="353"/>
285 325
         <source>&amp;Cancel</source>
286 326
         <translation type="unfinished"></translation>
287 327
     </message>
288 328
     <message>
289
-        <location filename="../ImportDialog.cpp" line="175"/>
329
+        <location filename="../ImportDialog.cpp" line="110"/>
330
+        <source>&amp;Import new Picture...</source>
331
+        <translation type="unfinished"></translation>
332
+    </message>
333
+    <message>
334
+        <location filename="../ImportDialog.cpp" line="183"/>
290 335
         <location filename="../ProfileInterface.cpp" line="668"/>
291 336
         <source>Custom Avatar</source>
292 337
         <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
293 338
         <translation type="unfinished"></translation>
294 339
     </message>
295 340
     <message>
296
-        <location filename="../ImportDialog.cpp" line="202"/>
341
+        <location filename="../ImportDialog.cpp" line="210"/>
297 342
         <location filename="../ProfileInterface.cpp" line="687"/>
298 343
         <source>Custom Picture</source>
299 344
         <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
300 345
         <translation type="unfinished"></translation>
301 346
     </message>
302 347
     <message>
303
-        <location filename="../ImportDialog.cpp" line="311"/>
348
+        <location filename="../ImportDialog.cpp" line="394"/>
304 349
         <source>Snapmatic Avatar Zone</source>
305 350
         <translation type="unfinished"></translation>
306 351
     </message>
307 352
     <message>
308
-        <location filename="../ImportDialog.cpp" line="311"/>
353
+        <location filename="../ImportDialog.cpp" line="394"/>
309 354
         <source>Are you sure to use a square image outside of the Avatar Zone?
310 355
 When you want to use it as Avatar the image will be detached!</source>
311 356
         <translation type="unfinished"></translation>
312 357
     </message>
313 358
     <message>
314
-        <location filename="../ImportDialog.cpp" line="360"/>
359
+        <location filename="../ImportDialog.cpp" line="443"/>
315 360
         <source>Select Colour...</source>
316 361
         <translation type="unfinished"></translation>
317 362
     </message>
318 363
     <message>
319
-        <location filename="../ImportDialog.cpp" line="429"/>
364
+        <location filename="../ImportDialog.cpp" line="512"/>
320 365
         <source>Background Image: %1</source>
321 366
         <translation type="unfinished"></translation>
322 367
     </message>
323 368
     <message>
324
-        <location filename="../ImportDialog.cpp" line="429"/>
369
+        <location filename="../ImportDialog.cpp" line="512"/>
325 370
         <source>File</source>
326 371
         <comment>Background Image: File</comment>
327 372
         <translation type="unfinished"></translation>
@@ -336,11 +381,21 @@ When you want to use it as Avatar the image will be detached!</source>
336 381
     </message>
337 382
     <message>
338 383
         <location filename="../JsonEditorDialog.ui" line="116"/>
384
+        <source>Apply changes</source>
385
+        <translation type="unfinished"></translation>
386
+    </message>
387
+    <message>
388
+        <location filename="../JsonEditorDialog.ui" line="119"/>
339 389
         <source>&amp;Save</source>
340 390
         <translation type="unfinished"></translation>
341 391
     </message>
342 392
     <message>
343
-        <location filename="../JsonEditorDialog.ui" line="129"/>
393
+        <location filename="../JsonEditorDialog.ui" line="132"/>
394
+        <source>Discard changes</source>
395
+        <translation type="unfinished"></translation>
396
+    </message>
397
+    <message>
398
+        <location filename="../JsonEditorDialog.ui" line="135"/>
344 399
         <source>&amp;Close</source>
345 400
         <translation type="unfinished"></translation>
346 401
     </message>
@@ -359,26 +414,51 @@ When you want to use it as Avatar the image will be detached!</source>
359 414
     </message>
360 415
     <message>
361 416
         <location filename="../MapLocationDialog.ui" line="138"/>
417
+        <source>Close viewer</source>
418
+        <translation type="unfinished"></translation>
419
+    </message>
420
+    <message>
421
+        <location filename="../MapLocationDialog.ui" line="141"/>
362 422
         <source>&amp;Close</source>
363 423
         <translation type="unfinished"></translation>
364 424
     </message>
365 425
     <message>
366
-        <location filename="../MapLocationDialog.ui" line="164"/>
426
+        <location filename="../MapLocationDialog.ui" line="167"/>
427
+        <source>Apply new position</source>
428
+        <translation type="unfinished"></translation>
429
+    </message>
430
+    <message>
431
+        <location filename="../MapLocationDialog.ui" line="170"/>
367 432
         <source>&amp;Apply</source>
368 433
         <translation type="unfinished"></translation>
369 434
     </message>
370 435
     <message>
371
-        <location filename="../MapLocationDialog.ui" line="177"/>
436
+        <location filename="../MapLocationDialog.ui" line="183"/>
437
+        <source>Revert old position</source>
438
+        <translation type="unfinished"></translation>
439
+    </message>
440
+    <message>
441
+        <location filename="../MapLocationDialog.ui" line="186"/>
372 442
         <source>&amp;Revert</source>
373 443
         <translation type="unfinished"></translation>
374 444
     </message>
375 445
     <message>
376
-        <location filename="../MapLocationDialog.ui" line="190"/>
377
-        <source>&amp;Set</source>
446
+        <location filename="../MapLocationDialog.ui" line="199"/>
447
+        <source>Select new position</source>
378 448
         <translation type="unfinished"></translation>
379 449
     </message>
380 450
     <message>
381
-        <location filename="../MapLocationDialog.ui" line="203"/>
451
+        <location filename="../MapLocationDialog.ui" line="202"/>
452
+        <source>&amp;Select</source>
453
+        <translation type="unfinished"></translation>
454
+    </message>
455
+    <message>
456
+        <location filename="../MapLocationDialog.ui" line="215"/>
457
+        <source>Quit select position</source>
458
+        <translation type="unfinished"></translation>
459
+    </message>
460
+    <message>
461
+        <location filename="../MapLocationDialog.ui" line="218"/>
382 462
         <source>&amp;Done</source>
383 463
         <translation type="unfinished"></translation>
384 464
     </message>
@@ -1028,7 +1108,8 @@ Press 1 for Default View</source>
1028 1108
     </message>
1029 1109
     <message>
1030 1110
         <location filename="../ImageEditorDialog.cpp" line="109"/>
1031
-        <location filename="../ImportDialog.cpp" line="383"/>
1111
+        <location filename="../ImportDialog.cpp" line="272"/>
1112
+        <location filename="../ImportDialog.cpp" line="466"/>
1032 1113
         <location filename="../ProfileInterface.cpp" line="482"/>
1033 1114
         <location filename="../ProfileInterface.cpp" line="548"/>
1034 1115
         <location filename="../ProfileInterface.cpp" line="857"/>
@@ -1039,9 +1120,12 @@ Press 1 for Default View</source>
1039 1120
         <location filename="../ImageEditorDialog.cpp" line="110"/>
1040 1121
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1041 1122
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1042
-        <location filename="../ImportDialog.cpp" line="384"/>
1043
-        <location filename="../ImportDialog.cpp" line="415"/>
1044
-        <location filename="../ImportDialog.cpp" line="424"/>
1123
+        <location filename="../ImportDialog.cpp" line="273"/>
1124
+        <location filename="../ImportDialog.cpp" line="304"/>
1125
+        <location filename="../ImportDialog.cpp" line="313"/>
1126
+        <location filename="../ImportDialog.cpp" line="467"/>
1127
+        <location filename="../ImportDialog.cpp" line="498"/>
1128
+        <location filename="../ImportDialog.cpp" line="507"/>
1045 1129
         <location filename="../ProfileInterface.cpp" line="483"/>
1046 1130
         <location filename="../ProfileInterface.cpp" line="527"/>
1047 1131
         <location filename="../ProfileInterface.cpp" line="582"/>
@@ -1061,14 +1145,16 @@ Press 1 for Default View</source>
1061 1145
     </message>
1062 1146
     <message>
1063 1147
         <location filename="../ImageEditorDialog.cpp" line="120"/>
1064
-        <location filename="../ImportDialog.cpp" line="394"/>
1148
+        <location filename="../ImportDialog.cpp" line="283"/>
1149
+        <location filename="../ImportDialog.cpp" line="477"/>
1065 1150
         <location filename="../ProfileInterface.cpp" line="502"/>
1066 1151
         <source>All image files (%1)</source>
1067 1152
         <translation type="unfinished"></translation>
1068 1153
     </message>
1069 1154
     <message>
1070 1155
         <location filename="../ImageEditorDialog.cpp" line="121"/>
1071
-        <location filename="../ImportDialog.cpp" line="395"/>
1156
+        <location filename="../ImportDialog.cpp" line="284"/>
1157
+        <location filename="../ImportDialog.cpp" line="478"/>
1072 1158
         <location filename="../ProfileInterface.cpp" line="503"/>
1073 1159
         <location filename="../UserInterface.cpp" line="463"/>
1074 1160
         <source>All files (**)</source>
@@ -1076,14 +1162,16 @@ Press 1 for Default View</source>
1076 1162
     </message>
1077 1163
     <message>
1078 1164
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1079
-        <location filename="../ImportDialog.cpp" line="415"/>
1165
+        <location filename="../ImportDialog.cpp" line="304"/>
1166
+        <location filename="../ImportDialog.cpp" line="498"/>
1080 1167
         <location filename="../ProfileInterface.cpp" line="725"/>
1081 1168
         <source>Can&apos;t import %1 because file can&apos;t be open</source>
1082 1169
         <translation type="unfinished"></translation>
1083 1170
     </message>
1084 1171
     <message>
1085 1172
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1086
-        <location filename="../ImportDialog.cpp" line="424"/>
1173
+        <location filename="../ImportDialog.cpp" line="313"/>
1174
+        <location filename="../ImportDialog.cpp" line="507"/>
1087 1175
         <location filename="../ProfileInterface.cpp" line="735"/>
1088 1176
         <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
1089 1177
         <translation type="unfinished"></translation>

BIN
res/gta5sync_de.qm View File


+ 125
- 37
res/gta5sync_de.ts View File

@@ -188,16 +188,31 @@ Snapmatic Bilder und Spielständen</translation>
188 188
     </message>
189 189
     <message>
190 190
         <location filename="../ImageEditorDialog.ui" line="59"/>
191
+        <source>Import picture</source>
192
+        <translation>Bild importieren</translation>
193
+    </message>
194
+    <message>
195
+        <location filename="../ImageEditorDialog.ui" line="62"/>
191 196
         <source>&amp;Import...</source>
192 197
         <translation>&amp;Importieren...</translation>
193 198
     </message>
194 199
     <message>
195
-        <location filename="../ImageEditorDialog.ui" line="79"/>
200
+        <location filename="../ImageEditorDialog.ui" line="82"/>
201
+        <source>Apply changes</source>
202
+        <translation>Änderungen übernehmen</translation>
203
+    </message>
204
+    <message>
205
+        <location filename="../ImageEditorDialog.ui" line="85"/>
196 206
         <source>&amp;Overwrite</source>
197 207
         <translation>&amp;Überschreiben</translation>
198 208
     </message>
199 209
     <message>
200
-        <location filename="../ImageEditorDialog.ui" line="86"/>
210
+        <location filename="../ImageEditorDialog.ui" line="92"/>
211
+        <source>Discard changes</source>
212
+        <translation>Änderungen verwerfen</translation>
213
+    </message>
214
+    <message>
215
+        <location filename="../ImageEditorDialog.ui" line="95"/>
201 216
         <source>&amp;Close</source>
202 217
         <translation>S&amp;chließen</translation>
203 218
     </message>
@@ -221,7 +236,7 @@ Snapmatic Bilder und Spielständen</translation>
221 236
     </message>
222 237
     <message>
223 238
         <location filename="../ImportDialog.ui" line="111"/>
224
-        <location filename="../ImportDialog.ui" line="269"/>
239
+        <location filename="../ImportDialog.ui" line="278"/>
225 240
         <source>Ignore Aspect Ratio</source>
226 241
         <translation>Seitenverhältnis ignorieren</translation>
227 242
     </message>
@@ -247,92 +262,122 @@ Snapmatic Bilder und Spielständen</translation>
247 262
     </message>
248 263
     <message>
249 264
         <location filename="../ImportDialog.ui" line="150"/>
250
-        <location filename="../ImportDialog.cpp" line="82"/>
251
-        <location filename="../ImportDialog.cpp" line="364"/>
265
+        <location filename="../ImportDialog.cpp" line="84"/>
266
+        <location filename="../ImportDialog.cpp" line="447"/>
252 267
         <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
253 268
         <translation>Hintergrundfarbe: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
254 269
     </message>
255 270
     <message>
256 271
         <location filename="../ImportDialog.ui" line="174"/>
257
-        <location filename="../ImportDialog.ui" line="224"/>
272
+        <source>Select background colour</source>
273
+        <translation>Hintergrundfarbe auswählen</translation>
274
+    </message>
275
+    <message>
276
+        <location filename="../ImportDialog.ui" line="177"/>
277
+        <location filename="../ImportDialog.ui" line="230"/>
258 278
         <source>...</source>
259 279
         <translation>...</translation>
260 280
     </message>
261 281
     <message>
262
-        <location filename="../ImportDialog.cpp" line="429"/>
282
+        <location filename="../ImportDialog.ui" line="227"/>
283
+        <source>Select background image</source>
284
+        <translation>Hintergrundbild auswählen</translation>
285
+    </message>
286
+    <message>
287
+        <location filename="../ImportDialog.ui" line="237"/>
288
+        <source>Remove background image</source>
289
+        <translation>Hintergrundbild entfernen</translation>
290
+    </message>
291
+    <message>
292
+        <location filename="../ImportDialog.cpp" line="512"/>
263 293
         <source>Background Image: %1</source>
264 294
         <translation>Hintergrundbild: %1</translation>
265 295
     </message>
266 296
     <message>
267
-        <location filename="../ImportDialog.ui" line="231"/>
297
+        <location filename="../ImportDialog.ui" line="240"/>
268 298
         <source>X</source>
269 299
         <translation>X</translation>
270 300
     </message>
271 301
     <message>
272
-        <location filename="../ImportDialog.ui" line="259"/>
302
+        <location filename="../ImportDialog.ui" line="268"/>
273 303
         <source>Force Colour in Avatar Zone</source>
274 304
         <translation>Erzwinge Farbe in Avatar Zone</translation>
275 305
     </message>
276 306
     <message>
277
-        <location filename="../ImportDialog.ui" line="315"/>
307
+        <location filename="../ImportDialog.ui" line="305"/>
308
+        <source>Import options</source>
309
+        <translation>Import Optionen</translation>
310
+    </message>
311
+    <message>
312
+        <location filename="../ImportDialog.ui" line="308"/>
313
+        <source>&amp;Options</source>
314
+        <translation>&amp;Optionen</translation>
315
+    </message>
316
+    <message>
317
+        <location filename="../ImportDialog.ui" line="334"/>
278 318
         <source>Import picture</source>
279 319
         <translation>Bild importieren</translation>
280 320
     </message>
281 321
     <message>
282
-        <location filename="../ImportDialog.ui" line="318"/>
322
+        <location filename="../ImportDialog.ui" line="337"/>
283 323
         <source>&amp;OK</source>
284 324
         <translation>&amp;OK</translation>
285 325
     </message>
286 326
     <message>
287
-        <location filename="../ImportDialog.ui" line="331"/>
327
+        <location filename="../ImportDialog.ui" line="350"/>
288 328
         <source>Discard picture</source>
289 329
         <translation>Bild verwerfen</translation>
290 330
     </message>
291 331
     <message>
292
-        <location filename="../ImportDialog.ui" line="334"/>
332
+        <location filename="../ImportDialog.ui" line="353"/>
293 333
         <source>&amp;Cancel</source>
294 334
         <translation>Abbre&amp;chen</translation>
295 335
     </message>
296 336
     <message>
297
-        <location filename="../ImportDialog.ui" line="200"/>
298
-        <location filename="../ImportDialog.cpp" line="83"/>
299
-        <location filename="../ImportDialog.cpp" line="444"/>
337
+        <location filename="../ImportDialog.ui" line="203"/>
338
+        <location filename="../ImportDialog.cpp" line="85"/>
339
+        <location filename="../ImportDialog.cpp" line="527"/>
300 340
         <source>Background Image:</source>
301 341
         <translation>Hintergrundbild:</translation>
302 342
     </message>
303 343
     <message>
304
-        <location filename="../ImportDialog.cpp" line="175"/>
344
+        <location filename="../ImportDialog.cpp" line="110"/>
345
+        <source>&amp;Import new Picture...</source>
346
+        <translation>Neues Bild &amp;importieren...</translation>
347
+    </message>
348
+    <message>
349
+        <location filename="../ImportDialog.cpp" line="183"/>
305 350
         <location filename="../ProfileInterface.cpp" line="668"/>
306 351
         <source>Custom Avatar</source>
307 352
         <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
308 353
         <translation>Eigener Avatar</translation>
309 354
     </message>
310 355
     <message>
311
-        <location filename="../ImportDialog.cpp" line="202"/>
356
+        <location filename="../ImportDialog.cpp" line="210"/>
312 357
         <location filename="../ProfileInterface.cpp" line="687"/>
313 358
         <source>Custom Picture</source>
314 359
         <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
315 360
         <translation>Eigenes Bild</translation>
316 361
     </message>
317 362
     <message>
318
-        <location filename="../ImportDialog.cpp" line="311"/>
363
+        <location filename="../ImportDialog.cpp" line="394"/>
319 364
         <source>Are you sure to use a square image outside of the Avatar Zone?
320 365
 When you want to use it as Avatar the image will be detached!</source>
321 366
         <translation>Bist du sicher ein Quadrat Bild außerhalb der Avatar Zone zu verwenden?
322 367
 Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
323 368
     </message>
324 369
     <message>
325
-        <location filename="../ImportDialog.cpp" line="311"/>
370
+        <location filename="../ImportDialog.cpp" line="394"/>
326 371
         <source>Snapmatic Avatar Zone</source>
327 372
         <translation>Snapmatic Avatar Zone</translation>
328 373
     </message>
329 374
     <message>
330
-        <location filename="../ImportDialog.cpp" line="360"/>
375
+        <location filename="../ImportDialog.cpp" line="443"/>
331 376
         <source>Select Colour...</source>
332 377
         <translation>Farbe auswählen...</translation>
333 378
     </message>
334 379
     <message>
335
-        <location filename="../ImportDialog.cpp" line="429"/>
380
+        <location filename="../ImportDialog.cpp" line="512"/>
336 381
         <source>File</source>
337 382
         <comment>Background Image: File</comment>
338 383
         <translation>Datei</translation>
@@ -347,11 +392,21 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
347 392
     </message>
348 393
     <message>
349 394
         <location filename="../JsonEditorDialog.ui" line="116"/>
395
+        <source>Apply changes</source>
396
+        <translation>Änderungen übernehmen</translation>
397
+    </message>
398
+    <message>
399
+        <location filename="../JsonEditorDialog.ui" line="119"/>
350 400
         <source>&amp;Save</source>
351 401
         <translation>&amp;Speichern</translation>
352 402
     </message>
353 403
     <message>
354
-        <location filename="../JsonEditorDialog.ui" line="129"/>
404
+        <location filename="../JsonEditorDialog.ui" line="132"/>
405
+        <source>Discard changes</source>
406
+        <translation>Änderungen verwerfen</translation>
407
+    </message>
408
+    <message>
409
+        <location filename="../JsonEditorDialog.ui" line="135"/>
355 410
         <source>&amp;Close</source>
356 411
         <translation>S&amp;chließen</translation>
357 412
     </message>
@@ -370,26 +425,51 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
370 425
     </message>
371 426
     <message>
372 427
         <location filename="../MapLocationDialog.ui" line="138"/>
428
+        <source>Close viewer</source>
429
+        <translation>Ansicht schließen</translation>
430
+    </message>
431
+    <message>
432
+        <location filename="../MapLocationDialog.ui" line="141"/>
373 433
         <source>&amp;Close</source>
374 434
         <translation>S&amp;chließen</translation>
375 435
     </message>
376 436
     <message>
377
-        <location filename="../MapLocationDialog.ui" line="164"/>
437
+        <location filename="../MapLocationDialog.ui" line="167"/>
438
+        <source>Apply new position</source>
439
+        <translation>Neue Position festlegen</translation>
440
+    </message>
441
+    <message>
442
+        <location filename="../MapLocationDialog.ui" line="170"/>
378 443
         <source>&amp;Apply</source>
379 444
         <translation>&amp;Übernehmen</translation>
380 445
     </message>
381 446
     <message>
382
-        <location filename="../MapLocationDialog.ui" line="177"/>
447
+        <location filename="../MapLocationDialog.ui" line="183"/>
448
+        <source>Revert old position</source>
449
+        <translation>Alte Position wiederherstellen</translation>
450
+    </message>
451
+    <message>
452
+        <location filename="../MapLocationDialog.ui" line="186"/>
383 453
         <source>&amp;Revert</source>
384 454
         <translation>&amp;Zurücksetzen</translation>
385 455
     </message>
386 456
     <message>
387
-        <location filename="../MapLocationDialog.ui" line="190"/>
388
-        <source>&amp;Set</source>
389
-        <translation>&amp;Ändern</translation>
457
+        <location filename="../MapLocationDialog.ui" line="199"/>
458
+        <source>Select new position</source>
459
+        <translation>Neue Position auswählen</translation>
460
+    </message>
461
+    <message>
462
+        <location filename="../MapLocationDialog.ui" line="202"/>
463
+        <source>&amp;Select</source>
464
+        <translation>Au&amp;swählen</translation>
465
+    </message>
466
+    <message>
467
+        <location filename="../MapLocationDialog.ui" line="215"/>
468
+        <source>Quit select position</source>
469
+        <translation>Position auswählen verlassen</translation>
390 470
     </message>
391 471
     <message>
392
-        <location filename="../MapLocationDialog.ui" line="203"/>
472
+        <location filename="../MapLocationDialog.ui" line="218"/>
393 473
         <source>&amp;Done</source>
394 474
         <translation>&amp;Fertig</translation>
395 475
     </message>
@@ -1055,7 +1135,8 @@ Drücke 1 für Standardmodus</translation>
1055 1135
     </message>
1056 1136
     <message>
1057 1137
         <location filename="../ImageEditorDialog.cpp" line="109"/>
1058
-        <location filename="../ImportDialog.cpp" line="383"/>
1138
+        <location filename="../ImportDialog.cpp" line="272"/>
1139
+        <location filename="../ImportDialog.cpp" line="466"/>
1059 1140
         <location filename="../ProfileInterface.cpp" line="482"/>
1060 1141
         <location filename="../ProfileInterface.cpp" line="548"/>
1061 1142
         <location filename="../ProfileInterface.cpp" line="857"/>
@@ -1066,9 +1147,12 @@ Drücke 1 für Standardmodus</translation>
1066 1147
         <location filename="../ImageEditorDialog.cpp" line="110"/>
1067 1148
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1068 1149
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1069
-        <location filename="../ImportDialog.cpp" line="384"/>
1070
-        <location filename="../ImportDialog.cpp" line="415"/>
1071
-        <location filename="../ImportDialog.cpp" line="424"/>
1150
+        <location filename="../ImportDialog.cpp" line="273"/>
1151
+        <location filename="../ImportDialog.cpp" line="304"/>
1152
+        <location filename="../ImportDialog.cpp" line="313"/>
1153
+        <location filename="../ImportDialog.cpp" line="467"/>
1154
+        <location filename="../ImportDialog.cpp" line="498"/>
1155
+        <location filename="../ImportDialog.cpp" line="507"/>
1072 1156
         <location filename="../ProfileInterface.cpp" line="483"/>
1073 1157
         <location filename="../ProfileInterface.cpp" line="527"/>
1074 1158
         <location filename="../ProfileInterface.cpp" line="582"/>
@@ -1105,14 +1189,16 @@ Drücke 1 für Standardmodus</translation>
1105 1189
     </message>
1106 1190
     <message>
1107 1191
         <location filename="../ImageEditorDialog.cpp" line="120"/>
1108
-        <location filename="../ImportDialog.cpp" line="394"/>
1192
+        <location filename="../ImportDialog.cpp" line="283"/>
1193
+        <location filename="../ImportDialog.cpp" line="477"/>
1109 1194
         <location filename="../ProfileInterface.cpp" line="502"/>
1110 1195
         <source>All image files (%1)</source>
1111 1196
         <translation>Alle Bilddateien (%1)</translation>
1112 1197
     </message>
1113 1198
     <message>
1114 1199
         <location filename="../ImageEditorDialog.cpp" line="121"/>
1115
-        <location filename="../ImportDialog.cpp" line="395"/>
1200
+        <location filename="../ImportDialog.cpp" line="284"/>
1201
+        <location filename="../ImportDialog.cpp" line="478"/>
1116 1202
         <location filename="../ProfileInterface.cpp" line="503"/>
1117 1203
         <location filename="../UserInterface.cpp" line="463"/>
1118 1204
         <source>All files (**)</source>
@@ -1147,14 +1233,16 @@ Drücke 1 für Standardmodus</translation>
1147 1233
     </message>
1148 1234
     <message>
1149 1235
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1150
-        <location filename="../ImportDialog.cpp" line="415"/>
1236
+        <location filename="../ImportDialog.cpp" line="304"/>
1237
+        <location filename="../ImportDialog.cpp" line="498"/>
1151 1238
         <location filename="../ProfileInterface.cpp" line="725"/>
1152 1239
         <source>Can&apos;t import %1 because file can&apos;t be open</source>
1153 1240
         <translation>Kann %1 nicht importieren weil die Datei nicht geöffnet werden kann</translation>
1154 1241
     </message>
1155 1242
     <message>
1156 1243
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1157
-        <location filename="../ImportDialog.cpp" line="424"/>
1244
+        <location filename="../ImportDialog.cpp" line="313"/>
1245
+        <location filename="../ImportDialog.cpp" line="507"/>
1158 1246
         <location filename="../ProfileInterface.cpp" line="735"/>
1159 1247
         <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
1160 1248
         <translation>Kann %1 nicht importieren weil die Datei nicht richtig gelesen werden kann</translation>

BIN
res/gta5sync_en_US.qm View File


+ 125
- 37
res/gta5sync_en_US.ts View File

@@ -178,16 +178,31 @@ Pictures and Savegames</source>
178 178
     </message>
179 179
     <message>
180 180
         <location filename="../ImageEditorDialog.ui" line="59"/>
181
+        <source>Import picture</source>
182
+        <translation type="unfinished"></translation>
183
+    </message>
184
+    <message>
185
+        <location filename="../ImageEditorDialog.ui" line="62"/>
181 186
         <source>&amp;Import...</source>
182 187
         <translation></translation>
183 188
     </message>
184 189
     <message>
185
-        <location filename="../ImageEditorDialog.ui" line="79"/>
190
+        <location filename="../ImageEditorDialog.ui" line="82"/>
191
+        <source>Apply changes</source>
192
+        <translation type="unfinished"></translation>
193
+    </message>
194
+    <message>
195
+        <location filename="../ImageEditorDialog.ui" line="85"/>
186 196
         <source>&amp;Overwrite</source>
187 197
         <translation></translation>
188 198
     </message>
189 199
     <message>
190
-        <location filename="../ImageEditorDialog.ui" line="86"/>
200
+        <location filename="../ImageEditorDialog.ui" line="92"/>
201
+        <source>Discard changes</source>
202
+        <translation type="unfinished"></translation>
203
+    </message>
204
+    <message>
205
+        <location filename="../ImageEditorDialog.ui" line="95"/>
191 206
         <source>&amp;Close</source>
192 207
         <translation></translation>
193 208
     </message>
@@ -211,14 +226,19 @@ Pictures and Savegames</source>
211 226
     </message>
212 227
     <message>
213 228
         <location filename="../ImportDialog.ui" line="150"/>
214
-        <location filename="../ImportDialog.cpp" line="82"/>
215
-        <location filename="../ImportDialog.cpp" line="364"/>
229
+        <location filename="../ImportDialog.cpp" line="84"/>
230
+        <location filename="../ImportDialog.cpp" line="447"/>
216 231
         <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
217 232
         <translation>Background Color: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
218 233
     </message>
219 234
     <message>
220 235
         <location filename="../ImportDialog.ui" line="174"/>
221
-        <location filename="../ImportDialog.ui" line="224"/>
236
+        <source>Select background colour</source>
237
+        <translation type="unfinished"></translation>
238
+    </message>
239
+    <message>
240
+        <location filename="../ImportDialog.ui" line="177"/>
241
+        <location filename="../ImportDialog.ui" line="230"/>
222 242
         <source>...</source>
223 243
         <translation></translation>
224 244
     </message>
@@ -234,7 +254,7 @@ Pictures and Savegames</source>
234 254
     </message>
235 255
     <message>
236 256
         <location filename="../ImportDialog.ui" line="111"/>
237
-        <location filename="../ImportDialog.ui" line="269"/>
257
+        <location filename="../ImportDialog.ui" line="278"/>
238 258
         <source>Ignore Aspect Ratio</source>
239 259
         <translation></translation>
240 260
     </message>
@@ -249,79 +269,104 @@ Pictures and Savegames</source>
249 269
         <translation></translation>
250 270
     </message>
251 271
     <message>
252
-        <location filename="../ImportDialog.cpp" line="429"/>
272
+        <location filename="../ImportDialog.cpp" line="512"/>
253 273
         <source>Background Image: %1</source>
254 274
         <translation></translation>
255 275
     </message>
256 276
     <message>
257
-        <location filename="../ImportDialog.ui" line="231"/>
277
+        <location filename="../ImportDialog.ui" line="227"/>
278
+        <source>Select background image</source>
279
+        <translation type="unfinished"></translation>
280
+    </message>
281
+    <message>
282
+        <location filename="../ImportDialog.ui" line="237"/>
283
+        <source>Remove background image</source>
284
+        <translation type="unfinished"></translation>
285
+    </message>
286
+    <message>
287
+        <location filename="../ImportDialog.ui" line="240"/>
258 288
         <source>X</source>
259 289
         <translation></translation>
260 290
     </message>
261 291
     <message>
262
-        <location filename="../ImportDialog.ui" line="259"/>
292
+        <location filename="../ImportDialog.ui" line="268"/>
263 293
         <source>Force Colour in Avatar Zone</source>
264 294
         <translation>Force Color in Avatar Zone</translation>
265 295
     </message>
266 296
     <message>
267
-        <location filename="../ImportDialog.ui" line="315"/>
297
+        <location filename="../ImportDialog.ui" line="305"/>
298
+        <source>Import options</source>
299
+        <translation type="unfinished"></translation>
300
+    </message>
301
+    <message>
302
+        <location filename="../ImportDialog.ui" line="308"/>
303
+        <source>&amp;Options</source>
304
+        <translation type="unfinished"></translation>
305
+    </message>
306
+    <message>
307
+        <location filename="../ImportDialog.ui" line="334"/>
268 308
         <source>Import picture</source>
269 309
         <translation></translation>
270 310
     </message>
271 311
     <message>
272
-        <location filename="../ImportDialog.ui" line="318"/>
312
+        <location filename="../ImportDialog.ui" line="337"/>
273 313
         <source>&amp;OK</source>
274 314
         <translation></translation>
275 315
     </message>
276 316
     <message>
277
-        <location filename="../ImportDialog.ui" line="331"/>
317
+        <location filename="../ImportDialog.ui" line="350"/>
278 318
         <source>Discard picture</source>
279 319
         <translation></translation>
280 320
     </message>
281 321
     <message>
282
-        <location filename="../ImportDialog.ui" line="334"/>
322
+        <location filename="../ImportDialog.ui" line="353"/>
283 323
         <source>&amp;Cancel</source>
284 324
         <translation></translation>
285 325
     </message>
286 326
     <message>
287
-        <location filename="../ImportDialog.ui" line="200"/>
288
-        <location filename="../ImportDialog.cpp" line="83"/>
289
-        <location filename="../ImportDialog.cpp" line="444"/>
327
+        <location filename="../ImportDialog.ui" line="203"/>
328
+        <location filename="../ImportDialog.cpp" line="85"/>
329
+        <location filename="../ImportDialog.cpp" line="527"/>
290 330
         <source>Background Image:</source>
291 331
         <translation></translation>
292 332
     </message>
293 333
     <message>
294
-        <location filename="../ImportDialog.cpp" line="175"/>
334
+        <location filename="../ImportDialog.cpp" line="110"/>
335
+        <source>&amp;Import new Picture...</source>
336
+        <translation type="unfinished"></translation>
337
+    </message>
338
+    <message>
339
+        <location filename="../ImportDialog.cpp" line="183"/>
295 340
         <location filename="../ProfileInterface.cpp" line="668"/>
296 341
         <source>Custom Avatar</source>
297 342
         <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
298 343
         <translation></translation>
299 344
     </message>
300 345
     <message>
301
-        <location filename="../ImportDialog.cpp" line="202"/>
346
+        <location filename="../ImportDialog.cpp" line="210"/>
302 347
         <location filename="../ProfileInterface.cpp" line="687"/>
303 348
         <source>Custom Picture</source>
304 349
         <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
305 350
         <translation></translation>
306 351
     </message>
307 352
     <message>
308
-        <location filename="../ImportDialog.cpp" line="311"/>
353
+        <location filename="../ImportDialog.cpp" line="394"/>
309 354
         <source>Snapmatic Avatar Zone</source>
310 355
         <translation></translation>
311 356
     </message>
312 357
     <message>
313
-        <location filename="../ImportDialog.cpp" line="311"/>
358
+        <location filename="../ImportDialog.cpp" line="394"/>
314 359
         <source>Are you sure to use a square image outside of the Avatar Zone?
315 360
 When you want to use it as Avatar the image will be detached!</source>
316 361
         <translation></translation>
317 362
     </message>
318 363
     <message>
319
-        <location filename="../ImportDialog.cpp" line="360"/>
364
+        <location filename="../ImportDialog.cpp" line="443"/>
320 365
         <source>Select Colour...</source>
321 366
         <translation>Select Color...</translation>
322 367
     </message>
323 368
     <message>
324
-        <location filename="../ImportDialog.cpp" line="429"/>
369
+        <location filename="../ImportDialog.cpp" line="512"/>
325 370
         <source>File</source>
326 371
         <comment>Background Image: File</comment>
327 372
         <translation></translation>
@@ -336,11 +381,21 @@ When you want to use it as Avatar the image will be detached!</source>
336 381
     </message>
337 382
     <message>
338 383
         <location filename="../JsonEditorDialog.ui" line="116"/>
384
+        <source>Apply changes</source>
385
+        <translation type="unfinished"></translation>
386
+    </message>
387
+    <message>
388
+        <location filename="../JsonEditorDialog.ui" line="119"/>
339 389
         <source>&amp;Save</source>
340 390
         <translation></translation>
341 391
     </message>
342 392
     <message>
343
-        <location filename="../JsonEditorDialog.ui" line="129"/>
393
+        <location filename="../JsonEditorDialog.ui" line="132"/>
394
+        <source>Discard changes</source>
395
+        <translation type="unfinished"></translation>
396
+    </message>
397
+    <message>
398
+        <location filename="../JsonEditorDialog.ui" line="135"/>
344 399
         <source>&amp;Close</source>
345 400
         <translation></translation>
346 401
     </message>
@@ -359,26 +414,51 @@ When you want to use it as Avatar the image will be detached!</source>
359 414
     </message>
360 415
     <message>
361 416
         <location filename="../MapLocationDialog.ui" line="138"/>
417
+        <source>Close viewer</source>
418
+        <translation type="unfinished"></translation>
419
+    </message>
420
+    <message>
421
+        <location filename="../MapLocationDialog.ui" line="141"/>
362 422
         <source>&amp;Close</source>
363 423
         <translation></translation>
364 424
     </message>
365 425
     <message>
366
-        <location filename="../MapLocationDialog.ui" line="164"/>
426
+        <location filename="../MapLocationDialog.ui" line="167"/>
427
+        <source>Apply new position</source>
428
+        <translation type="unfinished"></translation>
429
+    </message>
430
+    <message>
431
+        <location filename="../MapLocationDialog.ui" line="170"/>
367 432
         <source>&amp;Apply</source>
368 433
         <translation></translation>
369 434
     </message>
370 435
     <message>
371
-        <location filename="../MapLocationDialog.ui" line="177"/>
436
+        <location filename="../MapLocationDialog.ui" line="183"/>
437
+        <source>Revert old position</source>
438
+        <translation type="unfinished"></translation>
439
+    </message>
440
+    <message>
441
+        <location filename="../MapLocationDialog.ui" line="186"/>
372 442
         <source>&amp;Revert</source>
373 443
         <translation></translation>
374 444
     </message>
375 445
     <message>
376
-        <location filename="../MapLocationDialog.ui" line="190"/>
377
-        <source>&amp;Set</source>
378
-        <translation></translation>
446
+        <location filename="../MapLocationDialog.ui" line="199"/>
447
+        <source>Select new position</source>
448
+        <translation type="unfinished"></translation>
379 449
     </message>
380 450
     <message>
381
-        <location filename="../MapLocationDialog.ui" line="203"/>
451
+        <location filename="../MapLocationDialog.ui" line="202"/>
452
+        <source>&amp;Select</source>
453
+        <translation type="unfinished"></translation>
454
+    </message>
455
+    <message>
456
+        <location filename="../MapLocationDialog.ui" line="215"/>
457
+        <source>Quit select position</source>
458
+        <translation type="unfinished"></translation>
459
+    </message>
460
+    <message>
461
+        <location filename="../MapLocationDialog.ui" line="218"/>
382 462
         <source>&amp;Done</source>
383 463
         <translation></translation>
384 464
     </message>
@@ -1048,7 +1128,8 @@ Press 1 for Default View</source>
1048 1128
     </message>
1049 1129
     <message>
1050 1130
         <location filename="../ImageEditorDialog.cpp" line="109"/>
1051
-        <location filename="../ImportDialog.cpp" line="383"/>
1131
+        <location filename="../ImportDialog.cpp" line="272"/>
1132
+        <location filename="../ImportDialog.cpp" line="466"/>
1052 1133
         <location filename="../ProfileInterface.cpp" line="482"/>
1053 1134
         <location filename="../ProfileInterface.cpp" line="548"/>
1054 1135
         <location filename="../ProfileInterface.cpp" line="857"/>
@@ -1059,9 +1140,12 @@ Press 1 for Default View</source>
1059 1140
         <location filename="../ImageEditorDialog.cpp" line="110"/>
1060 1141
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1061 1142
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1062
-        <location filename="../ImportDialog.cpp" line="384"/>
1063
-        <location filename="../ImportDialog.cpp" line="415"/>
1064
-        <location filename="../ImportDialog.cpp" line="424"/>
1143
+        <location filename="../ImportDialog.cpp" line="273"/>
1144
+        <location filename="../ImportDialog.cpp" line="304"/>
1145
+        <location filename="../ImportDialog.cpp" line="313"/>
1146
+        <location filename="../ImportDialog.cpp" line="467"/>
1147
+        <location filename="../ImportDialog.cpp" line="498"/>
1148
+        <location filename="../ImportDialog.cpp" line="507"/>
1065 1149
         <location filename="../ProfileInterface.cpp" line="483"/>
1066 1150
         <location filename="../ProfileInterface.cpp" line="527"/>
1067 1151
         <location filename="../ProfileInterface.cpp" line="582"/>
@@ -1104,14 +1188,16 @@ Press 1 for Default View</source>
1104 1188
     </message>
1105 1189
     <message>
1106 1190
         <location filename="../ImageEditorDialog.cpp" line="120"/>
1107
-        <location filename="../ImportDialog.cpp" line="394"/>
1191
+        <location filename="../ImportDialog.cpp" line="283"/>
1192
+        <location filename="../ImportDialog.cpp" line="477"/>
1108 1193
         <location filename="../ProfileInterface.cpp" line="502"/>
1109 1194
         <source>All image files (%1)</source>
1110 1195
         <translation></translation>
1111 1196
     </message>
1112 1197
     <message>
1113 1198
         <location filename="../ImageEditorDialog.cpp" line="121"/>
1114
-        <location filename="../ImportDialog.cpp" line="395"/>
1199
+        <location filename="../ImportDialog.cpp" line="284"/>
1200
+        <location filename="../ImportDialog.cpp" line="478"/>
1115 1201
         <location filename="../ProfileInterface.cpp" line="503"/>
1116 1202
         <location filename="../UserInterface.cpp" line="463"/>
1117 1203
         <source>All files (**)</source>
@@ -1151,14 +1237,16 @@ Press 1 for Default View</source>
1151 1237
     </message>
1152 1238
     <message>
1153 1239
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1154
-        <location filename="../ImportDialog.cpp" line="415"/>
1240
+        <location filename="../ImportDialog.cpp" line="304"/>
1241
+        <location filename="../ImportDialog.cpp" line="498"/>
1155 1242
         <location filename="../ProfileInterface.cpp" line="725"/>
1156 1243
         <source>Can&apos;t import %1 because file can&apos;t be open</source>
1157 1244
         <translation></translation>
1158 1245
     </message>
1159 1246
     <message>
1160 1247
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1161
-        <location filename="../ImportDialog.cpp" line="424"/>
1248
+        <location filename="../ImportDialog.cpp" line="313"/>
1249
+        <location filename="../ImportDialog.cpp" line="507"/>
1162 1250
         <location filename="../ProfileInterface.cpp" line="735"/>
1163 1251
         <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
1164 1252
         <translation></translation>

BIN
res/gta5sync_fr.qm View File


+ 125
- 37
res/gta5sync_fr.ts View File

@@ -188,16 +188,31 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation>
188 188
     </message>
189 189
     <message>
190 190
         <location filename="../ImageEditorDialog.ui" line="59"/>
191
+        <source>Import picture</source>
192
+        <translation type="unfinished">Importer l&apos;image</translation>
193
+    </message>
194
+    <message>
195
+        <location filename="../ImageEditorDialog.ui" line="62"/>
191 196
         <source>&amp;Import...</source>
192 197
         <translation>&amp;Importer...</translation>
193 198
     </message>
194 199
     <message>
195
-        <location filename="../ImageEditorDialog.ui" line="79"/>
200
+        <location filename="../ImageEditorDialog.ui" line="82"/>
201
+        <source>Apply changes</source>
202
+        <translation type="unfinished">Appliquer les changements</translation>
203
+    </message>
204
+    <message>
205
+        <location filename="../ImageEditorDialog.ui" line="85"/>
196 206
         <source>&amp;Overwrite</source>
197 207
         <translation>&amp;Remplacer</translation>
198 208
     </message>
199 209
     <message>
200
-        <location filename="../ImageEditorDialog.ui" line="86"/>
210
+        <location filename="../ImageEditorDialog.ui" line="92"/>
211
+        <source>Discard changes</source>
212
+        <translation type="unfinished">Annuler les changements</translation>
213
+    </message>
214
+    <message>
215
+        <location filename="../ImageEditorDialog.ui" line="95"/>
201 216
         <source>&amp;Close</source>
202 217
         <translation>&amp;Fermer</translation>
203 218
     </message>
@@ -221,7 +236,7 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation>
221 236
     </message>
222 237
     <message>
223 238
         <location filename="../ImportDialog.ui" line="111"/>
224
-        <location filename="../ImportDialog.ui" line="269"/>
239
+        <location filename="../ImportDialog.ui" line="278"/>
225 240
         <source>Ignore Aspect Ratio</source>
226 241
         <translation>Déverrouiller le ratio d&apos;aspect</translation>
227 242
     </message>
@@ -247,92 +262,122 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation>
247 262
     </message>
248 263
     <message>
249 264
         <location filename="../ImportDialog.ui" line="150"/>
250
-        <location filename="../ImportDialog.cpp" line="82"/>
251
-        <location filename="../ImportDialog.cpp" line="364"/>
265
+        <location filename="../ImportDialog.cpp" line="84"/>
266
+        <location filename="../ImportDialog.cpp" line="447"/>
252 267
         <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
253 268
         <translation>Couleur de fond : &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
254 269
     </message>
255 270
     <message>
256 271
         <location filename="../ImportDialog.ui" line="174"/>
257
-        <location filename="../ImportDialog.ui" line="224"/>
272
+        <source>Select background colour</source>
273
+        <translation type="unfinished"></translation>
274
+    </message>
275
+    <message>
276
+        <location filename="../ImportDialog.ui" line="177"/>
277
+        <location filename="../ImportDialog.ui" line="230"/>
258 278
         <source>...</source>
259 279
         <translation>...</translation>
260 280
     </message>
261 281
     <message>
262
-        <location filename="../ImportDialog.cpp" line="429"/>
282
+        <location filename="../ImportDialog.ui" line="227"/>
283
+        <source>Select background image</source>
284
+        <translation type="unfinished"></translation>
285
+    </message>
286
+    <message>
287
+        <location filename="../ImportDialog.ui" line="237"/>
288
+        <source>Remove background image</source>
289
+        <translation type="unfinished"></translation>
290
+    </message>
291
+    <message>
292
+        <location filename="../ImportDialog.cpp" line="512"/>
263 293
         <source>Background Image: %1</source>
264 294
         <translation>Image de fond : %1</translation>
265 295
     </message>
266 296
     <message>
267
-        <location filename="../ImportDialog.ui" line="231"/>
297
+        <location filename="../ImportDialog.ui" line="240"/>
268 298
         <source>X</source>
269 299
         <translation>X</translation>
270 300
     </message>
271 301
     <message>
272
-        <location filename="../ImportDialog.ui" line="259"/>
302
+        <location filename="../ImportDialog.ui" line="268"/>
273 303
         <source>Force Colour in Avatar Zone</source>
274 304
         <translation>Forcer la couleur dans la Zone d&apos;Avatar</translation>
275 305
     </message>
276 306
     <message>
277
-        <location filename="../ImportDialog.ui" line="315"/>
307
+        <location filename="../ImportDialog.ui" line="305"/>
308
+        <source>Import options</source>
309
+        <translation type="unfinished"></translation>
310
+    </message>
311
+    <message>
312
+        <location filename="../ImportDialog.ui" line="308"/>
313
+        <source>&amp;Options</source>
314
+        <translation type="unfinished"></translation>
315
+    </message>
316
+    <message>
317
+        <location filename="../ImportDialog.ui" line="334"/>
278 318
         <source>Import picture</source>
279 319
         <translation>Importer l&apos;image</translation>
280 320
     </message>
281 321
     <message>
282
-        <location filename="../ImportDialog.ui" line="318"/>
322
+        <location filename="../ImportDialog.ui" line="337"/>
283 323
         <source>&amp;OK</source>
284 324
         <translation>&amp;OK</translation>
285 325
     </message>
286 326
     <message>
287
-        <location filename="../ImportDialog.ui" line="331"/>
327
+        <location filename="../ImportDialog.ui" line="350"/>
288 328
         <source>Discard picture</source>
289 329
         <translation>Supprimer l&apos;image</translation>
290 330
     </message>
291 331
     <message>
292
-        <location filename="../ImportDialog.ui" line="334"/>
332
+        <location filename="../ImportDialog.ui" line="353"/>
293 333
         <source>&amp;Cancel</source>
294 334
         <translation>A&amp;nnuler</translation>
295 335
     </message>
296 336
     <message>
297
-        <location filename="../ImportDialog.ui" line="200"/>
298
-        <location filename="../ImportDialog.cpp" line="83"/>
299
-        <location filename="../ImportDialog.cpp" line="444"/>
337
+        <location filename="../ImportDialog.ui" line="203"/>
338
+        <location filename="../ImportDialog.cpp" line="85"/>
339
+        <location filename="../ImportDialog.cpp" line="527"/>
300 340
         <source>Background Image:</source>
301 341
         <translation>Image de fond :</translation>
302 342
     </message>
303 343
     <message>
304
-        <location filename="../ImportDialog.cpp" line="175"/>
344
+        <location filename="../ImportDialog.cpp" line="110"/>
345
+        <source>&amp;Import new Picture...</source>
346
+        <translation type="unfinished"></translation>
347
+    </message>
348
+    <message>
349
+        <location filename="../ImportDialog.cpp" line="183"/>
305 350
         <location filename="../ProfileInterface.cpp" line="668"/>
306 351
         <source>Custom Avatar</source>
307 352
         <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
308 353
         <translation>Avatar personnalisé</translation>
309 354
     </message>
310 355
     <message>
311
-        <location filename="../ImportDialog.cpp" line="202"/>
356
+        <location filename="../ImportDialog.cpp" line="210"/>
312 357
         <location filename="../ProfileInterface.cpp" line="687"/>
313 358
         <source>Custom Picture</source>
314 359
         <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
315 360
         <translation>Image personnalisé</translation>
316 361
     </message>
317 362
     <message>
318
-        <location filename="../ImportDialog.cpp" line="311"/>
363
+        <location filename="../ImportDialog.cpp" line="394"/>
319 364
         <source>Are you sure to use a square image outside of the Avatar Zone?
320 365
 When you want to use it as Avatar the image will be detached!</source>
321 366
         <translation>Êtes-vous sûr d&apos;utiliser une image carrée en dehors de la Zone d&apos;Avatar ?
322 367
 Si vous l&apos;utilisez comme Avatar, l&apos;image sera détachée !</translation>
323 368
     </message>
324 369
     <message>
325
-        <location filename="../ImportDialog.cpp" line="311"/>
370
+        <location filename="../ImportDialog.cpp" line="394"/>
326 371
         <source>Snapmatic Avatar Zone</source>
327 372
         <translation>Zone d&apos;Avatar Snapmatic</translation>
328 373
     </message>
329 374
     <message>
330
-        <location filename="../ImportDialog.cpp" line="360"/>
375
+        <location filename="../ImportDialog.cpp" line="443"/>
331 376
         <source>Select Colour...</source>
332 377
         <translation>Choisir une couleur...</translation>
333 378
     </message>
334 379
     <message>
335
-        <location filename="../ImportDialog.cpp" line="429"/>
380
+        <location filename="../ImportDialog.cpp" line="512"/>
336 381
         <source>File</source>
337 382
         <comment>Background Image: File</comment>
338 383
         <translation>Fichier</translation>
@@ -347,11 +392,21 @@ Si vous l&apos;utilisez comme Avatar, l&apos;image sera détachée !</translatio
347 392
     </message>
348 393
     <message>
349 394
         <location filename="../JsonEditorDialog.ui" line="116"/>
395
+        <source>Apply changes</source>
396
+        <translation type="unfinished">Appliquer les changements</translation>
397
+    </message>
398
+    <message>
399
+        <location filename="../JsonEditorDialog.ui" line="119"/>
350 400
         <source>&amp;Save</source>
351 401
         <translation>&amp;Sauvegarder</translation>
352 402
     </message>
353 403
     <message>
354
-        <location filename="../JsonEditorDialog.ui" line="129"/>
404
+        <location filename="../JsonEditorDialog.ui" line="132"/>
405
+        <source>Discard changes</source>
406
+        <translation type="unfinished">Annuler les changements</translation>
407
+    </message>
408
+    <message>
409
+        <location filename="../JsonEditorDialog.ui" line="135"/>
355 410
         <source>&amp;Close</source>
356 411
         <translation>&amp;Fermer</translation>
357 412
     </message>
@@ -370,26 +425,51 @@ Si vous l&apos;utilisez comme Avatar, l&apos;image sera détachée !</translatio
370 425
     </message>
371 426
     <message>
372 427
         <location filename="../MapLocationDialog.ui" line="138"/>
428
+        <source>Close viewer</source>
429
+        <translation type="unfinished">Fermer la visionneuse</translation>
430
+    </message>
431
+    <message>
432
+        <location filename="../MapLocationDialog.ui" line="141"/>
373 433
         <source>&amp;Close</source>
374 434
         <translation>&amp;Fermer</translation>
375 435
     </message>
376 436
     <message>
377
-        <location filename="../MapLocationDialog.ui" line="164"/>
437
+        <location filename="../MapLocationDialog.ui" line="167"/>
438
+        <source>Apply new position</source>
439
+        <translation type="unfinished"></translation>
440
+    </message>
441
+    <message>
442
+        <location filename="../MapLocationDialog.ui" line="170"/>
378 443
         <source>&amp;Apply</source>
379 444
         <translation>&amp;Appliquer</translation>
380 445
     </message>
381 446
     <message>
382
-        <location filename="../MapLocationDialog.ui" line="177"/>
447
+        <location filename="../MapLocationDialog.ui" line="183"/>
448
+        <source>Revert old position</source>
449
+        <translation type="unfinished"></translation>
450
+    </message>
451
+    <message>
452
+        <location filename="../MapLocationDialog.ui" line="186"/>
383 453
         <source>&amp;Revert</source>
384 454
         <translation>&amp;Revenir</translation>
385 455
     </message>
386 456
     <message>
387
-        <location filename="../MapLocationDialog.ui" line="190"/>
388
-        <source>&amp;Set</source>
389
-        <translation>&amp;Définir</translation>
457
+        <location filename="../MapLocationDialog.ui" line="199"/>
458
+        <source>Select new position</source>
459
+        <translation type="unfinished"></translation>
390 460
     </message>
391 461
     <message>
392
-        <location filename="../MapLocationDialog.ui" line="203"/>
462
+        <location filename="../MapLocationDialog.ui" line="202"/>
463
+        <source>&amp;Select</source>
464
+        <translation type="unfinished">&amp;Sélectionner</translation>
465
+    </message>
466
+    <message>
467
+        <location filename="../MapLocationDialog.ui" line="215"/>
468
+        <source>Quit select position</source>
469
+        <translation type="unfinished"></translation>
470
+    </message>
471
+    <message>
472
+        <location filename="../MapLocationDialog.ui" line="218"/>
393 473
         <source>&amp;Done</source>
394 474
         <translation>&amp;Terminer</translation>
395 475
     </message>
@@ -1066,7 +1146,8 @@ Appuyer sur 1 pour le mode par défaut</translation>
1066 1146
     </message>
1067 1147
     <message>
1068 1148
         <location filename="../ImageEditorDialog.cpp" line="109"/>
1069
-        <location filename="../ImportDialog.cpp" line="383"/>
1149
+        <location filename="../ImportDialog.cpp" line="272"/>
1150
+        <location filename="../ImportDialog.cpp" line="466"/>
1070 1151
         <location filename="../ProfileInterface.cpp" line="482"/>
1071 1152
         <location filename="../ProfileInterface.cpp" line="548"/>
1072 1153
         <location filename="../ProfileInterface.cpp" line="857"/>
@@ -1077,9 +1158,12 @@ Appuyer sur 1 pour le mode par défaut</translation>
1077 1158
         <location filename="../ImageEditorDialog.cpp" line="110"/>
1078 1159
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1079 1160
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1080
-        <location filename="../ImportDialog.cpp" line="384"/>
1081
-        <location filename="../ImportDialog.cpp" line="415"/>
1082
-        <location filename="../ImportDialog.cpp" line="424"/>
1161
+        <location filename="../ImportDialog.cpp" line="273"/>
1162
+        <location filename="../ImportDialog.cpp" line="304"/>
1163
+        <location filename="../ImportDialog.cpp" line="313"/>
1164
+        <location filename="../ImportDialog.cpp" line="467"/>
1165
+        <location filename="../ImportDialog.cpp" line="498"/>
1166
+        <location filename="../ImportDialog.cpp" line="507"/>
1083 1167
         <location filename="../ProfileInterface.cpp" line="483"/>
1084 1168
         <location filename="../ProfileInterface.cpp" line="527"/>
1085 1169
         <location filename="../ProfileInterface.cpp" line="582"/>
@@ -1111,14 +1195,16 @@ Appuyer sur 1 pour le mode par défaut</translation>
1111 1195
     </message>
1112 1196
     <message>
1113 1197
         <location filename="../ImageEditorDialog.cpp" line="120"/>
1114
-        <location filename="../ImportDialog.cpp" line="394"/>
1198
+        <location filename="../ImportDialog.cpp" line="283"/>
1199
+        <location filename="../ImportDialog.cpp" line="477"/>
1115 1200
         <location filename="../ProfileInterface.cpp" line="502"/>
1116 1201
         <source>All image files (%1)</source>
1117 1202
         <translation>Toutes les images (%1)</translation>
1118 1203
     </message>
1119 1204
     <message>
1120 1205
         <location filename="../ImageEditorDialog.cpp" line="121"/>
1121
-        <location filename="../ImportDialog.cpp" line="395"/>
1206
+        <location filename="../ImportDialog.cpp" line="284"/>
1207
+        <location filename="../ImportDialog.cpp" line="478"/>
1122 1208
         <location filename="../ProfileInterface.cpp" line="503"/>
1123 1209
         <location filename="../UserInterface.cpp" line="463"/>
1124 1210
         <source>All files (**)</source>
@@ -1165,14 +1251,16 @@ Appuyer sur 1 pour le mode par défaut</translation>
1165 1251
     </message>
1166 1252
     <message>
1167 1253
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1168
-        <location filename="../ImportDialog.cpp" line="415"/>
1254
+        <location filename="../ImportDialog.cpp" line="304"/>
1255
+        <location filename="../ImportDialog.cpp" line="498"/>
1169 1256
         <location filename="../ProfileInterface.cpp" line="725"/>
1170 1257
         <source>Can&apos;t import %1 because file can&apos;t be open</source>
1171 1258
         <translation>Impossible d&apos;importer %1, le fichier ne peut pas être ouvert</translation>
1172 1259
     </message>
1173 1260
     <message>
1174 1261
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1175
-        <location filename="../ImportDialog.cpp" line="424"/>
1262
+        <location filename="../ImportDialog.cpp" line="313"/>
1263
+        <location filename="../ImportDialog.cpp" line="507"/>
1176 1264
         <location filename="../ProfileInterface.cpp" line="735"/>
1177 1265
         <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
1178 1266
         <translation>Impossible d&apos;importer %1, le fichier ne peut pas être parsé correctement</translation>

BIN
res/gta5sync_ru.qm View File


+ 125
- 37
res/gta5sync_ru.ts View File

@@ -190,16 +190,31 @@ Pictures and Savegames</source>
190 190
     </message>
191 191
     <message>
192 192
         <location filename="../ImageEditorDialog.ui" line="59"/>
193
+        <source>Import picture</source>
194
+        <translation type="unfinished">Импортировать картинку</translation>
195
+    </message>
196
+    <message>
197
+        <location filename="../ImageEditorDialog.ui" line="62"/>
193 198
         <source>&amp;Import...</source>
194 199
         <translation>&amp;Импортировать...</translation>
195 200
     </message>
196 201
     <message>
197
-        <location filename="../ImageEditorDialog.ui" line="79"/>
202
+        <location filename="../ImageEditorDialog.ui" line="82"/>
203
+        <source>Apply changes</source>
204
+        <translation type="unfinished">Применить изменения</translation>
205
+    </message>
206
+    <message>
207
+        <location filename="../ImageEditorDialog.ui" line="85"/>
198 208
         <source>&amp;Overwrite</source>
199 209
         <translation>&amp;Перезаписать</translation>
200 210
     </message>
201 211
     <message>
202
-        <location filename="../ImageEditorDialog.ui" line="86"/>
212
+        <location filename="../ImageEditorDialog.ui" line="92"/>
213
+        <source>Discard changes</source>
214
+        <translation type="unfinished">Отвергнуть изменения</translation>
215
+    </message>
216
+    <message>
217
+        <location filename="../ImageEditorDialog.ui" line="95"/>
203 218
         <source>&amp;Close</source>
204 219
         <translation>&amp;Закрыть</translation>
205 220
     </message>
@@ -223,7 +238,7 @@ Pictures and Savegames</source>
223 238
     </message>
224 239
     <message>
225 240
         <location filename="../ImportDialog.ui" line="111"/>
226
-        <location filename="../ImportDialog.ui" line="269"/>
241
+        <location filename="../ImportDialog.ui" line="278"/>
227 242
         <source>Ignore Aspect Ratio</source>
228 243
         <translation>Игнорировать соотн. сторон</translation>
229 244
     </message>
@@ -249,93 +264,123 @@ Pictures and Savegames</source>
249 264
     </message>
250 265
     <message>
251 266
         <location filename="../ImportDialog.ui" line="150"/>
252
-        <location filename="../ImportDialog.cpp" line="82"/>
253
-        <location filename="../ImportDialog.cpp" line="364"/>
267
+        <location filename="../ImportDialog.cpp" line="84"/>
268
+        <location filename="../ImportDialog.cpp" line="447"/>
254 269
         <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
255 270
         <translation>Цвет фона: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
256 271
     </message>
257 272
     <message>
258 273
         <location filename="../ImportDialog.ui" line="174"/>
259
-        <location filename="../ImportDialog.ui" line="224"/>
274
+        <source>Select background colour</source>
275
+        <translation type="unfinished"></translation>
276
+    </message>
277
+    <message>
278
+        <location filename="../ImportDialog.ui" line="177"/>
279
+        <location filename="../ImportDialog.ui" line="230"/>
260 280
         <source>...</source>
261 281
         <translation>...</translation>
262 282
     </message>
263 283
     <message>
264
-        <location filename="../ImportDialog.cpp" line="429"/>
284
+        <location filename="../ImportDialog.ui" line="227"/>
285
+        <source>Select background image</source>
286
+        <translation type="unfinished"></translation>
287
+    </message>
288
+    <message>
289
+        <location filename="../ImportDialog.ui" line="237"/>
290
+        <source>Remove background image</source>
291
+        <translation type="unfinished"></translation>
292
+    </message>
293
+    <message>
294
+        <location filename="../ImportDialog.cpp" line="512"/>
265 295
         <source>Background Image: %1</source>
266 296
         <translation>Фоновая картинка: %1</translation>
267 297
     </message>
268 298
     <message>
269
-        <location filename="../ImportDialog.ui" line="231"/>
299
+        <location filename="../ImportDialog.ui" line="240"/>
270 300
         <source>X</source>
271 301
         <translatorcomment>latin X</translatorcomment>
272 302
         <translation>X</translation>
273 303
     </message>
274 304
     <message>
275
-        <location filename="../ImportDialog.ui" line="259"/>
305
+        <location filename="../ImportDialog.ui" line="268"/>
276 306
         <source>Force Colour in Avatar Zone</source>
277 307
         <translation>Задать цвет в зоне аватарки</translation>
278 308
     </message>
279 309
     <message>
280
-        <location filename="../ImportDialog.ui" line="315"/>
310
+        <location filename="../ImportDialog.ui" line="305"/>
311
+        <source>Import options</source>
312
+        <translation type="unfinished"></translation>
313
+    </message>
314
+    <message>
315
+        <location filename="../ImportDialog.ui" line="308"/>
316
+        <source>&amp;Options</source>
317
+        <translation type="unfinished"></translation>
318
+    </message>
319
+    <message>
320
+        <location filename="../ImportDialog.ui" line="334"/>
281 321
         <source>Import picture</source>
282 322
         <translation>Импортировать картинку</translation>
283 323
     </message>
284 324
     <message>
285
-        <location filename="../ImportDialog.ui" line="318"/>
325
+        <location filename="../ImportDialog.ui" line="337"/>
286 326
         <source>&amp;OK</source>
287 327
         <translation>&amp;ОК</translation>
288 328
     </message>
289 329
     <message>
290
-        <location filename="../ImportDialog.ui" line="331"/>
330
+        <location filename="../ImportDialog.ui" line="350"/>
291 331
         <source>Discard picture</source>
292 332
         <translation>Отклонить картинку</translation>
293 333
     </message>
294 334
     <message>
295
-        <location filename="../ImportDialog.ui" line="334"/>
335
+        <location filename="../ImportDialog.ui" line="353"/>
296 336
         <source>&amp;Cancel</source>
297 337
         <translatorcomment>Я не уверен насчет горячих клавиш...</translatorcomment>
298 338
         <translation>От&amp;мена</translation>
299 339
     </message>
300 340
     <message>
301
-        <location filename="../ImportDialog.ui" line="200"/>
302
-        <location filename="../ImportDialog.cpp" line="83"/>
303
-        <location filename="../ImportDialog.cpp" line="444"/>
341
+        <location filename="../ImportDialog.ui" line="203"/>
342
+        <location filename="../ImportDialog.cpp" line="85"/>
343
+        <location filename="../ImportDialog.cpp" line="527"/>
304 344
         <source>Background Image:</source>
305 345
         <translation>Фоновая картинка:</translation>
306 346
     </message>
307 347
     <message>
308
-        <location filename="../ImportDialog.cpp" line="175"/>
348
+        <location filename="../ImportDialog.cpp" line="110"/>
349
+        <source>&amp;Import new Picture...</source>
350
+        <translation type="unfinished"></translation>
351
+    </message>
352
+    <message>
353
+        <location filename="../ImportDialog.cpp" line="183"/>
309 354
         <location filename="../ProfileInterface.cpp" line="668"/>
310 355
         <source>Custom Avatar</source>
311 356
         <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
312 357
         <translation>Свой Аватар</translation>
313 358
     </message>
314 359
     <message>
315
-        <location filename="../ImportDialog.cpp" line="202"/>
360
+        <location filename="../ImportDialog.cpp" line="210"/>
316 361
         <location filename="../ProfileInterface.cpp" line="687"/>
317 362
         <source>Custom Picture</source>
318 363
         <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
319 364
         <translation>Своя Картинка</translation>
320 365
     </message>
321 366
     <message>
322
-        <location filename="../ImportDialog.cpp" line="311"/>
367
+        <location filename="../ImportDialog.cpp" line="394"/>
323 368
         <source>Are you sure to use a square image outside of the Avatar Zone?
324 369
 When you want to use it as Avatar the image will be detached!</source>
325 370
         <translation>Ты точно хочешь использовать квадратное изображение вне зоны аватарки? Если это аватар, то изображение будет обрезано!</translation>
326 371
     </message>
327 372
     <message>
328
-        <location filename="../ImportDialog.cpp" line="311"/>
373
+        <location filename="../ImportDialog.cpp" line="394"/>
329 374
         <source>Snapmatic Avatar Zone</source>
330 375
         <translation>Зона Snapmatic Аватарки</translation>
331 376
     </message>
332 377
     <message>
333
-        <location filename="../ImportDialog.cpp" line="360"/>
378
+        <location filename="../ImportDialog.cpp" line="443"/>
334 379
         <source>Select Colour...</source>
335 380
         <translation>Выбрать цвет...</translation>
336 381
     </message>
337 382
     <message>
338
-        <location filename="../ImportDialog.cpp" line="429"/>
383
+        <location filename="../ImportDialog.cpp" line="512"/>
339 384
         <source>File</source>
340 385
         <comment>Background Image: File</comment>
341 386
         <translation>Файл</translation>
@@ -350,11 +395,21 @@ When you want to use it as Avatar the image will be detached!</source>
350 395
     </message>
351 396
     <message>
352 397
         <location filename="../JsonEditorDialog.ui" line="116"/>
398
+        <source>Apply changes</source>
399
+        <translation type="unfinished">Применить изменения</translation>
400
+    </message>
401
+    <message>
402
+        <location filename="../JsonEditorDialog.ui" line="119"/>
353 403
         <source>&amp;Save</source>
354 404
         <translation>&amp;Сохранить</translation>
355 405
     </message>
356 406
     <message>
357
-        <location filename="../JsonEditorDialog.ui" line="129"/>
407
+        <location filename="../JsonEditorDialog.ui" line="132"/>
408
+        <source>Discard changes</source>
409
+        <translation type="unfinished">Отвергнуть изменения</translation>
410
+    </message>
411
+    <message>
412
+        <location filename="../JsonEditorDialog.ui" line="135"/>
358 413
         <source>&amp;Close</source>
359 414
         <translation>&amp;Закрыть</translation>
360 415
     </message>
@@ -373,26 +428,51 @@ When you want to use it as Avatar the image will be detached!</source>
373 428
     </message>
374 429
     <message>
375 430
         <location filename="../MapLocationDialog.ui" line="138"/>
431
+        <source>Close viewer</source>
432
+        <translation type="unfinished">Закрыть просмотрщик</translation>
433
+    </message>
434
+    <message>
435
+        <location filename="../MapLocationDialog.ui" line="141"/>
376 436
         <source>&amp;Close</source>
377 437
         <translation>&amp;Закрыть</translation>
378 438
     </message>
379 439
     <message>
380
-        <location filename="../MapLocationDialog.ui" line="164"/>
440
+        <location filename="../MapLocationDialog.ui" line="167"/>
441
+        <source>Apply new position</source>
442
+        <translation type="unfinished"></translation>
443
+    </message>
444
+    <message>
445
+        <location filename="../MapLocationDialog.ui" line="170"/>
381 446
         <source>&amp;Apply</source>
382 447
         <translation>&amp;Применить</translation>
383 448
     </message>
384 449
     <message>
385
-        <location filename="../MapLocationDialog.ui" line="177"/>
450
+        <location filename="../MapLocationDialog.ui" line="183"/>
451
+        <source>Revert old position</source>
452
+        <translation type="unfinished"></translation>
453
+    </message>
454
+    <message>
455
+        <location filename="../MapLocationDialog.ui" line="186"/>
386 456
         <source>&amp;Revert</source>
387 457
         <translation>&amp;Откатить</translation>
388 458
     </message>
389 459
     <message>
390
-        <location filename="../MapLocationDialog.ui" line="190"/>
391
-        <source>&amp;Set</source>
392
-        <translation>&amp;Изменить</translation>
460
+        <location filename="../MapLocationDialog.ui" line="199"/>
461
+        <source>Select new position</source>
462
+        <translation type="unfinished"></translation>
393 463
     </message>
394 464
     <message>
395
-        <location filename="../MapLocationDialog.ui" line="203"/>
465
+        <location filename="../MapLocationDialog.ui" line="202"/>
466
+        <source>&amp;Select</source>
467
+        <translation type="unfinished"></translation>
468
+    </message>
469
+    <message>
470
+        <location filename="../MapLocationDialog.ui" line="215"/>
471
+        <source>Quit select position</source>
472
+        <translation type="unfinished"></translation>
473
+    </message>
474
+    <message>
475
+        <location filename="../MapLocationDialog.ui" line="218"/>
396 476
         <source>&amp;Done</source>
397 477
         <translation>&amp;Готово</translation>
398 478
     </message>
@@ -1060,7 +1140,8 @@ Press 1 for Default View</source>
1060 1140
     </message>
1061 1141
     <message>
1062 1142
         <location filename="../ImageEditorDialog.cpp" line="109"/>
1063
-        <location filename="../ImportDialog.cpp" line="383"/>
1143
+        <location filename="../ImportDialog.cpp" line="272"/>
1144
+        <location filename="../ImportDialog.cpp" line="466"/>
1064 1145
         <location filename="../ProfileInterface.cpp" line="482"/>
1065 1146
         <location filename="../ProfileInterface.cpp" line="548"/>
1066 1147
         <location filename="../ProfileInterface.cpp" line="857"/>
@@ -1071,9 +1152,12 @@ Press 1 for Default View</source>
1071 1152
         <location filename="../ImageEditorDialog.cpp" line="110"/>
1072 1153
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1073 1154
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1074
-        <location filename="../ImportDialog.cpp" line="384"/>
1075
-        <location filename="../ImportDialog.cpp" line="415"/>
1076
-        <location filename="../ImportDialog.cpp" line="424"/>
1155
+        <location filename="../ImportDialog.cpp" line="273"/>
1156
+        <location filename="../ImportDialog.cpp" line="304"/>
1157
+        <location filename="../ImportDialog.cpp" line="313"/>
1158
+        <location filename="../ImportDialog.cpp" line="467"/>
1159
+        <location filename="../ImportDialog.cpp" line="498"/>
1160
+        <location filename="../ImportDialog.cpp" line="507"/>
1077 1161
         <location filename="../ProfileInterface.cpp" line="483"/>
1078 1162
         <location filename="../ProfileInterface.cpp" line="527"/>
1079 1163
         <location filename="../ProfileInterface.cpp" line="582"/>
@@ -1105,7 +1189,8 @@ Press 1 for Default View</source>
1105 1189
     </message>
1106 1190
     <message>
1107 1191
         <location filename="../ImageEditorDialog.cpp" line="121"/>
1108
-        <location filename="../ImportDialog.cpp" line="395"/>
1192
+        <location filename="../ImportDialog.cpp" line="284"/>
1193
+        <location filename="../ImportDialog.cpp" line="478"/>
1109 1194
         <location filename="../ProfileInterface.cpp" line="503"/>
1110 1195
         <location filename="../UserInterface.cpp" line="463"/>
1111 1196
         <source>All files (**)</source>
@@ -1157,21 +1242,24 @@ Press 1 for Default View</source>
1157 1242
     </message>
1158 1243
     <message>
1159 1244
         <location filename="../ImageEditorDialog.cpp" line="120"/>
1160
-        <location filename="../ImportDialog.cpp" line="394"/>
1245
+        <location filename="../ImportDialog.cpp" line="283"/>
1246
+        <location filename="../ImportDialog.cpp" line="477"/>
1161 1247
         <location filename="../ProfileInterface.cpp" line="502"/>
1162 1248
         <source>All image files (%1)</source>
1163 1249
         <translation>Все файлы изображений (%1)</translation>
1164 1250
     </message>
1165 1251
     <message>
1166 1252
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1167
-        <location filename="../ImportDialog.cpp" line="415"/>
1253
+        <location filename="../ImportDialog.cpp" line="304"/>
1254
+        <location filename="../ImportDialog.cpp" line="498"/>
1168 1255
         <location filename="../ProfileInterface.cpp" line="725"/>
1169 1256
         <source>Can&apos;t import %1 because file can&apos;t be open</source>
1170 1257
         <translation>Не удалось открыть %1, файл не может быть открыт</translation>
1171 1258
     </message>
1172 1259
     <message>
1173 1260
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1174
-        <location filename="../ImportDialog.cpp" line="424"/>
1261
+        <location filename="../ImportDialog.cpp" line="313"/>
1262
+        <location filename="../ImportDialog.cpp" line="507"/>
1175 1263
         <location filename="../ProfileInterface.cpp" line="735"/>
1176 1264
         <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
1177 1265
         <translation>Не получилось импортировать %1, файл не может быть правильно обработан</translation>

BIN
res/gta5sync_uk.qm View File


+ 125
- 37
res/gta5sync_uk.ts View File

@@ -182,16 +182,31 @@ Pictures and Savegames</source>
182 182
     </message>
183 183
     <message>
184 184
         <location filename="../ImageEditorDialog.ui" line="59"/>
185
+        <source>Import picture</source>
186
+        <translation type="unfinished">Імпортувати зображення</translation>
187
+    </message>
188
+    <message>
189
+        <location filename="../ImageEditorDialog.ui" line="62"/>
185 190
         <source>&amp;Import...</source>
186 191
         <translation>&amp;Імпорт...</translation>
187 192
     </message>
188 193
     <message>
189
-        <location filename="../ImageEditorDialog.ui" line="79"/>
194
+        <location filename="../ImageEditorDialog.ui" line="82"/>
195
+        <source>Apply changes</source>
196
+        <translation type="unfinished">Застосувати зміни</translation>
197
+    </message>
198
+    <message>
199
+        <location filename="../ImageEditorDialog.ui" line="85"/>
190 200
         <source>&amp;Overwrite</source>
191 201
         <translation>&amp;Перезаписати</translation>
192 202
     </message>
193 203
     <message>
194
-        <location filename="../ImageEditorDialog.ui" line="86"/>
204
+        <location filename="../ImageEditorDialog.ui" line="92"/>
205
+        <source>Discard changes</source>
206
+        <translation type="unfinished">Скасувати зміни</translation>
207
+    </message>
208
+    <message>
209
+        <location filename="../ImageEditorDialog.ui" line="95"/>
195 210
         <source>&amp;Close</source>
196 211
         <translation>&amp;Закрити</translation>
197 212
     </message>
@@ -231,7 +246,7 @@ Pictures and Savegames</source>
231 246
     </message>
232 247
     <message>
233 248
         <location filename="../ImportDialog.ui" line="111"/>
234
-        <location filename="../ImportDialog.ui" line="269"/>
249
+        <location filename="../ImportDialog.ui" line="278"/>
235 250
         <source>Ignore Aspect Ratio</source>
236 251
         <translation>Ігнорувати співвідношення сторін</translation>
237 252
     </message>
@@ -247,92 +262,122 @@ Pictures and Savegames</source>
247 262
     </message>
248 263
     <message>
249 264
         <location filename="../ImportDialog.ui" line="150"/>
250
-        <location filename="../ImportDialog.cpp" line="82"/>
251
-        <location filename="../ImportDialog.cpp" line="364"/>
265
+        <location filename="../ImportDialog.cpp" line="84"/>
266
+        <location filename="../ImportDialog.cpp" line="447"/>
252 267
         <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
253 268
         <translation>Фоновий колір: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
254 269
     </message>
255 270
     <message>
256 271
         <location filename="../ImportDialog.ui" line="174"/>
257
-        <location filename="../ImportDialog.ui" line="224"/>
272
+        <source>Select background colour</source>
273
+        <translation type="unfinished"></translation>
274
+    </message>
275
+    <message>
276
+        <location filename="../ImportDialog.ui" line="177"/>
277
+        <location filename="../ImportDialog.ui" line="230"/>
258 278
         <source>...</source>
259 279
         <translation>...</translation>
260 280
     </message>
261 281
     <message>
262
-        <location filename="../ImportDialog.ui" line="200"/>
263
-        <location filename="../ImportDialog.cpp" line="83"/>
264
-        <location filename="../ImportDialog.cpp" line="444"/>
282
+        <location filename="../ImportDialog.ui" line="203"/>
283
+        <location filename="../ImportDialog.cpp" line="85"/>
284
+        <location filename="../ImportDialog.cpp" line="527"/>
265 285
         <source>Background Image:</source>
266 286
         <translation>Фонове зображення:</translation>
267 287
     </message>
268 288
     <message>
269
-        <location filename="../ImportDialog.ui" line="231"/>
289
+        <location filename="../ImportDialog.ui" line="227"/>
290
+        <source>Select background image</source>
291
+        <translation type="unfinished"></translation>
292
+    </message>
293
+    <message>
294
+        <location filename="../ImportDialog.ui" line="237"/>
295
+        <source>Remove background image</source>
296
+        <translation type="unfinished"></translation>
297
+    </message>
298
+    <message>
299
+        <location filename="../ImportDialog.ui" line="240"/>
270 300
         <source>X</source>
271 301
         <translation>Х</translation>
272 302
     </message>
273 303
     <message>
274
-        <location filename="../ImportDialog.ui" line="259"/>
304
+        <location filename="../ImportDialog.ui" line="268"/>
275 305
         <source>Force Colour in Avatar Zone</source>
276 306
         <translation>Примусовий колір в зоні Аватару</translation>
277 307
     </message>
278 308
     <message>
279
-        <location filename="../ImportDialog.ui" line="315"/>
309
+        <location filename="../ImportDialog.ui" line="305"/>
310
+        <source>Import options</source>
311
+        <translation type="unfinished"></translation>
312
+    </message>
313
+    <message>
314
+        <location filename="../ImportDialog.ui" line="308"/>
315
+        <source>&amp;Options</source>
316
+        <translation type="unfinished"></translation>
317
+    </message>
318
+    <message>
319
+        <location filename="../ImportDialog.ui" line="334"/>
280 320
         <source>Import picture</source>
281 321
         <translation>Імпортувати зображення</translation>
282 322
     </message>
283 323
     <message>
284
-        <location filename="../ImportDialog.ui" line="318"/>
324
+        <location filename="../ImportDialog.ui" line="337"/>
285 325
         <source>&amp;OK</source>
286 326
         <translation>&amp;OK</translation>
287 327
     </message>
288 328
     <message>
289
-        <location filename="../ImportDialog.ui" line="331"/>
329
+        <location filename="../ImportDialog.ui" line="350"/>
290 330
         <source>Discard picture</source>
291 331
         <translation>Відхилити зображення</translation>
292 332
     </message>
293 333
     <message>
294
-        <location filename="../ImportDialog.ui" line="334"/>
334
+        <location filename="../ImportDialog.ui" line="353"/>
295 335
         <source>&amp;Cancel</source>
296 336
         <translation>&amp;Скасувати</translation>
297 337
     </message>
298 338
     <message>
299
-        <location filename="../ImportDialog.cpp" line="175"/>
339
+        <location filename="../ImportDialog.cpp" line="110"/>
340
+        <source>&amp;Import new Picture...</source>
341
+        <translation type="unfinished"></translation>
342
+    </message>
343
+    <message>
344
+        <location filename="../ImportDialog.cpp" line="183"/>
300 345
         <location filename="../ProfileInterface.cpp" line="668"/>
301 346
         <source>Custom Avatar</source>
302 347
         <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
303 348
         <translation>Користувацький Аватар</translation>
304 349
     </message>
305 350
     <message>
306
-        <location filename="../ImportDialog.cpp" line="202"/>
351
+        <location filename="../ImportDialog.cpp" line="210"/>
307 352
         <location filename="../ProfileInterface.cpp" line="687"/>
308 353
         <source>Custom Picture</source>
309 354
         <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
310 355
         <translation>Користувацьке Зображення</translation>
311 356
     </message>
312 357
     <message>
313
-        <location filename="../ImportDialog.cpp" line="311"/>
358
+        <location filename="../ImportDialog.cpp" line="394"/>
314 359
         <source>Snapmatic Avatar Zone</source>
315 360
         <translation>Зона Snapmatic Аватару</translation>
316 361
     </message>
317 362
     <message>
318
-        <location filename="../ImportDialog.cpp" line="311"/>
363
+        <location filename="../ImportDialog.cpp" line="394"/>
319 364
         <source>Are you sure to use a square image outside of the Avatar Zone?
320 365
 When you want to use it as Avatar the image will be detached!</source>
321 366
         <translation>Ви впевнені, що будете використовувати квадратне зображення поза зоною аватара?
322 367
 Якщо ви хочете використовувати його як Аватар, зображення буде відокремлено!</translation>
323 368
     </message>
324 369
     <message>
325
-        <location filename="../ImportDialog.cpp" line="360"/>
370
+        <location filename="../ImportDialog.cpp" line="443"/>
326 371
         <source>Select Colour...</source>
327 372
         <translation>Вибір кольору...</translation>
328 373
     </message>
329 374
     <message>
330
-        <location filename="../ImportDialog.cpp" line="429"/>
375
+        <location filename="../ImportDialog.cpp" line="512"/>
331 376
         <source>Background Image: %1</source>
332 377
         <translation>Фонове зображення: %1</translation>
333 378
     </message>
334 379
     <message>
335
-        <location filename="../ImportDialog.cpp" line="429"/>
380
+        <location filename="../ImportDialog.cpp" line="512"/>
336 381
         <source>File</source>
337 382
         <comment>Background Image: File</comment>
338 383
         <translation>Файл</translation>
@@ -347,11 +392,21 @@ When you want to use it as Avatar the image will be detached!</source>
347 392
     </message>
348 393
     <message>
349 394
         <location filename="../JsonEditorDialog.ui" line="116"/>
395
+        <source>Apply changes</source>
396
+        <translation type="unfinished">Застосувати зміни</translation>
397
+    </message>
398
+    <message>
399
+        <location filename="../JsonEditorDialog.ui" line="119"/>
350 400
         <source>&amp;Save</source>
351 401
         <translation>&amp;Зберегти</translation>
352 402
     </message>
353 403
     <message>
354
-        <location filename="../JsonEditorDialog.ui" line="129"/>
404
+        <location filename="../JsonEditorDialog.ui" line="132"/>
405
+        <source>Discard changes</source>
406
+        <translation type="unfinished">Скасувати зміни</translation>
407
+    </message>
408
+    <message>
409
+        <location filename="../JsonEditorDialog.ui" line="135"/>
355 410
         <source>&amp;Close</source>
356 411
         <translation>&amp;Закрити</translation>
357 412
     </message>
@@ -370,26 +425,51 @@ When you want to use it as Avatar the image will be detached!</source>
370 425
     </message>
371 426
     <message>
372 427
         <location filename="../MapLocationDialog.ui" line="138"/>
428
+        <source>Close viewer</source>
429
+        <translation type="unfinished">Закрити переглядач</translation>
430
+    </message>
431
+    <message>
432
+        <location filename="../MapLocationDialog.ui" line="141"/>
373 433
         <source>&amp;Close</source>
374 434
         <translation>&amp;Закрити</translation>
375 435
     </message>
376 436
     <message>
377
-        <location filename="../MapLocationDialog.ui" line="164"/>
437
+        <location filename="../MapLocationDialog.ui" line="167"/>
438
+        <source>Apply new position</source>
439
+        <translation type="unfinished"></translation>
440
+    </message>
441
+    <message>
442
+        <location filename="../MapLocationDialog.ui" line="170"/>
378 443
         <source>&amp;Apply</source>
379 444
         <translation>&amp;Застосувати</translation>
380 445
     </message>
381 446
     <message>
382
-        <location filename="../MapLocationDialog.ui" line="177"/>
447
+        <location filename="../MapLocationDialog.ui" line="183"/>
448
+        <source>Revert old position</source>
449
+        <translation type="unfinished"></translation>
450
+    </message>
451
+    <message>
452
+        <location filename="../MapLocationDialog.ui" line="186"/>
383 453
         <source>&amp;Revert</source>
384 454
         <translation>&amp;Повернути</translation>
385 455
     </message>
386 456
     <message>
387
-        <location filename="../MapLocationDialog.ui" line="190"/>
388
-        <source>&amp;Set</source>
389
-        <translation>&amp;Змінити</translation>
457
+        <location filename="../MapLocationDialog.ui" line="199"/>
458
+        <source>Select new position</source>
459
+        <translation type="unfinished"></translation>
390 460
     </message>
391 461
     <message>
392
-        <location filename="../MapLocationDialog.ui" line="203"/>
462
+        <location filename="../MapLocationDialog.ui" line="202"/>
463
+        <source>&amp;Select</source>
464
+        <translation type="unfinished">&amp;Виділення</translation>
465
+    </message>
466
+    <message>
467
+        <location filename="../MapLocationDialog.ui" line="215"/>
468
+        <source>Quit select position</source>
469
+        <translation type="unfinished"></translation>
470
+    </message>
471
+    <message>
472
+        <location filename="../MapLocationDialog.ui" line="218"/>
393 473
         <source>&amp;Done</source>
394 474
         <translation>&amp;Готово</translation>
395 475
     </message>
@@ -1046,7 +1126,8 @@ Press 1 for Default View</source>
1046 1126
     </message>
1047 1127
     <message>
1048 1128
         <location filename="../ImageEditorDialog.cpp" line="109"/>
1049
-        <location filename="../ImportDialog.cpp" line="383"/>
1129
+        <location filename="../ImportDialog.cpp" line="272"/>
1130
+        <location filename="../ImportDialog.cpp" line="466"/>
1050 1131
         <location filename="../ProfileInterface.cpp" line="482"/>
1051 1132
         <location filename="../ProfileInterface.cpp" line="548"/>
1052 1133
         <location filename="../ProfileInterface.cpp" line="857"/>
@@ -1057,9 +1138,12 @@ Press 1 for Default View</source>
1057 1138
         <location filename="../ImageEditorDialog.cpp" line="110"/>
1058 1139
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1059 1140
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1060
-        <location filename="../ImportDialog.cpp" line="384"/>
1061
-        <location filename="../ImportDialog.cpp" line="415"/>
1062
-        <location filename="../ImportDialog.cpp" line="424"/>
1141
+        <location filename="../ImportDialog.cpp" line="273"/>
1142
+        <location filename="../ImportDialog.cpp" line="304"/>
1143
+        <location filename="../ImportDialog.cpp" line="313"/>
1144
+        <location filename="../ImportDialog.cpp" line="467"/>
1145
+        <location filename="../ImportDialog.cpp" line="498"/>
1146
+        <location filename="../ImportDialog.cpp" line="507"/>
1063 1147
         <location filename="../ProfileInterface.cpp" line="483"/>
1064 1148
         <location filename="../ProfileInterface.cpp" line="527"/>
1065 1149
         <location filename="../ProfileInterface.cpp" line="582"/>
@@ -1079,14 +1163,16 @@ Press 1 for Default View</source>
1079 1163
     </message>
1080 1164
     <message>
1081 1165
         <location filename="../ImageEditorDialog.cpp" line="120"/>
1082
-        <location filename="../ImportDialog.cpp" line="394"/>
1166
+        <location filename="../ImportDialog.cpp" line="283"/>
1167
+        <location filename="../ImportDialog.cpp" line="477"/>
1083 1168
         <location filename="../ProfileInterface.cpp" line="502"/>
1084 1169
         <source>All image files (%1)</source>
1085 1170
         <translation>Файли зображень (%1)</translation>
1086 1171
     </message>
1087 1172
     <message>
1088 1173
         <location filename="../ImageEditorDialog.cpp" line="121"/>
1089
-        <location filename="../ImportDialog.cpp" line="395"/>
1174
+        <location filename="../ImportDialog.cpp" line="284"/>
1175
+        <location filename="../ImportDialog.cpp" line="478"/>
1090 1176
         <location filename="../ProfileInterface.cpp" line="503"/>
1091 1177
         <location filename="../UserInterface.cpp" line="463"/>
1092 1178
         <source>All files (**)</source>
@@ -1094,14 +1180,16 @@ Press 1 for Default View</source>
1094 1180
     </message>
1095 1181
     <message>
1096 1182
         <location filename="../ImageEditorDialog.cpp" line="141"/>
1097
-        <location filename="../ImportDialog.cpp" line="415"/>
1183
+        <location filename="../ImportDialog.cpp" line="304"/>
1184
+        <location filename="../ImportDialog.cpp" line="498"/>
1098 1185
         <location filename="../ProfileInterface.cpp" line="725"/>
1099 1186
         <source>Can&apos;t import %1 because file can&apos;t be open</source>
1100 1187
         <translation>Неможливо імпортувати %1, оскільки файл не може бути відкритий</translation>
1101 1188
     </message>
1102 1189
     <message>
1103 1190
         <location filename="../ImageEditorDialog.cpp" line="150"/>
1104
-        <location filename="../ImportDialog.cpp" line="424"/>
1191
+        <location filename="../ImportDialog.cpp" line="313"/>
1192
+        <location filename="../ImportDialog.cpp" line="507"/>
1105 1193
         <location filename="../ProfileInterface.cpp" line="735"/>
1106 1194
         <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
1107 1195
         <translation>Неможливо імпортувати %1, оскільки файл неможливо розібрати правильно</translation>

BIN
res/gta5sync_zh_TW.qm View File


+ 125
- 37
res/gta5sync_zh_TW.ts View File

@@ -181,16 +181,31 @@ Pictures and Savegames</source>
181 181
     </message>
182 182
     <message>
183 183
         <location filename="../ImageEditorDialog.ui" line="59"/>
184
+        <source>Import picture</source>
185
+        <translation type="unfinished">匯入圖片</translation>
186
+    </message>
187
+    <message>
188
+        <location filename="../ImageEditorDialog.ui" line="62"/>
184 189
         <source>&amp;Import...</source>
185 190
         <translation>匯入(&amp;I)...</translation>
186 191
     </message>
187 192
     <message>
188
-        <location filename="../ImageEditorDialog.ui" line="79"/>
193
+        <location filename="../ImageEditorDialog.ui" line="82"/>
194
+        <source>Apply changes</source>
195
+        <translation type="unfinished">套用變更</translation>
196
+    </message>
197
+    <message>
198
+        <location filename="../ImageEditorDialog.ui" line="85"/>
189 199
         <source>&amp;Overwrite</source>
190 200
         <translation>修改(&amp;O)</translation>
191 201
     </message>
192 202