From f432ae068efff59a7f7e1402e8e5626e480290df Mon Sep 17 00:00:00 2001 From: Syping Date: Tue, 17 Nov 2020 16:38:30 +0100 Subject: [PATCH] Improve watermark placing --- ImportDialog.cpp | 28 ++++----- res/gta5sync.ts | 132 ++++++++++++++++++++--------------------- res/gta5sync_de.ts | 132 ++++++++++++++++++++--------------------- res/gta5sync_en_US.ts | 132 ++++++++++++++++++++--------------------- res/gta5sync_fr.qm | Bin 46518 -> 46520 bytes res/gta5sync_fr.ts | 134 +++++++++++++++++++++--------------------- res/gta5sync_ko.ts | 132 ++++++++++++++++++++--------------------- res/gta5sync_ru.ts | 132 ++++++++++++++++++++--------------------- res/gta5sync_uk.ts | 132 ++++++++++++++++++++--------------------- res/gta5sync_zh_TW.ts | 132 ++++++++++++++++++++--------------------- res/watermark_1b.png | Bin 11496 -> 8141 bytes res/watermark_2b.png | Bin 5765 -> 2795 bytes res/watermark_2r.png | Bin 5713 -> 2827 bytes 13 files changed, 540 insertions(+), 546 deletions(-) diff --git a/ImportDialog.cpp b/ImportDialog.cpp index 1fb0d2f..82e5dbd 100644 --- a/ImportDialog.cpp +++ b/ImportDialog.cpp @@ -266,41 +266,35 @@ void ImportDialog::processWatermark(QPainter *snapmaticPainter) { bool blackWatermark = false; bool redWatermark = false; - if (selectedColour.red() > 127) - { - if (selectedColour.green() > 127 || selectedColour.blue() > 127) - { + if (selectedColour.red() > 127) { + if (selectedColour.green() > 127 || selectedColour.blue() > 127) { redWatermark = true; } } - else - { + else { redWatermark = true; } - if (selectedColour.lightness() > 127) - { + if (selectedColour.lightness() > 127) { blackWatermark = true; } // draw watermark - if (redWatermark) - { - snapmaticPainter->drawImage(0, 0, QImage(":/img/watermark_2r.png")); + if (redWatermark) { + const QImage viewWatermark = QImage(":/img/watermark_2r.png"); + snapmaticPainter->drawImage(snapmaticResolution.width() - viewWatermark.width(), 0, viewWatermark); } else { QImage viewWatermark = QImage(":/img/watermark_2b.png"); - if (!blackWatermark) - { + if (!blackWatermark) { viewWatermark.invertPixels(QImage::InvertRgb); } - snapmaticPainter->drawImage(0, 0, viewWatermark); + snapmaticPainter->drawImage(snapmaticResolution.width() - viewWatermark.width(), 0, viewWatermark); } QImage textWatermark = QImage(":/img/watermark_1b.png"); - if (!blackWatermark) - { + if (!blackWatermark) { textWatermark.invertPixels(QImage::InvertRgb); } - snapmaticPainter->drawImage(0, 0, textWatermark); + snapmaticPainter->drawImage(snapmaticResolution.width() - textWatermark.width(), 0, textWatermark); } void ImportDialog::processSettings(QString settingsProfile, bool setDefault) diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 4d8eda1..5b26309 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -166,27 +166,27 @@ Pictures and Savegames ImageEditorDialog - + Overwrite Image... - + Apply changes - + &Overwrite - + Discard changes - + &Close @@ -247,8 +247,8 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> @@ -260,8 +260,8 @@ Pictures and Savegames - - + + Background Image: @@ -380,108 +380,108 @@ Pictures and Savegames - + Storage Background Image: Storage - + Crop Picture... - + &Crop - + Crop Picture - - + + Please import a new picture first - - + + Default Default as Default Profile - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 - - + + Load Settings... - - + + Save Settings... - - + + Snapmatic Avatar Zone - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! - + Select Colour... - - + + Background Image: %1 - - + + Please select your settings profile - + File Background Image: File @@ -1303,8 +1303,8 @@ Press 1 for Default View - - + + @@ -1326,40 +1326,40 @@ Press 1 for Default View - - - - - - + + + + + + Import - - + + All image files (%1) - - + + All files (**) - - + + Can't import %1 because file can't be open - - + + Can't import %1 because file can't be parsed properly diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index 6dd07bd..7ce5ee4 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -184,27 +184,27 @@ Snapmatic Bilder und Spielständen Snapmatic Bild Editor - + Overwrite Image... Bild überschreiben... - + Apply changes Änderungen übernehmen - + &Overwrite &Überschreiben - + Discard changes Änderungen verwerfen - + &Close S&chließen @@ -257,8 +257,8 @@ Snapmatic Bilder und Spielständen - - + + Background Colour: <span style="color: %1">%1</span> Hintergrundfarbe: <span style="color: %1">%1</span> @@ -287,8 +287,8 @@ Snapmatic Bilder und Spielständen Importiere das Bild ohne Veränderungen, Snapmatic wird garantiert beschädigt wenn du nicht weißt was du tust - - + + Background Image: %1 Hintergrundbild: %1 @@ -364,8 +364,8 @@ Snapmatic Bilder und Spielständen - - + + Background Image: Hintergrundbild: @@ -404,103 +404,103 @@ Snapmatic Bilder und Spielständen Eigenes Bild - + Storage Background Image: Storage Speicher - + Crop Picture... Bild zuschneiden... - + &Crop Zu&schneiden - + Crop Picture Bild zuschneiden - - + + Please import a new picture first Bitte importiere ein neues Bild zuerst - - + + Default Default as Default Profile Standard - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 Profil %1 - - + + Load Settings... Einstellungen laden... - - + + Please select your settings profile Bitte wähle dein Einstellungsprofil aus - - + + Save Settings... Einstellungen speichern... - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! Bist du sicher ein Quadrat Bild außerhalb der Avatar Zone zu verwenden? Wenn du es als Avatar verwenden möchtest wird es abgetrennt! - - + + Snapmatic Avatar Zone Snapmatic Avatar Zone - + Select Colour... Farbe auswählen... - + File Background Image: File Datei @@ -1342,8 +1342,8 @@ Drücke 1 für Standardmodus <h4>Folgende Snapmatic Bilder wurden repariert</h4>%1 - - + + @@ -1365,12 +1365,12 @@ Drücke 1 für Standardmodus Importieren... - - - - - - + + + + + + Import Importieren @@ -1392,15 +1392,15 @@ Drücke 1 für Standardmodus Importfähige Dateien (%1) - - + + All image files (%1) Alle Bilddateien (%1) - - + + All files (**) @@ -1434,15 +1434,15 @@ Drücke 1 für Standardmodus Fehler beim Lesen von Spielstanddatei - - + + Can't import %1 because file can't be open Kann %1 nicht importieren weil die Datei nicht geöffnet werden kann - - + + Can't import %1 because file can't be parsed properly Kann %1 nicht importieren weil die Datei nicht richtig gelesen werden kann diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index e74253f..af2c115 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -174,27 +174,27 @@ Pictures and Savegames - + Overwrite Image... - + Apply changes - + &Overwrite - + Discard changes - + &Close @@ -221,8 +221,8 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> Background Color: <span style="color: %1">%1</span> @@ -258,8 +258,8 @@ Pictures and Savegames - - + + Background Image: %1 @@ -346,8 +346,8 @@ Pictures and Savegames - - + + Background Image: @@ -386,102 +386,102 @@ Pictures and Savegames - + Storage Background Image: Storage - + Crop Picture... - + &Crop - + Crop Picture - - + + Please import a new picture first - - + + Default Default as Default Profile - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 - - + + Load Settings... - - + + Please select your settings profile - - + + Save Settings... - - + + Snapmatic Avatar Zone - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! - + Select Colour... Select Color... - + File Background Image: File @@ -1323,8 +1323,8 @@ Press 1 for Default View - - + + @@ -1346,12 +1346,12 @@ Press 1 for Default View - - - - - - + + + + + + Import @@ -1379,15 +1379,15 @@ Press 1 for Default View - - + + All image files (%1) - - + + All files (**) @@ -1426,15 +1426,15 @@ Press 1 for Default View - - + + Can't import %1 because file can't be open - - + + Can't import %1 because file can't be parsed properly diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index 4fcc40e6b2818c6091ab7a2adeeb765e7b080a03..062da138d0c1f0cbbe356309b2c488f3c5ddd272 100644 GIT binary patch delta 2951 zcmX9=dt8n8AAg_cJkL4L<($sgvD0c@U6x8o9l0&pRuqy;C~}G8+C@~7bRzw7>4zN2 zB`ifDl9Y&u^-DvM+csMpW34rW^|P6+eY~E(-mm9*zR&mb{=7e*&-?qW>R_rnm~9?T z#{p(7(0eSv-T?-T1Gou*XNZiM**Oy&M)d={tbo3a!0ao)&~-9qe+4$XfEGFsmI3{) zgFUu&=I&%fF+ZmP?pI-+HWBcCU};b|n1^EhP!AyXPi!u00oMJEGj9@!!(aI7 zv^T}7MN=Vh+Te&McPN&42)`WU=(!OuVoB%mHx=S{?m$wUjN3nyao-Gu-4SQN)k(3! z`*$E+r&yCe3mA1pkuzc#Fkz-5C+R1W+r(I#*FjMXh6)Kq<+xKM+bc!$YYMt8RdG8w z7Fcpk(Xq!K@YO1wK79=I{7TWOEe94gF`AXV0mF3W{qJi5V?5(jV*&g-nNat3N+Oe) z+D5$otBs^m16{vo>Bou>6!(VCF^ECB7#Re~UH#MRlG$gY_Ln zOU*TG=#T@znvdAE_xyl^=PYHcgHr@s7*GfV=-H!fW?-5vTk3uYST#(>9kVUZS%bNS ztv%pF)3=OmPTB#CbdoW}C}XY*+gzPN-$nM9$Qoc^8~aDgHNsT(?KvZ*7s|2k{##_> z^d)(eR;!Fbt2v*8yMZnBTtw4l;+DoO9Y<~CIEjn-VjkJVaV|cGWHZM_a%lqTu*JZc zJ;H#G#&X+YJb^vkT)sOcx2clLUrz-8ThA4|nF2&@<%-sZ(|}fRrOYN8y#lV(m+BDm zH+S;r1$w^ET@SCII#hGFnI1rBfr|5`XJx9YSEmPg)$ghg$NUN8%u(6ZTfvO|_9~AI zV&be*O^T#ho}aFYdN_+ZqeV53i367Bs#fzq0q;#v?I}M3^a)m-DVaPlR48 zRW}0rkZ+w=JydJ~2B}nU&ff*B3)Ny*0uc0%jIsS?OueMmv&BHs8?|j~h#nYLs&;vM zg-oMJJ>WQDP_-pba$#go_Zo;b5bx|tfRJACm6o>r*Uf&?3135>M26MKY9bX zRYLz{A|je(bbTxg8c1yrTqg|P7(he=g~2z^k{zuOM$mp{ythFZowtP!gr~yzoJR7! z*+K~8M;Ye}k?IP-$6koaBfZi_3ejU;Q0CtW(F+LKQepY)K|taKA?qS#VqY$73T&l8 z2^X?Gj6@_#D5?vga-I`PJ*gcct%XK^8n@&`;o9SFGUvO(&6&aTX@Y8mdmg@kpCmkw zcu562B`Vq}gH?&5qT?Oj6}7#{7}k6%_Pj^|to=pD@f6r+yVy59h#c%|aiGsLl5&bT zd_g`TBjc{AG9FrJdCfcY&lD%NQG4_X6{kJ70uK9%)7wbrfKG94RT|O0B+dt=;jOof z6b$Bt;;tatD}9exm6b`uS0+|})C-7vDxR&oLsQO+=d%-Nw?eV@9tX@7#D)hCsmCXX zSM%!WR?sFknk4$KO}y4YQHy^RubXK7j6CtirwSn9u-Ke*8sIx+OjsggQiF`a+n0;Y z#Z(nrTk)Pl7@Z<}#jlT&I4%nD@hPg((zD_dX$7#gLTtZA>Mr${6z|fA&Xtt@dTJ+o zN%v07Wm_!{qJ!58DdHAMw(^XWVHHf$O_kP1-=V()q-^69@(jI{9r%R4D`nhXW{DFG zW|frhww|m>l5yoI8Mi-^icV3o+w7zxYLd_|pay zt?L5{vw64HcO!Y_2S3X=AVK?ye-@os@mjxYQ~>L{T7NCkoNd%juBAfE$f8zIVF^yYiyRbY$^@IwqLbpE`$St=VV+oNLy`vi2CJ;_DXm!vWs<= z*&2g6)5`WLd8G3uD<2)r?6})jfg`C8^lz==(gJ`XomQvkET*$HMaE=ns|&I9)h58SQ+Knek}gYLx<}6CRJLl}3wz3U$V6S&UeYh+ fI&ByXoFTDB=)}#h3>Z94metaxe8?WIb>S delta 2949 zcmX9=eO!(A8@|qSp68tB<($se%Ar&$ua%NY8B17EC{j{HUe10@FCs~c6X}OE%F&`_ zNm0}!DG^y(OJkMSz1aGVY4mFowr0a-cc164>+?L%_xaw}ecktceZTd+OkFRN<7!_4 zFk1n~Spa(r7#jp|A%NR#88fqTL+qvw2i(no5pBTIW?*8vjM-PfW*5^!JHjepjHqnsPWFoR9=`+W zTE*tVCBW1sMegLcfsiOgZt_ngw}BaK-1?8A3=9<#irU$yNw%koj^`9KCslDXC?0sf zP0?Fm3wTS4Uw?f7n188wqOAs2U1KyG9RdA9=B*zZ0j~tczQF|eJ!a;*^iUER%>1s~ zfWaSTJDC#`@__IkWlVCH@sJ}^xvU#V`H`uu^#al+F?E-T z?g#EnBRht)KFKs)APtNEX4*c|0keFVjzn5la*OHwbswN-p#(bu%^CF@_ z5z6LeJ;1`Rl`VT|pXl4l_Vj9)RR|68{pw-<&=1&LJk_NPzt7Nih^oqDjZ>mG^OYYQ( zi}ZY(yB1kPb*STRGH(KNi&UI9JuA~xmQP&CtA1AvnfVuxyF_KvVg@5V8LD#4ASMnv zRcJKL^2#l$<@c6QXLPDoFbTjqlj;NhC*X|`RYCP}V0e(~Z25fZ5C_%gKM}fbP<<6J zoP6uN>Yic`FrHPtxNsX7T%s2HlYqciGRBXRF|AQ;!IlA~f2ys!f-QizPpC(~Y9`Y- zq8|GxVPKspUu73KM7`!-FtA{VI^pa4!0bip%_mEMk9^fRMH?twvO2Fl4=74emo^do zA}@9ItjDyQN?lX&8?F1ly7mU?78hxHtBJJAMmfEN%bWo1#=4`Vs%Q;UuvSZNEh@!_|dp^3%1GKqeNoS- zV5dYy4`r}vy{PCNz?-7hl8j;VH=_9^3NYAD95#mnd*+BE(gVrC?ug?&ACr`!;-vQq z2_fTwFd2^;OwW0{F&W~#htwXHbH#{0GvJt)xbPwA?EhF?R=0&{H;OAkX?U2MrU-hY zK|Byhd!-)`>vm+)@KuTRLoI=XUh!PhEt+zbcp*E9b}JDZ?{L5}wb*+19`*Pf@k)LR z-3q$JHiJa}Jru9@Qq;08@tT3wFUk|Ynx+7fO2v-kGXVcY#-vp;Cb!5Kv~R80QASm< zwifT$h0`f=Q2gcui8ERuJ~&NPT60$HmevD%tHqwHr0yDDNimQ{tVvS(Sx`IKO1c3t z*M4ZS6Ybm+rKsy9*~VHa!;CI0o?+7V*jx1XbSc{_j6B0!$`0tJ?+O|BeQHV&^+r}I zbly(ZB+0mOij4bykxEZfvN_h$aWzS36(Ch!q9n^FO6M|c>A0OQozGZAmjZ98F^MUFL85;)GTam zqJq?DVjPK^szZ}@b_pE;VVYgji8KF^CVwow7fxvk6)asP9A(VCrYQ^{PExq0R5y{v zC^1BHzK?`1wlx(=dSjO6RU-XX>Y-IjM8`_dT2)Y!7tGUIce&E(xms)8Lw2y+TkCX} z!tBo1dha5y9Q3n{W7lcl@!LTsR)W^|DivVxZLOb{XfE~8&Tphb#AIs2EU2gFERb>C zaBa%1Gi35JwYlY#o>P3LwrT+lL(U`Z*^7}tK)sBs#%b#ZAEkcj);334l3k>mmTL6I z3^VI1l32u|Csbk{gT*} aXVkc8%bc}ln2Q9&Vl`I4P;=ksPTIeW+HREq diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index cec7857..338db28 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -184,27 +184,27 @@ et les fichiers de sauvegarde de Grand Theft Auto V Éditeur d'images Snapmatic - + Overwrite Image... Remplacer l'image... - + Apply changes Appliquer les modifications - + &Overwrite &Remplacer - + Discard changes Annuler les modifications - + &Close &Fermer @@ -257,8 +257,8 @@ et les fichiers de sauvegarde de Grand Theft Auto V - - + + Background Colour: <span style="color: %1">%1</span> Couleur de fond : <span style="color: %1">%1</span> @@ -282,8 +282,8 @@ et les fichiers de sauvegarde de Grand Theft Auto V Supprimer l'image de fond - - + + Background Image: %1 Image de fond : %1 @@ -364,8 +364,8 @@ et les fichiers de sauvegarde de Grand Theft Auto V - - + + Background Image: Image de fond : @@ -404,103 +404,103 @@ et les fichiers de sauvegarde de Grand Theft Auto V Image personnalisé - + Storage Background Image: Storage Stockage - + Crop Picture... Rogner l'image... - + &Crop &Rogner - + Crop Picture Rogner l'image - - + + Please import a new picture first Veuillez d'abord importer une nouvelle image - - + + Default Default as Default Profile Défaut - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 Profil %1 - - + + Load Settings... Charger les paramètres... - - + + Please select your settings profile Veuillez choisir votre profil de paramètres - - + + Save Settings... Sauvegarder les paramètres... - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! Êtes-vous sûr d'utiliser une image carrée en dehors de la Zone d'Avatar ? Si vous l'utilisez comme Avatar, l'image sera détachée ! - - + + Snapmatic Avatar Zone Zone d'Avatar Snapmatic - + Select Colour... Choisir une couleur... - + File Background Image: File Fichier @@ -892,7 +892,7 @@ Y : %2 Font: - Police: + Police : @@ -1353,8 +1353,8 @@ Appuyer sur 1 pour le mode par défaut <h4>Les Snapmatic suivants ont été répaés</h4>%1 - - + + @@ -1376,12 +1376,12 @@ Appuyer sur 1 pour le mode par défaut Importer... - - - - - - + + + + + + Import Importer @@ -1398,15 +1398,15 @@ Appuyer sur 1 pour le mode par défaut Photos Snapmatic (PGTA*) - - + + All image files (%1) Toutes les images (%1) - - + + All files (**) @@ -1452,15 +1452,15 @@ Appuyer sur 1 pour le mode par défaut Impossible de lire le fichier de sauvegarde - - + + Can't import %1 because file can't be open Impossible d'importer %1, le fichier ne peut pas être ouvert - - + + Can't import %1 because file can't be parsed properly Impossible d'importer %1, le fichier ne peut pas être parsé correctement diff --git a/res/gta5sync_ko.ts b/res/gta5sync_ko.ts index 75cb62c..129afd4 100644 --- a/res/gta5sync_ko.ts +++ b/res/gta5sync_ko.ts @@ -176,27 +176,27 @@ Pictures and Savegames ImageEditorDialog - + Overwrite Image... 이미지 덮어쓰기 - + Apply changes 변경 사항 적용 - + &Overwrite 덮어쓰기(&O) - + Discard changes 변경 사항 무시 - + &Close 닫기(&C) @@ -257,8 +257,8 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> 배경 색상: <span style="color: %1">%1</span> @@ -274,8 +274,8 @@ Pictures and Savegames - - + + Background Image: 배경 이미지: @@ -400,112 +400,112 @@ Pictures and Savegames 사용자 지정 사진 - - + + Background Image: %1 배경 이미지: %1 - + Storage Background Image: Storage 배경 이미지: 저장됨 저장됨 - + Crop Picture... 사진 자르기 - + &Crop 자르기(&C) - + Crop Picture 사진 자르기 - - + + Load Settings... 설정 불러오기 - - + + Please import a new picture first 먼저 새 이미지를 가져오세요 - - + + Default Default as Default Profile 기본 프로필로 기본 설정 기본 - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 %1을 프로필 1로 지정합니다. 프로필 %1 - - + + Please select your settings profile 설정 프로필을 선택하세요 - - + + Save Settings... 설정 저장 - - + + Snapmatic Avatar Zone 스냅매틱 아바타 영역 - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! 아바타 구역 밖에서 네모난 이미지를 정말 사용합니까? 아바타로 사용하려는 경우 이미지가 분리됩니다! - + Select Colour... 색상 선택 - + File Background Image: File 배경 이미지: 파일 @@ -1347,8 +1347,8 @@ Press 1 for Default View %2 파일 중 %1 파일을 내보냅니다. - - + + @@ -1370,40 +1370,40 @@ Press 1 for Default View 가져오기 - - - - - - + + + + + + Import 가져오기 - - + + All image files (%1) 모든 이미지 파일 (%1) - - + + All files (**) 모든 파일 (**) - - + + Can't import %1 because file can't be open 파일을 열 수 없으므로 %1을 가져올 수 없습니다. - - + + Can't import %1 because file can't be parsed properly 파일을 구문 분석할 수 없으므로 %1을 가져올 수 없습니다. diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index c04bc69..386ada7 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -188,27 +188,27 @@ Pictures and Savegames Редактор картинок Snapmatic - + Overwrite Image... Перезаписать картинку... - + Apply changes Применить изменения - + &Overwrite &Перезаписать - + Discard changes Отменить изменения - + &Close &Закрыть @@ -261,8 +261,8 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> Цвет фона: <span style="color: %1">%1</span> @@ -291,8 +291,8 @@ Pictures and Savegames Импортировать как есть, не меняя картинку. Обязательно поломает Snapmatic, если не знаешь, что делаешь - - + + Background Image: %1 Фоновая картинка: %1 @@ -372,8 +372,8 @@ Pictures and Savegames - - + + Background Image: Фоновая картинка: @@ -412,102 +412,102 @@ Pictures and Savegames Своя Картинка - + Storage Background Image: Storage Хранилище - + Crop Picture... Обрезать картинку... - + &Crop Об&резать - + Crop Picture Обрезать картинку - - + + Please import a new picture first Импортируй сначала новую картинку - - + + Default Default as Default Profile По умолчанию - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 Профиль %1 - - + + Load Settings... Загрузить настройки... - - + + Please select your settings profile Пожалуйста, выбери профиль для настроек - - + + Save Settings... Сохранить настройки... - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! Ты точно хочешь использовать квадратное изображение вне зоны аватарки? Если это аватар, то изображение будет обрезано! - - + + Snapmatic Avatar Zone Зона Snapmatic Аватарки - + Select Colour... Выбрать цвет... - + File Background Image: File Файл @@ -1354,8 +1354,8 @@ Press 1 for Default View <h4>Нижеследующие картинки Snapmatic были восстановлены</h4>%1 - - + + @@ -1377,12 +1377,12 @@ Press 1 for Default View Импортировать... - - - - - - + + + + + + Import Импортировать @@ -1399,8 +1399,8 @@ Press 1 for Default View Картинка Snapmatic (PGTA*) - - + + All files (**) @@ -1451,22 +1451,22 @@ Press 1 for Default View Файлы для импорта (%1) - - + + All image files (%1) Все файлы изображений (%1) - - + + Can't import %1 because file can't be open Не удалось открыть %1, файл не может быть открыт - - + + Can't import %1 because file can't be parsed properly Не получилось импортировать %1, файл не может быть правильно обработан diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index a3a75a0..54f8a86 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -179,27 +179,27 @@ Pictures and Savegames ImageEditorDialog - + Overwrite Image... Перезаписати зображення... - + Apply changes Застосувати зміни - + &Overwrite &Перезаписати - + Discard changes Скасувати зміни - + &Close &Закрити @@ -260,8 +260,8 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> Фоновий колір: <span style="color: %1">%1</span> @@ -277,8 +277,8 @@ Pictures and Savegames - - + + Background Image: Фонове зображення: @@ -401,109 +401,109 @@ Pictures and Savegames Користувацьке Зображення - + Storage Background Image: Storage Зберігання - + Crop Picture... Обрізати зображення... - + &Crop &Обрізати - + Crop Picture Обрізати зображення - - + + Please import a new picture first Спершу імпортуйте нове зображення - - + + Default Default as Default Profile Стандартний - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 Профіль %1 - - + + Load Settings... Завантажити параметри... - - + + Save Settings... Зберегти параметри... - - + + Snapmatic Avatar Zone Зона Snapmatic Аватару - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! Ви впевнені, що будете використовувати квадратне зображення поза зоною аватара? Якщо ви хочете використовувати його як Аватар, зображення буде відокремлено! - + Select Colour... Вибір кольору... - - + + Background Image: %1 Фонове зображення: %1 - - + + Please select your settings profile Будь ласка, виберіть свій профіль налаштувань - + File Background Image: File Файл @@ -1337,8 +1337,8 @@ Press 1 for Default View Експортується файл %1 з %2 файлів - - + + @@ -1360,40 +1360,40 @@ Press 1 for Default View Імпортування... - - - - - - + + + + + + Import Імпорт - - + + All image files (%1) Файли зображень (%1) - - + + All files (**) Усі файли (**) - - + + Can't import %1 because file can't be open Неможливо імпортувати %1, оскільки файл не може бути відкритий - - + + Can't import %1 because file can't be parsed properly Неможливо імпортувати %1, оскільки файл неможливо розібрати правильно diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 1d3b92a..92a1c73 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -175,27 +175,27 @@ Pictures and Savegames ImageEditorDialog - + Overwrite Image... 修改圖片... - + Apply changes 套用變更 - + &Overwrite 修改(&O) - + Discard changes 捨棄變更 - + &Close 關閉(&C) @@ -256,8 +256,8 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> 背景顏色: <span style="color: %1">%1</span> @@ -273,8 +273,8 @@ Pictures and Savegames - - + + Background Image: 背景圖片: @@ -397,108 +397,108 @@ Pictures and Savegames 自訂圖片 - + Storage Background Image: Storage 儲存 - + Crop Picture... 裁剪圖片... - + &Crop 裁剪(&C) - + Crop Picture 裁剪圖片 - - + + Please import a new picture first 請先匯入新圖片 - - + + Default Default as Default Profile 預設 - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + Profile %1 Profile %1 as Profile 1 設定檔 %1 - - + + Load Settings... 載入設定... - - + + Save Settings... 儲存設定... - - + + Snapmatic Avatar Zone Snapmatic 大頭貼區域 - - + + Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached! 你確定要在大頭貼區域以外的地方使用方形圖片嗎? 作為大頭貼的圖片將被分離! - + Select Colour... 選擇顏色... - - + + Background Image: %1 背景圖片: %1 - - + + Please select your settings profile 請選擇設定檔 - + File Background Image: File 文件 @@ -1331,8 +1331,8 @@ Press 1 for Default View 匯出檔案中 %1 共 %2 個檔案 - - + + @@ -1354,40 +1354,40 @@ Press 1 for Default View 匯入... - - - - - - + + + + + + Import 匯入 - - + + All image files (%1) 所有圖片 (%1) - - + + All files (**) 所有檔案 (**) - - + + Can't import %1 because file can't be open 無法匯入 %1,因為檔案無法開啟 - - + + Can't import %1 because file can't be parsed properly 無法匯入 %1,因為檔案無法正確解析 diff --git a/res/watermark_1b.png b/res/watermark_1b.png index eddab1727cbf22d40f9dd0df0bcc3e603863f24d..c0a8adc0a319fb30af8143f5b1f655cb2b94b1ab 100644 GIT binary patch literal 8141 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 literal 11496 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 diff --git a/res/watermark_2b.png b/res/watermark_2b.png index 4a4cb5726442ee36af09cc1eedecd054541f13d8..0cf74b921d026efa92f8f39e7bc5098e4f0e84d3 100644 GIT binary patch literal 2795 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 diff --git a/res/watermark_2r.png b/res/watermark_2r.png index 2747605a7f08ae827404919738cd93e525a8bfb4..51aa4b2f1e0b54c8e6ca155e29e458cd82a9e724 100644 GIT binary patch literal 2827 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