diff --git a/po/sq_AL.po b/po/sq_AL.po
index 80bf428..dd5585c 100644
--- a/po/sq_AL.po
+++ b/po/sq_AL.po
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-09 03:09-0400\n"
-"PO-Revision-Date: 2018-03-19 09:26+0000\n"
-"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"POT-Creation-Date: 2018-04-16 03:09-0400\n"
+"PO-Revision-Date: 2018-04-16 07:09+0000\n"
+"Last-Translator: Alexandre Lision\n"
 "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/ring/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -271,67 +271,67 @@
 msgid "Error creating/loading account."
 msgstr "Gabim në krijim/ngarkim llogarie."
 
-#: ui/generalsettingsview.ui:34
+#: ui/generalsettingsview.ui:44
 msgid "Profile Settings"
 msgstr "Rregullime Profili"
 
-#: ui/generalsettingsview.ui:76
+#: ui/generalsettingsview.ui:86
 msgid "Ring Settings"
 msgstr "Rregullime Ring-u"
 
-#: ui/generalsettingsview.ui:92
+#: ui/generalsettingsview.ui:102
 msgid "Start Ring on login"
 msgstr "Nise Ring-un kur bëni hyrjen në sistem"
 
-#: ui/generalsettingsview.ui:100
+#: ui/generalsettingsview.ui:110
 msgid "Show Ring icon in the notification area (systray)."
 msgstr "Shfaq ikonë Ring-u te fusha e njoftimeve (systray)."
 
-#: ui/generalsettingsview.ui:108
+#: ui/generalsettingsview.ui:118
 msgid "Bring Ring to the foreground on incoming calls."
 msgstr "Sille Ring-un përpara për thirrje ardhëse."
 
-#: ui/generalsettingsview.ui:116
+#: ui/generalsettingsview.ui:126
 msgid "Enable notifications for incoming calls."
 msgstr "Aktivizo njoftimet për thirrje ardhëse."
 
-#: ui/generalsettingsview.ui:124
+#: ui/generalsettingsview.ui:134
 msgid "Enable notifications for new chat messages."
 msgstr "Aktivizo njoftimet për mesazhe të reja fjalosjesh."
 
-#: ui/generalsettingsview.ui:132
+#: ui/generalsettingsview.ui:142
 msgid "Show images and videos in chat window."
 msgstr "Shfaq te dritarja e fjalosjes figura dhe video."
 
-#: ui/generalsettingsview.ui:140
+#: ui/generalsettingsview.ui:150
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Dhënia e një numri te fusha e kërkimeve do të kryejë një thirrje të re."
 
-#: ui/generalsettingsview.ui:153
-msgid "Download folder"
-msgstr "Dosje Shkarkimi"
+#: ui/generalsettingsview.ui:163
+msgid "Download folder:"
+msgstr ""
 
-#: ui/generalsettingsview.ui:181
+#: ui/generalsettingsview.ui:190
 msgid "Show chat on the right."
 msgstr "Shfaqe fjalosjen djathtas."
 
-#: ui/generalsettingsview.ui:187
+#: ui/generalsettingsview.ui:196
 msgid "Show chat on the bottom."
 msgstr "Shfaqe fjalosjen poshtë."
 
-#: ui/generalsettingsview.ui:211
+#: ui/generalsettingsview.ui:220
 msgid "History Settings"
 msgstr "Rregullime Historiku"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:238
 msgid "Keep history for (days):"
 msgstr "Mbaje historikun për (ditë):"
 
-#: ui/generalsettingsview.ui:250
+#: ui/generalsettingsview.ui:259
 msgid "(set to 0 for unlimited history)"
 msgstr "(vëreni 0 për historik të pakufizuar)"
 
-#: ui/generalsettingsview.ui:260
+#: ui/generalsettingsview.ui:269
 msgid "Clear all history"
 msgstr "Pastro krejt historikun"
 
@@ -630,40 +630,40 @@
 msgid "Send Invitation"
 msgstr "Dërgoni Ftesë"
 
-#: ui/accountgeneraltab.ui:74
+#: ui/accountgeneraltab.ui:75
 msgid "Account"
 msgstr "Llogari"
 
