Commit 743929e7 authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 63680780
......@@ -45,6 +45,7 @@ Comment[de]=Sprache für den Arbeitsbereich und die Anwendungen ändern
Comment[en_GB]=Change workspace and application languages
Comment[es]=Cambiar los idiomas del espacio de trabajo y de las aplicaciones
Comment[eu]=Aldatu languneko eta aplikazioko hizkuntzak
Comment[fi]=Vaihda työtilan ja sovellusten kieltä
Comment[fr]=Changer la langue de l'espace de travail et des applications
Comment[id]=Ubah bahasa aplikasi dan ruangkerja
Comment[it]=Cambia la lingua dello spazio di lavoro e dell'applicazione
......
......@@ -62,6 +62,7 @@ Name[de]=Befehl mit dem Inhalt der Zwischenablage ausführen
Name[en_GB]=Run command on clipboard contents
Name[es]=Ejecutar orden sobre el contenido del portapapeles
Name[eu]=Exekutatu komandoa arbelaren edukiaren gain
Name[fi]=Suorita komento leikepöydän sisällöstä
Name[fr]=Exécuter la commande en utilisant le contenu du presse-papier
Name[id]=Jalankan perintah pada konten-konten papan-klip
Name[it]=Esegui comando sui contenuti degli appunti
......
......@@ -7,6 +7,7 @@ Name[de]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[en_GB]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[fi]=Plasma (kehitys ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
Name[id]=Plasma (Pengembangan${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -8,6 +8,7 @@ Name[de]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[en_GB]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[fi]=Plasma (kehitys ${CMAKE_INSTALL_FULL_BINDIR})
Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
Name[id]=Plasma (Pengembangan${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment