wilderjds
/
plasma-workspace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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"
wilder-5.14
l10n daemon script 9 years ago
parent bf44afcb2a
commit b2d8e0a657
3 changed files with 3 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      applets/appmenu/package/metadata.desktop
  2. 1
      applets/calendar/package/metadata.desktop
  3. 1
      runners/appstream/appstreamrunner.desktop

1
applets/appmenu/package/metadata.desktop
Unescape View File

@ -35,6 +35,7 @@ Comment=Classic menu for finding and starting applications
Comment[ca]=Menú clàssic per cercar i iniciar aplicacions Comment[ca]=Menú clàssic per cercar i iniciar aplicacions
Comment[ca@valencia]=Menú clàssic per buscar i iniciar aplicacions Comment[ca@valencia]=Menú clàssic per buscar i iniciar aplicacions
Comment[cs]=Klasická nabídka pro hledání a spouštění aplikací Comment[cs]=Klasická nabídka pro hledání a spouštění aplikací
Comment[de]=Klassisches Menü zum Suchen und Starten von Anwendungen
Comment[el]=Κλασσικό μενού για εύρεση και εκκίνηση εφαρμογών Comment[el]=Κλασσικό μενού για εύρεση και εκκίνηση εφαρμογών
Comment[en_GB]=Classic menu for finding and starting applications Comment[en_GB]=Classic menu for finding and starting applications
Comment[es]=Menú clásico para encontrar y lanzar aplicaciones Comment[es]=Menú clásico para encontrar y lanzar aplicaciones

1
applets/calendar/package/metadata.desktop
Unescape View File

@ -80,6 +80,7 @@ Name[zh_TW]=行事曆
Comment=Month display with your appointments and events Comment=Month display with your appointments and events
Comment[ca]=Mostra el mes amb les cites i els esdeveniments Comment[ca]=Mostra el mes amb les cites i els esdeveniments
Comment[ca@valencia]=Mostra el mes amb les cites i els esdeveniments Comment[ca@valencia]=Mostra el mes amb les cites i els esdeveniments
Comment[de]=Monatsanzeige mit Ihren Verabredungen und Terminen
Comment[el]=Εμφάνιση συναντήσεων και συμβάντων ανά μήνα Comment[el]=Εμφάνιση συναντήσεων και συμβάντων ανά μήνα
Comment[en_GB]=Month display with your appointments and events Comment[en_GB]=Month display with your appointments and events
Comment[es]=Calendario mensual con sus citas y eventos Comment[es]=Calendario mensual con sus citas y eventos

1
runners/appstream/appstreamrunner.desktop
Unescape View File

@ -26,6 +26,7 @@ Comment=Lets you find software
Comment[ca]=Permet cercar programari Comment[ca]=Permet cercar programari
Comment[ca@valencia]=Permet buscar programari Comment[ca@valencia]=Permet buscar programari
Comment[cs]=Umožní vám hledat software Comment[cs]=Umožní vám hledat software
Comment[de]=Unterstützt die Suche nach Software
Comment[el]=Σας δίνει τη δυνατότητα να βρείτε λογισμικό Comment[el]=Σας δίνει τη δυνατότητα να βρείτε λογισμικό
Comment[es]=Le permite encontrar software Comment[es]=Le permite encontrar software
Comment[it]=Ti consente di trovare i programmi Comment[it]=Ti consente di trovare i programmi

Write Preview
Loading…
Cancel
Save