-#: ui/accountgeneraltab.ui:134
+#: ui/accountgeneraltab.ui:135
 msgid "Parameters"
 msgstr "Parametra"
 
-#: ui/accountgeneraltab.ui:158 ui/accountgeneraltab.ui:244
+#: ui/accountgeneraltab.ui:159 ui/accountgeneraltab.ui:245
 #: src/accountgeneraltab.cpp:168 src/accountgeneraltab.cpp:234
 msgid "Change password"
 msgstr "Ndryshoni fjalëkalimin"
 
-#: ui/accountgeneraltab.ui:174
+#: ui/accountgeneraltab.ui:175
 msgid "Note: this will change the password only on this device."
 msgstr "Shënim: kjo do të ndryshojë fjalëkalimi vetëm në këtë pajisje."
 
-#: ui/accountgeneraltab.ui:193
+#: ui/accountgeneraltab.ui:194
 msgid "Current password"
 msgstr "Fjalëkalimi i tanishëm"
 
-#: ui/accountgeneraltab.ui:213
+#: ui/accountgeneraltab.ui:214
 msgid "New password"
 msgstr "Fjalëkalim i ri"
 
-#: ui/accountgeneraltab.ui:233
+#: ui/accountgeneraltab.ui:234
 msgid "Confirm password"
 msgstr "Ripohoni fjalëkalimin"
 
-#: ui/accountgeneraltab.ui:290
+#: ui/accountgeneraltab.ui:291
 msgid "Export account"
 msgstr "Eksportoni llogari"
 
-#: ui/accountgeneraltab.ui:303
+#: ui/accountgeneraltab.ui:304
 msgid "Choose destination..."
 msgstr "Zgjidhni një vendmbërritje…"
 
@@ -779,13 +779,13 @@
 msgid "Ring Error"
 msgstr "Gabim Ring"
 
-#: src/ring_client.cpp:289
+#: src/ring_client.cpp:290
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Shfaqe Ring-un"
 
-#: src/ring_client.cpp:293
+#: src/ring_client.cpp:294
 msgid "Quit"
 msgstr "Dilni"
 
@@ -864,12 +864,26 @@
 msgid "Network error"
 msgstr "Gabim rrjeti"
 
-#: src/generalsettingsview.cpp:105
+#: src/generalsettingsview.cpp:113
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Ky është veprim me pasoja shkatërruese. Jeni i sigurt se doni të fshihet krejt historiku juaj i fjalosjeve dhe thirrjeve?"
 
+#: src/generalsettingsview.cpp:183
+msgid "Choose download folder"
+msgstr ""
+
+#: src/generalsettingsview.cpp:186 src/accountgeneraltab.cpp:186
+#: src/avatarmanipulation.cpp:383 src/chatview.cpp:177
+msgid "_Cancel"
+msgstr "_Anuloje"
+
+#: src/generalsettingsview.cpp:188 src/accountgeneraltab.cpp:188
+#: src/chatview.cpp:179
+msgid "_Save"
+msgstr "_Ruaje"
+
 #: src/backends/edscontactbackend.cpp:193
 msgid "Unknown EDS addressbook"
 msgstr "Libër adresash EDS i panjohur"
@@ -903,15 +917,6 @@
 msgid "Save File"
 msgstr "Ruaje Kartelën"
 
-#: src/accountgeneraltab.cpp:186 src/avatarmanipulation.cpp:383
-#: src/chatview.cpp:177
-msgid "_Cancel"
-msgstr "_Anuloje"
-
-#: src/accountgeneraltab.cpp:188 src/chatview.cpp:179
-msgid "_Save"
-msgstr "_Ruaje"
-
 #: src/accountgeneraltab.cpp:208
 msgid "File exported to destination: "
 msgstr "Kartela u eksportua te vendmbërritja:"
@@ -1030,7 +1035,7 @@
 msgid "open chat"
 msgstr "hape fjalosjen"
 
-#: src/ringmainwindow.cpp:745
+#: src/ringmainwindow.cpp:746
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"