Commit 321ac6dd 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 d445499d
Pipeline #52495 skipped
......@@ -19,7 +19,7 @@ Name[ca@valencia]=Avançat
Name[cs]=Pokročilé
Name[da]=Avanceret
Name[de]=Erweitert
Name[el]=Προχωρημένα
Name[el]=Προηγμένα
Name[en_GB]=Advanced
Name[eo]=Pliaj
Name[es]=Avanzado
......@@ -75,7 +75,7 @@ Comment[ca@valencia]=Arranjament avançat del lector de fonts
Comment[cs]=Pokročilá nastavení čtečky novinek
Comment[da]=Avanceret indstilling af feed-læser
Comment[de]=Erweiterte Einstellungen für den Nachrichtenbetrachter
Comment[el]=Προχωρημένες ρυθμίσεις αναγνώστη ροών
Comment[el]=Προηγμένες ρυθμίσεις αναγνώστη ροών
Comment[en_GB]=Advanced Feed Reader Settings
Comment[es]=Configuración avanzada del lector de fuentes
Comment[et]=Uudistevoogude lugeja muud seadistused
......
......@@ -88,6 +88,7 @@ Comment[ca@valencia]=Configura els connectors
Comment[cs]=Nastavit zásuvné moduly
Comment[da]=Indstil plugins
Comment[de]=Module einrichten
Comment[el]=Διαμόρφωση προσθέτων
Comment[en_GB]=Configure Plugins
Comment[es]=Configurar complementos
Comment[et]=Pluginate seadistamine
......@@ -127,6 +128,7 @@ X-KDE-Keywords[ca@valencia]=akregator, configura, arranjament, motor web, connec
X-KDE-Keywords[cs]=akregator, nastavit, nastavení, webEngine, moduly
X-KDE-Keywords[da]=akregator, indstil, indstillinger, WebEngine, plugins
X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,webEngine,Module
X-KDE-Keywords[el]=akregator, διαμόρφωση, ρυθμίσεις, μηχανή ιστού, πρόσθετα
X-KDE-Keywords[en_GB]=akregator, configure, settings, webEngine, plugins
X-KDE-Keywords[es]=akregator, configurar, preferencias, motor-web, complementos
X-KDE-Keywords[et]=akregator, seadistamine, seadistused, veebimootor, pluginad
......
......@@ -16,6 +16,7 @@ Name[ca@valencia]=Comentaris de l'usuari
Name[cs]=Zpětná vazba uživatele
Name[da]=Brugerfeedback
Name[de]=Benutzer-Feedback
Name[el]=Σχολιασμός χρήστη
Name[en_GB]=User Feedback
Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
......@@ -44,6 +45,7 @@ X-KDE-Keywords[ca]=akregator, configura, arranjament, comentaris de l'usuari
X-KDE-Keywords[ca@valencia]=akregator, configura, arranjament, comentaris de l'usuari
X-KDE-Keywords[da]=akregator, konfigurer, indstillinger, brugerfeedback
X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,Benutzer-Feedback
X-KDE-Keywords[el]=akregator, διαμόρφωση, ρυθμίσεις, σχολαισμός
X-KDE-Keywords[en_GB]=akregator, configure, settings, userfeedback
X-KDE-Keywords[es]=akregator, configurar, preferencias, comentarios del usuario
X-KDE-Keywords[et]=akregator, seadistamine, seadistused, kasutaja tagasiside
......
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